diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-03-19 08:13:54 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-03-19 08:13:58 +0100 |
| commit | 10c585a92d05538fbd3936d9d81bd4296b7e3f8d (patch) | |
| tree | 9998fe54423e2fe62200655daaa7f01199cc3580 /lib/x509 | |
| parent | 7b4d1f763a2b2476074c903f3ab059f53dcdddc0 (diff) | |
| download | gnutls-10c585a92d05538fbd3936d9d81bd4296b7e3f8d.tar.gz | |
The HMAC subsystem can now be used for other MAC algorithms, like UMAC. UMAC-96 and UMAC-128 were conditionally added.
Diffstat (limited to 'lib/x509')
| -rw-r--r-- | lib/x509/pbkdf2-sha1.c | 4 | ||||
| -rw-r--r-- | lib/x509/pkcs12.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/x509/pbkdf2-sha1.c b/lib/x509/pbkdf2-sha1.c index c468460fc8..b43ce5963c 100644 --- a/lib/x509/pbkdf2-sha1.c +++ b/lib/x509/pbkdf2-sha1.c @@ -173,10 +173,10 @@ _gnutls_pbkdf2_sha1 (const char *P, size_t Plen, tmp[Slen + 3] = (i & 0x000000ff) >> 0; rc = - _gnutls_hmac_fast (GNUTLS_MAC_SHA1, P, Plen, tmp, tmplen, U); + _gnutls_mac_fast (GNUTLS_MAC_SHA1, P, Plen, tmp, tmplen, U); } else - rc = _gnutls_hmac_fast (GNUTLS_MAC_SHA1, P, Plen, U, hLen, U); + rc = _gnutls_mac_fast (GNUTLS_MAC_SHA1, P, Plen, U, hLen, U); if (rc < 0) { diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c index 1d12947b16..448b1658fc 100644 --- a/lib/x509/pkcs12.c +++ b/lib/x509/pkcs12.c @@ -871,7 +871,7 @@ gnutls_pkcs12_generate_mac (gnutls_pkcs12_t pkcs12, const char *pass) uint8_t salt[8], key[20]; int result; const int iter = 1; - digest_hd_st td1; + mac_hd_st td1; gnutls_datum_t tmp = { NULL, 0 }; uint8_t sha_mac[20]; @@ -937,17 +937,17 @@ gnutls_pkcs12_generate_mac (gnutls_pkcs12_t pkcs12, const char *pass) /* MAC the data */ - result = _gnutls_hmac_init (&td1, GNUTLS_MAC_SHA1, key, sizeof (key)); + result = _gnutls_mac_init (&td1, GNUTLS_MAC_SHA1, key, sizeof (key)); if (result < 0) { gnutls_assert (); goto cleanup; } - _gnutls_hmac (&td1, tmp.data, tmp.size); + _gnutls_mac (&td1, tmp.data, tmp.size); _gnutls_free_datum (&tmp); - _gnutls_hmac_deinit (&td1, sha_mac); + _gnutls_mac_deinit (&td1, sha_mac); result = @@ -1005,7 +1005,7 @@ gnutls_pkcs12_verify_mac (gnutls_pkcs12_t pkcs12, const char *pass) int result; unsigned int iter; int len; - digest_hd_st td1; + mac_hd_st td1; gnutls_datum_t tmp = { NULL, 0 }, salt = { NULL, 0}; @@ -1063,17 +1063,17 @@ gnutls_pkcs12_verify_mac (gnutls_pkcs12_t pkcs12, const char *pass) /* MAC the data */ - result = _gnutls_hmac_init (&td1, GNUTLS_MAC_SHA1, key, sizeof (key)); + result = _gnutls_mac_init (&td1, GNUTLS_MAC_SHA1, key, sizeof (key)); if (result < 0) { gnutls_assert (); goto cleanup; } - _gnutls_hmac (&td1, tmp.data, tmp.size); + _gnutls_mac (&td1, tmp.data, tmp.size); _gnutls_free_datum (&tmp); - _gnutls_hmac_deinit (&td1, sha_mac); + _gnutls_mac_deinit (&td1, sha_mac); len = sizeof (sha_mac_orig); result = |