diff options
| author | Werner Koch <wk@gnupg.org> | 2005-02-25 10:48:10 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2005-02-25 10:48:10 +0000 |
| commit | 03e7d919e079f0b7fee9f1c153f7283db28f1070 (patch) | |
| tree | 06dc326fe5b873800c10bddadea2146bf23e3a63 /cipher | |
| parent | 994669904713bddf7b578badfcc9aed8e496c96a (diff) | |
| download | libgcrypt-03e7d919e079f0b7fee9f1c153f7283db28f1070.tar.gz | |
(gcry_pk_get_keygrip): Allow for shadowed-private-key.
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/ChangeLog | 4 | ||||
| -rw-r--r-- | cipher/pubkey.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 3ace8abd..bc2a2ec2 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +2005-02-25 Werner Koch <wk@g10code.com> + + * pubkey.c (gcry_pk_get_keygrip): Allow for shadowed-private-key. + 2005-02-13 Moritz Schulte <moritz@g10code.com> * serpent.c: Updated from 1.2 branch: diff --git a/cipher/pubkey.c b/cipher/pubkey.c index af2890f4..b1d9b828 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -2086,6 +2086,8 @@ gcry_pk_get_keygrip (gcry_sexp_t key, unsigned char *array) 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); |