Fix regression introduced by "editing only change".
authorWerner Koch <wk@gnupg.org>
Mon, 24 Jan 2011 11:02:35 +0000 (12:02 +0100)
committerWerner Koch <wk@gnupg.org>
Mon, 24 Jan 2011 11:02:35 +0000 (12:02 +0100)
Signing and verification using a new key works again.

g10/parse-packet.c

index 5df336e..334a9a8 100644 (file)
@@ -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];