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/gnutls_srp.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/gnutls_srp.c')
| -rw-r--r-- | lib/gnutls_srp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c index 4e2a270959..3131083596 100644 --- a/lib/gnutls_srp.c +++ b/lib/gnutls_srp.c @@ -166,7 +166,7 @@ _gnutls_calc_srp_u (bigint_t A, bigint_t B, bigint_t n) size_t b_size, a_size; opaque *holder, hd[MAX_HASH_SIZE]; size_t holder_size, hash_size, n_size; - hash_hd_st td; + digest_hd_st td; int ret; bigint_t res; @@ -191,7 +191,7 @@ _gnutls_calc_srp_u (bigint_t A, bigint_t B, bigint_t n) _gnutls_mpi_print (A, &holder[n_size - a_size], &a_size); _gnutls_mpi_print (B, &holder[n_size + n_size - b_size], &b_size); - ret = _gnutls_hash_init (&td, GNUTLS_MAC_SHA1, NULL, 0); + ret = _gnutls_hash_init (&td, GNUTLS_MAC_SHA1); if (ret < 0) { gnutls_free (holder); @@ -289,13 +289,13 @@ _gnutls_calc_srp_sha (const char *username, const char *password, opaque * salt, int salt_size, size_t * size, void *digest) { - hash_hd_st td; + digest_hd_st td; opaque res[MAX_HASH_SIZE]; int ret; *size = 20; - ret = _gnutls_hash_init (&td, GNUTLS_MAC_SHA1, NULL, 0); + ret = _gnutls_hash_init (&td, GNUTLS_MAC_SHA1); if (ret < 0) { return GNUTLS_E_MEMORY_ERROR; @@ -306,7 +306,7 @@ _gnutls_calc_srp_sha (const char *username, const char *password, _gnutls_hash_deinit (&td, res); - ret = _gnutls_hash_init (&td, GNUTLS_MAC_SHA1, NULL, 0); + ret = _gnutls_hash_init (&td, GNUTLS_MAC_SHA1); if (ret < 0) { return GNUTLS_E_MEMORY_ERROR; |