From b3adbb576e88a12ee9e7ea790a72ad5f1bff4c78 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 24 Jan 2011 12:02:35 +0100
Subject: [PATCH] Fix regression introduced by "editing only change".

Signing and verification using a new key works again.
---
 g10/parse-packet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 5df336e55..334a9a82b 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];