[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.19-6-gf3b00d8

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  f3b00d88efa25e23f70b757cf99302af77d3d7ae (commit)
      from  b3fd30451a5464b124b0296afbc341cb98b3977c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f3b00d88efa25e23f70b757cf99302af77d3d7ae
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue May 19 10:47:42 2015 +0900

    g10: detects public key encryption packet error properly.
    
    g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
    encryption.
    
    --
    
    (backported from 2.1 commit c771963140cad7c1c25349bcde27e427effc0058)

diff --git a/g10/mainproc.c b/g10/mainproc.c
index 2cf6dbc..a773fde 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -401,9 +401,9 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
 	    xfree(c->dek); c->dek = NULL;
 	}
     }
-    else if( is_ELGAMAL(enc->pubkey_algo)
-             || enc->pubkey_algo == PUBKEY_ALGO_DSA
-             || is_RSA(enc->pubkey_algo)
+    else if( enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E
+             || enc->pubkey_algo == PUBKEY_ALGO_RSA
+             || enc->pubkey_algo == PUBKEY_ALGO_RSA_E
              || (RFC2440 && enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL)) {
       /* Note that we also allow type 20 Elgamal keys for decryption.
          There are still a couple of those keys in active use as a

-----------------------------------------------------------------------

Summary of changes:
 g10/mainproc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org