security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Fix error detection

This commit is contained in:
Werner Koch 2009-01-08 19:51:59 +00:00
parent 82ab848ea4
commit 901842d522
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sm/ChangeLog
View File

@ -1,3 +1,7 @@
2009-01-08 Werner Koch <wk@g10code.com>
* fingerprint.c (gpgsm_get_keygrip_hexstring): Add error detection.
2008-12-10 Werner Koch <wk@g10code.com> 2008-12-10 Werner Koch <wk@g10code.com>
* gpgsm.c (our_cipher_test_algo): Use the GCRY constants as we now * gpgsm.c (our_cipher_test_algo): Use the GCRY constants as we now

14
sm/fingerprint.c
View File

@ -152,9 +152,9 @@ gpgsm_get_short_fingerprint (ksba_cert_t cert)
/* Return the so called KEYGRIP which is the SHA-1 hash of the public /* Return the so called KEYGRIP which is the SHA-1 hash of the public
key parameters expressed as an canoncial encoded S-Exp. array must key parameters expressed as an canoncial encoded S-Exp. ARRAY must
be 20 bytes long. returns the array or a newly allocated one if the be 20 bytes long. Returns ARRAY or a newly allocated buffer if ARRAY was
passed one was NULL */ given as NULL. May return NULL on error. */
unsigned char * unsigned char *
gpgsm_get_keygrip (ksba_cert_t cert, unsigned char *array) gpgsm_get_keygrip (ksba_cert_t cert, unsigned char *array)
{ {
@ -204,9 +204,11 @@ gpgsm_get_keygrip_hexstring (ksba_cert_t cert)
unsigned char grip[20]; unsigned char grip[20];
char *buf; char *buf;
gpgsm_get_keygrip (cert, grip); if (!gpgsm_get_keygrip (cert, grip))
buf = xmalloc (20*2+1); return NULL;
bin2hex (grip, 20, buf); buf = xtrymalloc (20*2+1);
if (buf)
bin2hex (grip, 20, buf);
return buf; return buf;
} }