LIBGCRYPT-1-2-BRANCH libgcrypt/cipher (ChangeLog pubkey.c)

[cvs user wk]

    Date: Friday, February 25, 2005 @ 11:48:44
  Author: wk
    Path: /cvs/libgcrypt/libgcrypt/cipher
     Tag: LIBGCRYPT-1-2-BRANCH

Modified: ChangeLog pubkey.c

(gcry_pk_get_keygrip): Allow for shadowed-private-key.


-----------+
 ChangeLog |    4 ++++
 pubkey.c  |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)


Index: libgcrypt/cipher/ChangeLog
diff -u libgcrypt/cipher/ChangeLog:1.211.2.8 libgcrypt/cipher/ChangeLog:1.211.2.9
--- libgcrypt/cipher/ChangeLog:1.211.2.8	Wed Jan  5 17:29:38 2005
+++ libgcrypt/cipher/ChangeLog	Fri Feb 25 11:48:44 2005
@@ -1,3 +1,7 @@
+2005-02-25  Werner Koch  <wk at g10code.com>
+
+	* pubkey.c (gcry_pk_get_keygrip): Allow for shadowed-private-key.
+
 2005-01-05  Werner Koch  <wk at g10code.com>
 
 	* serpent.c: s/u32_t/u32/ and s/byte_t/byte/.  Too match what we
Index: libgcrypt/cipher/pubkey.c
diff -u libgcrypt/cipher/pubkey.c:1.69.2.4 libgcrypt/cipher/pubkey.c:1.69.2.5
--- libgcrypt/cipher/pubkey.c:1.69.2.4	Wed Sep 15 16:56:22 2004
+++ libgcrypt/cipher/pubkey.c	Fri Feb 25 11:48:44 2005
@@ -2088,11 +2088,13 @@
 
   /* Check that the first element is valid. */
   list = gcry_sexp_find_token (key, "public-key", 0);
-  if (! list)
+  if (!list)
     list = gcry_sexp_find_token (key, "private-key", 0);
-  if (! list)
+  if (!list)
     list = gcry_sexp_find_token (key, "protected-private-key", 0);
-  if (! list)
+  if (!list)
+    list = gcry_sexp_find_token (key, "shadowed-private-key", 0);
+  if (!list)
     return NULL; /* No public- or private-key object. */
 
   l2 = gcry_sexp_cadr (list);