diff options
| author | Werner Koch <[email protected]> | 2014-10-13 13:13:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-10-13 13:13:44 +0000 |
| commit | bf91c4c8d50ba6fc9ab06f79b02c01389e337c5e (patch) | |
| tree | 8b049d4ed261e45fc7d68c210a9c7ad58650c3d5 /g10/keyid.c | |
| parent | gpg: Remove all support for v3 keys and always create v4-signatures. (diff) | |
| parent | gpg: Remove extra RSA import status line. (diff) | |
| download | gnupg-wk/test-master.tar.gz gnupg-wk/test-master.zip | |
Merge branch 'master' into wk/test-masterwk/test-master
Diffstat (limited to 'g10/keyid.c')
| -rw-r--r-- | g10/keyid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index f1fbec211..662806b3e 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -695,7 +695,8 @@ fingerprint_from_pk (PKT_public_key *pk, byte *array, size_t *ret_len) pk->keyid[1] = dp[16] << 24 | dp[17] << 16 | dp[18] << 8 | dp[19] ; gcry_md_close( md); - *ret_len = len; + if (ret_len) + *ret_len = len; return array; } |