1 --- t-prot 2010-02-11 11:41:15.000000000 +0100
2 +++ t-prot-m1512 2010-02-11 11:48:49.000000000 +0100
5 $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
6 $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
7 - $mutt_pgpoutstart $mutt_pgpoutend
8 + $mutt_pgpoutstart $mutt_pgpoutend $mutt_ssloutstart $mutt_ssloutend
13 $mutt_pgpencrypted = '[-- End of PGP/MIME encrypted data --]';
14 $mutt_pgpoutstart = '[-- PGP output follows (current time:';
15 $mutt_pgpoutend = '[-- End of PGP output --]';
16 +$mutt_ssloutstart = '[-- OpenSSL output follows';
17 +$mutt_ssloutend = '[-- End of OpenSSL output --]';
19 # set the defaults to the C locale
20 $gpg_WARNING = 'WARNING: ';
22 for (my $x=0; $x<scalar(@$L); $x++) {
23 if ($$V[$x]) { next; }
25 - if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o)
26 + if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E|\Q$mutt_ssloutstart\E)/o)
29 for (my $m=0; $m<scalar(@$H); $m++) {
34 - elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o) {
35 + elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E|\Q$mutt_ssloutend\E)/o) {
37 ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
41 'Weitergeleitete Nachricht / Forwarded Message');
42 my $k = 0; # any text above?
43 - my $tmp = 0; # flagged if inside PGP output
44 + my $tmp = 0; # flagged if inside PGP or SSL output
46 DONE: for ($x=0; $x<scalar(@$lines); $x++) {
49 ((!$spass) || index($$lines[$x], $spass_prefix)!=0))
51 if ($mua eq 'mutt' && (!$tmp) &&
53 - /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
56 + /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o ||
58 + /^(?:\e[^\a]+\a)?(?:\Q$mutt_ssloutstart\E)/o)) {
60 } elsif ($mua eq 'mutt' && $tmp &&
62 /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
64 Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
67 - Locale::gettext::gettext("[-- End of signed data --]\n") =~
69 + Locale::gettext::gettext("\n[-- End of signed data --]\n") =~
72 Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
74 @@ -1013,16 +1017,24 @@
75 Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
77 ($mutt_pgpclearsigstart) =
78 - Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
79 + Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n\n") =~
81 ($mutt_pgpencrypted) =
82 Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
85 - Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
87 + Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
89 + $mutt_pgpoutstart =~ s/%s/PGP/;
91 - Locale::gettext::gettext("[-- End of PGP output --]\n") =~
92 + Locale::gettext::gettext("[-- End of PGP output --]\n\n") =~
94 + ($mutt_ssloutstart) =
95 + Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
97 + $mutt_ssloutstart =~ s/%s/OpenSSL/;
99 + Locale::gettext::gettext("[-- End of OpenSSL output --]\n\n") =~
102 Locale::gettext::textdomain('gnupg');