From: Nikos Mavrogiannopoulos Date: Sat, 8 Mar 2014 15:43:45 +0000 (+0100) Subject: explicit type conversions when needed X-Git-Tag: gnutls_3_3_0pre0~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=422cbd3109aaef0f9e6b1ca11bbd63549fc4fcb1;p=thirdparty%2Fgnutls.git explicit type conversions when needed --- diff --git a/lib/accelerated/x86/aes-padlock.h b/lib/accelerated/x86/aes-padlock.h index 43a2f029a2..d72e70270c 100644 --- a/lib/accelerated/x86/aes-padlock.h +++ b/lib/accelerated/x86/aes-padlock.h @@ -9,14 +9,14 @@ struct padlock_cipher_data { union { unsigned int pad[4]; struct { - int rounds:4; - int dgst:1; /* n/a in C3 */ - int align:1; /* n/a in C3 */ - int ciphr:1; /* n/a in C3 */ + unsigned rounds:4; + unsigned dgst:1; /* n/a in C3 */ + unsigned align:1; /* n/a in C3 */ + unsigned ciphr:1; /* n/a in C3 */ unsigned int keygen:1; - int interm:1; + unsigned interm:1; unsigned int encdec:1; - int ksize:2; + unsigned ksize:2; } b; } cword; /* Control word */ AES_KEY ks; /* Encryption key */ diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c index 4d556c8acf..1c19a6606a 100644 --- a/lib/accelerated/x86/x86-common.c +++ b/lib/accelerated/x86/x86-common.c @@ -203,21 +203,21 @@ void register_x86_intel_crypto(void) ret = - gnutls_crypto_single_mac_register(GNUTLS_DIG_SHA1, + gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA1, 80, &_gnutls_hmac_sha_x86_ssse3); if (ret < 0) gnutls_assert(); ret = - gnutls_crypto_single_mac_register(GNUTLS_DIG_SHA224, + gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA224, 80, &_gnutls_hmac_sha_x86_ssse3); if (ret < 0) gnutls_assert(); ret = - gnutls_crypto_single_mac_register(GNUTLS_DIG_SHA256, + gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA256, 80, &_gnutls_hmac_sha_x86_ssse3); if (ret < 0) @@ -238,14 +238,14 @@ void register_x86_intel_crypto(void) if (ret < 0) gnutls_assert(); ret = - gnutls_crypto_single_mac_register(GNUTLS_DIG_SHA384, + gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA384, 80, &_gnutls_hmac_sha_x86_ssse3); if (ret < 0) gnutls_assert(); ret = - gnutls_crypto_single_mac_register(GNUTLS_DIG_SHA512, + gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA512, 80, &_gnutls_hmac_sha_x86_ssse3); if (ret < 0) diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c index e40313ebc7..86957b68f0 100644 --- a/lib/algorithms/ciphersuites.c +++ b/lib/algorithms/ciphersuites.c @@ -375,7 +375,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_RSA_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_RSA_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -383,7 +383,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_RSA_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), /* Salsa20 */ ENTRY(GNUTLS_RSA_SALSA20_256_SHA1, @@ -451,7 +451,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DHE_DSS_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_DHE_DSS, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_DHE_DSS_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_DHE_DSS, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -459,7 +459,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DHE_DSS_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_DHE_DSS, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), /* DHE_RSA */ ENTRY(GNUTLS_DHE_RSA_3DES_EDE_CBC_SHA1, @@ -510,7 +510,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DHE_RSA_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_DHE_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_DHE_RSA_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_DHE_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -518,7 +518,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DHE_RSA_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_DHE_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), #endif /* DHE */ #ifdef ENABLE_ECDHE /* ECC-RSA */ @@ -541,7 +541,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_ECDHE_RSA_AES_256_CBC_SHA384, GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_ECDHE_RSA_ARCFOUR_128_SHA1, GNUTLS_CIPHER_ARCFOUR, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_SHA1, GNUTLS_SSL3, @@ -553,7 +553,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_ECDHE_RSA_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), /* ECDHE-ECDSA */ ENTRY(GNUTLS_ECDHE_ECDSA_NULL_SHA1, @@ -583,7 +583,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), /* More ECC */ @@ -602,7 +602,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_ECDHE_ECDSA_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_ECDHE_ECDSA_AES_128_GCM_SHA256, GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -610,7 +610,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_ECDHE_ECDSA_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_ECDHE_RSA_AES_128_GCM_SHA256, GNUTLS_CIPHER_AES_128_GCM, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -618,11 +618,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_ECDHE_RSA_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY_PRF(GNUTLS_ECDHE_ECDSA_AES_256_CBC_SHA384, GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ECDHE_ECDSA, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_ECDHE_RSA_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_ECDHE_RSA, @@ -631,7 +631,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_ECDHE_RSA_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_ECDHE_RSA, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), /* Salsa20 */ ENTRY(GNUTLS_ECDHE_RSA_SALSA20_256_SHA1, @@ -733,7 +733,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_PSK_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_PSK_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -741,7 +741,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_PSK_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_PSK_AES_128_GCM_SHA256, @@ -763,7 +763,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_PSK_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_PSK_SALSA20_256_SHA1, GNUTLS_CIPHER_SALSA20_256, GNUTLS_KX_PSK, @@ -777,11 +777,11 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_PSK_AES_256_CBC_SHA384, GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY_PRF(GNUTLS_PSK_NULL_SHA384, GNUTLS_CIPHER_NULL, GNUTLS_KX_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), /* RSA-PSK */ ENTRY(GNUTLS_RSA_PSK_ARCFOUR_128_SHA1, @@ -807,7 +807,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_RSA_PSK_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_RSA_PSK_AES_128_GCM_SHA256, @@ -829,15 +829,15 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_RSA_PSK_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY_PRF(GNUTLS_RSA_PSK_AES_256_CBC_SHA384, GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY_PRF(GNUTLS_RSA_PSK_NULL_SHA384, GNUTLS_CIPHER_NULL, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_RSA_PSK_CAMELLIA_128_CBC_SHA256, GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_SHA256, GNUTLS_SSL3, @@ -845,7 +845,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_RSA_PSK_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_RSA_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), /* DHE-PSK */ @@ -884,15 +884,15 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DHE_PSK_NULL_SHA384, GNUTLS_CIPHER_NULL, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY_PRF(GNUTLS_DHE_PSK_AES_256_CBC_SHA384, GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY_PRF(GNUTLS_DHE_PSK_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_DHE_PSK_CAMELLIA_128_CBC_SHA256, GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_SHA256, GNUTLS_SSL3, @@ -900,7 +900,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DHE_PSK_CAMELLIA_256_CBC_SHA384, GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_SHA384, GNUTLS_SSL3, - GNUTLS_DTLS_VERSION_MIN, GNUTLS_DIG_SHA384), + GNUTLS_DTLS_VERSION_MIN, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_DHE_PSK_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -908,7 +908,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DHE_PSK_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_DHE_PSK, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), #endif #ifdef ENABLE_ANON /* DH_ANON */ @@ -963,7 +963,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DH_ANON_AES_256_GCM_SHA384, GNUTLS_CIPHER_AES_256_GCM, GNUTLS_KX_ANON_DH, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), ENTRY(GNUTLS_DH_ANON_CAMELLIA_128_GCM_SHA256, GNUTLS_CIPHER_CAMELLIA_128_GCM, GNUTLS_KX_ANON_DH, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, @@ -971,7 +971,7 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = { ENTRY_PRF(GNUTLS_DH_ANON_CAMELLIA_256_GCM_SHA384, GNUTLS_CIPHER_CAMELLIA_256_GCM, GNUTLS_KX_ANON_DH, GNUTLS_MAC_AEAD, GNUTLS_TLS1_2, - GNUTLS_DTLS1_2, GNUTLS_DIG_SHA384), + GNUTLS_DTLS1_2, GNUTLS_MAC_SHA384), /* ECC-ANON */ ENTRY(GNUTLS_ECDH_ANON_NULL_SHA1, diff --git a/lib/gnutls_hash_int.c b/lib/gnutls_hash_int.c index bdc9055721..237f0aed96 100644 --- a/lib/gnutls_hash_int.c +++ b/lib/gnutls_hash_int.c @@ -44,9 +44,9 @@ int _gnutls_hash_init(digest_hd_st * dig, const mac_entry_st * e) /* check if a digest has been registered */ - cc = _gnutls_get_crypto_digest(e->id); + cc = _gnutls_get_crypto_digest((gnutls_digest_algorithm_t)e->id); if (cc != NULL && cc->init) { - if (cc->init(e->id, &dig->handle) < 0) { + if (cc->init((gnutls_digest_algorithm_t)e->id, &dig->handle) < 0) { gnutls_assert(); return GNUTLS_E_HASH_FAILED; } @@ -58,7 +58,7 @@ int _gnutls_hash_init(digest_hd_st * dig, const mac_entry_st * e) return 0; } - result = _gnutls_digest_ops.init(e->id, &dig->handle); + result = _gnutls_digest_ops.init((gnutls_digest_algorithm_t)e->id, &dig->handle); if (result < 0) { gnutls_assert(); return result; @@ -252,12 +252,12 @@ void _gnutls_mac_deinit(mac_hd_st * handle, void *digest) handle->handle = NULL; } -inline static int get_padsize(gnutls_digest_algorithm_t algorithm) +inline static int get_padsize(gnutls_mac_algorithm_t algorithm) { switch (algorithm) { - case GNUTLS_DIG_MD5: + case GNUTLS_MAC_MD5: return 48; - case GNUTLS_DIG_SHA1: + case GNUTLS_MAC_SHA1: return 40; default: return 0; diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c index d71e6beecd..000ede04d4 100644 --- a/lib/nettle/pk.c +++ b/lib/nettle/pk.c @@ -1554,7 +1554,7 @@ static int wrap_nettle_hash_algorithm(gnutls_pk_algorithm_t pk, me = _gnutls_dsa_q_to_hash(pk, issuer_params, NULL); if (hash_algo) - *hash_algo = me->id; + *hash_algo = (gnutls_digest_algorithm_t)me->id; ret = 0; break; @@ -1587,7 +1587,8 @@ static int wrap_nettle_hash_algorithm(gnutls_pk_algorithm_t pk, } if (digest_size != - _gnutls_hash_get_algo_len(mac_to_entry(*hash_algo))) { + _gnutls_hash_get_algo_len(mac_to_entry( + (gnutls_mac_algorithm_t)*hash_algo))) { gnutls_assert(); ret = GNUTLS_E_PK_SIG_VERIFY_FAILED; goto cleanup;