1 --- t-prot Mon Feb 14 14:29:31 2005
2 +++ t-prot-M157 Fri Feb 11 13:53:28 2005
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)?(?:$mutt_pgpoutstart)/o)
26 + if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart|$mutt_ssloutstart)/o)
29 for (my $m=0; $m<scalar(@$H); $m++) {
34 - elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/o)
35 + elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend|$mutt_ssloutend)/o)
38 ($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) || $$lines[$x]!~/^$spass_prefix/o))
51 if ($mua eq 'mutt' && (!$tmp) &&
52 - $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o) {
53 + ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o ||
54 + $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_ssloutstart)/o)) {
56 } elsif ($mua eq 'mutt' && $tmp &&
57 ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_beginsigned)/o ||
59 Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
62 - Locale::gettext::gettext("[-- End of signed data --]\n") =~
64 + Locale::gettext::gettext("\n[-- End of signed data --]\n") =~
67 Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
70 Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
72 ($mutt_pgpclearsigstart) =
73 - Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
74 + Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n\n") =~
76 ($mutt_pgpencrypted) =
77 Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
80 - Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
82 + Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
84 + $mutt_pgpoutstart =~ s/%s/PGP/;
86 - Locale::gettext::gettext("[-- End of PGP output --]\n") =~
87 + Locale::gettext::gettext("[-- End of PGP output --]\n\n") =~
89 + ($mutt_ssloutstart) =
90 + Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
92 + $mutt_ssloutstart =~ s/%s/OpenSSL/;
94 + Locale::gettext::gettext("[-- End of OpenSSL output --]\n\n") =~
97 Locale::gettext::textdomain('gnupg');
99 esc(\$mutt_pgpencrypted);
100 esc(\$mutt_pgpoutstart);
101 esc(\$mutt_pgpoutend);
102 + esc(\$mutt_ssloutstart);
103 + esc(\$mutt_ssloutend);