Try to handle expired keys specified in also-encrypt-to better

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@335 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index 5d6121ef0d02cef9313112a574f19c6583398af0..9ce3a966b8c1a91e8133e642778b80ae8b28548f 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -477,6 +477,9 @@ sub load_config() {
        unless (defined $CONFIG{'mail-template'}) {
                $CONFIG{'mail-template'} .= $_ foreach <DATA>;
        }
+       if ((defined $CONFIG{'also-encrypt-to'}) && ! (ref($CONFIG{'also-encrypt-to'}) eq 'ARRAY')) {
+               $CONFIG{'also-encrypt-to'} = [ $CONFIG{'also-encrypt-to'} ];
+       };
 };
 
 sub make_gpg_fds() {
@@ -766,19 +769,23 @@ sub send_mail($$$@) {
                my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
                $gpg->options->push_recipients( $key_id );
                if (defined $CONFIG{'also-encrypt-to'}) {
-                       if (ref($CONFIG{'also-encrypt-to'})) {
-                               $gpg->options->push_recipients($_)
-                                       foreach @{$CONFIG{'also-encrypt-to'}};
-                       } else {
-                               $gpg->options->push_recipients($CONFIG{'also-encrypt-to'});
-                       }
+                       $gpg->options->push_recipients($_) foreach @{$CONFIG{'also-encrypt-to'}};
                }
                my $pid = $gpg->encrypt(handles => $handles);
                my ($stdout, $stderr, $status) = readwrite_gpg($message, $inputfd, $stdoutfd, $stderrfd, $statusfd);
                waitpid $pid, 0;
                if ($stdout eq '') {
-                       warn ("No data from gpg for encrypting mail\n");
-                       next;
+                       if (($status =~ /^\[GNUPG:\] INV_RECP ([0-9]+) ([0-9A-F]+)/m) and
+                           (defined $CONFIG{'also-encrypt-to'})) {
+                               my $reason = $1;
+                               my $keyid = $2;
+                               if (grep { %_ eq $keyid } @{$CONFIG{'also-encrypt-to'}}) {
+                                       warn("Could not encrypt to $keyid, spezified in CONFIG{'also-encrypt-to'}.  Try to update the key using gpg --homedir=\$HOME/caff/gnupghome --import <keyd>.");
+                                       return;
+                               };
+                       };
+                       warn ("No data from gpg for encrypting mail.  STDERR was:\n$stderr\nstatus output was:\n$status\n");
+                       return;
                };
                $message = $stdout;
 

diff --git a/debian/changelog b/debian/changelog
index d55d1ef21e144101c0532b61d1921c36b0b8c6ca..3195e5205abe38218b14c7a0ab4e02b29f0074da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ signing-party (0.4.11-2) UNRELEASED; urgency=low
 
   [ Peter Palfrader ]
   * Fix a warning message in caff when encrypting fails.
+  * Try to handle expired keys specified in also-encrypt-to better
 
- -- Peter Palfrader <weasel@debian.org>  Tue,  3 Jul 2007 15:40:34 +0200
+ -- Peter Palfrader <weasel@debian.org>  Tue,  3 Jul 2007 15:53:27 +0200
 
 signing-party (0.4.11-1) unstable; urgency=low