diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2009-12-05 10:08:22 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2009-12-05 10:08:22 +0200 |
| commit | e64d8f55e46fe0638191e1c01f6bde303753d91b (patch) | |
| tree | 4e0a97352bd5e8d10d3f8e77599e8d29b0511668 /lib/x509/privkey.c | |
| parent | 73d29186d2c962ec53aae56e0d1aeb2cab073628 (diff) | |
| download | gnutls-e64d8f55e46fe0638191e1c01f6bde303753d91b.tar.gz | |
Revert "Merged the two internal hash API functions, to simplify and reduce code."
This reverts commit bc3e43d5f121e404aa32212dcfcc5027de807056.
Conflicts:
lib/crypto.c
lib/gnutls_cipher.c
lib/gnutls_hash_int.c
lib/gnutls_hash_int.h
lib/includes/gnutls/crypto.h
lib/mac-libgcrypt.c
Diffstat (limited to 'lib/x509/privkey.c')
| -rw-r--r-- | lib/x509/privkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index c713e77b0e..517e287934 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -1402,7 +1402,7 @@ gnutls_x509_privkey_get_key_id (gnutls_x509_privkey_t key, size_t * output_data_size) { int result; - hash_hd_st hd; + digest_hd_st hd; gnutls_datum_t der = { NULL, 0 }; if (key == NULL || key->crippled) @@ -1442,7 +1442,7 @@ gnutls_x509_privkey_get_key_id (gnutls_x509_privkey_t key, else return GNUTLS_E_INTERNAL_ERROR; - result = _gnutls_hash_init (&hd, GNUTLS_MAC_SHA1, NULL, 0); + result = _gnutls_hash_init (&hd, GNUTLS_MAC_SHA1); if (result < 0) { gnutls_assert (); |