[git] GnuPG - branch, ECC-INTEGRATION-2-1, updated. gnupg-2.1.0beta1-41-gb3adbb5

[by Werner Koch]

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, ECC-INTEGRATION-2-1 has been updated
       via  b3adbb576e88a12ee9e7ea790a72ad5f1bff4c78 (commit)
      from  c3db7705c049e31e678ff87e230b8160aa0027f1 (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 b3adbb576e88a12ee9e7ea790a72ad5f1bff4c78
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jan 24 12:02:35 2011 +0100

    Fix regression introduced by "editing only change".
    
    Signing and verification using a new key works again.

diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 5df336e..334a9a8 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1953,7 +1953,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
   else
     {
       /* Fill in public key parameters.  */
-      if (algorithm == PUBKEY_ALGO_ECDSA && algorithm == PUBKEY_ALGO_ECDH)
+      if (algorithm == PUBKEY_ALGO_ECDSA || algorithm == PUBKEY_ALGO_ECDH)
         {
           /* FIXME: The code in this function ignores the errors.  */
           byte name_oid[256];

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

Summary of changes:
 g10/parse-packet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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