aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2011-01-24 11:02:35 +0000
committerWerner Koch <[email protected]>2011-01-24 11:02:35 +0000
commitb3adbb576e88a12ee9e7ea790a72ad5f1bff4c78 (patch)
tree1eff14da1aca2f4bb21c88e39caaa0f86a1c8041
parentTruncate the DSA hash; fixes regression. (diff)
downloadgnupg-b3adbb576e88a12ee9e7ea790a72ad5f1bff4c78.tar.gz
gnupg-b3adbb576e88a12ee9e7ea790a72ad5f1bff4c78.zip
Fix regression introduced by "editing only change".
Signing and verification using a new key works again.
-rw-r--r--g10/parse-packet.c2
1 files changed, 1 insertions, 1 deletions
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];