[git] GnuPG - branch, master, updated. gnupg-2.1.4-4-gc771963

[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, master has been updated
       via  c771963140cad7c1c25349bcde27e427effc0058 (commit)
      from  5038276fc47ca8406eb41c640d96f8ec7d2f5f88 (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 c771963140cad7c1c25349bcde27e427effc0058
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue May 19 10:32:07 2015 +0900

    g10: detects public key encryption packet error properly.
    
    g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
    encryption.

diff --git a/g10/mainproc.c b/g10/mainproc.c
index e72d076..c90b9e3 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -406,12 +406,10 @@ proc_pubkey_enc (CTX c, PACKET *pkt)
           c->dek = NULL;
 	}
     }
-  else if (is_ELGAMAL(enc->pubkey_algo)
-           || enc->pubkey_algo == PUBKEY_ALGO_DSA
-           || enc->pubkey_algo == PUBKEY_ALGO_ECDSA
-           || enc->pubkey_algo == PUBKEY_ALGO_EDDSA
+  else if (enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E
            || enc->pubkey_algo == PUBKEY_ALGO_ECDH
-           || is_RSA (enc->pubkey_algo)
+           || enc->pubkey_algo == PUBKEY_ALGO_RSA
+           || enc->pubkey_algo == PUBKEY_ALGO_RSA_E
            || enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL)
     {
       /* Note that we also allow type 20 Elgamal keys for decryption.

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

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


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