#!/usr/bin/perl -w
-# $Id: t-prot,v 1.310 2010/07/10 19:14:36 jochen Exp $
+# $Id: t-prot,v 1.312 2010/10/31 11:18:15 jochen Exp $
require 5.006;
use strict;
use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
use Getopt::Long qw(:config gnu_getopt no_ignore_case);
-use constant VER => '2.100';
+use constant VER => '2.101';
use constant REV => '';
-use constant REL => q$Revision: 1.310 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL => q$Revision: 1.312 $=~m/(\d+(?:\.\d+)+)/;
# MTA expecting mail on STDIN
# (you might have to adjust this if using a different MTA)
use constant SENDMAIL => '/usr/sbin/sendmail -oi';
$mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
$mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
- $mutt_pgpoutstart $mutt_pgpoutend
+ $mutt_pgpoutstart $mutt_pgpoutend $mutt_pgpcryptend $mutt_pgpcryptstart
);
$mutt_pgpsigned = '[-- End of signed data --]';
$mutt_beginsigned = '[-- The following data is signed --]';
$mutt_pgpclearsigstart = '[-- BEGIN PGP SIGNED MESSAGE --]';
+$mutt_pgpcryptend = '[-- END PGP MESSAGE --]';
+$mutt_pgpcryptstart = '[-- BEGIN PGP MESSAGE --]';
$mutt_pgpclearsigned = '[-- END PGP SIGNED MESSAGE --]';
$mutt_pgpencrypted = '[-- End of PGP/MIME encrypted data --]';
$mutt_pgpoutstart = '[-- PGP output follows (current time:';
$$L[$x] =~ /^
(?:\e[^\a]+\a)?
(?:\Q$mutt_pgpencrypted\E |
+ \Q$mutt_pgpcryptend\E|
\Q$mutt_pgpclearsigned\E|
\Q$mutt_pgpsigned\E)
/ox)
(?:\e[^\a]+\a)?
(?:\Q$mutt_pgpsigned\E |
\Q$mutt_pgpclearsigned\E|
+ \Q$mutt_pgpcryptend\E|
\Q$mutt_pgpencrypted\E)
/ox))
{
} elsif ($mua eq 'mutt' && $tmp &&
($$lines[$x] =~
/^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
+ $$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpcryptstart\E)/o ||
$$lines[$x] =~
/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigstart\E)/o)) {
$tmp = 0;