libgcrypt/cipher (ChangeLog pubkey.c)

[cvs user wk]

    Date: Friday, February 25, 2005 @ 11:48:10
  Author: wk
    Path: /cvs/libgcrypt/libgcrypt/cipher

Modified: ChangeLog pubkey.c

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


-----------+
 ChangeLog |    4 ++++
 pubkey.c  |    2 ++
 2 files changed, 6 insertions(+)


Index: libgcrypt/cipher/ChangeLog
diff -u libgcrypt/cipher/ChangeLog:1.224 libgcrypt/cipher/ChangeLog:1.225
--- libgcrypt/cipher/ChangeLog:1.224	Sun Feb 13 19:41:15 2005
+++ libgcrypt/cipher/ChangeLog	Fri Feb 25 11:48:10 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-02-13  Moritz Schulte  <moritz at g10code.com>
 
 	* serpent.c: Updated from 1.2 branch:
Index: libgcrypt/cipher/pubkey.c
diff -u libgcrypt/cipher/pubkey.c:1.74 libgcrypt/cipher/pubkey.c:1.75
--- libgcrypt/cipher/pubkey.c:1.74	Sun Feb 13 19:15:20 2005
+++ libgcrypt/cipher/pubkey.c	Fri Feb 25 11:48:10 2005
@@ -2086,6 +2086,8 @@
   if (! list)
     list = gcry_sexp_find_token (key, "protected-private-key", 0);
   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);