diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-03-28 15:20:53 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-03-28 15:20:53 +0100 |
| commit | e682110f22956798ffa198216968fc91ee731f26 (patch) | |
| tree | 01e8c7f2c2b3abb11224fc47c122751ae6a4e85d | |
| parent | 87bc80df4c06fa2643e626da720d5c1bd6ba11c6 (diff) | |
| download | gnutls-e682110f22956798ffa198216968fc91ee731f26.tar.gz | |
Avoid defining SHA-224 MAC since it isn't specified in TLS 1.2.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | includes/gnutls/gnutls.h.in | 9 |
2 files changed, 4 insertions, 6 deletions
@@ -26,7 +26,6 @@ gnutls_crypto_cipher_register: ADDED gnutls_crypto_mac_register: ADDED gnutls_crypto_digest_register: ADDED GNUTLS_E_CRYPTO_ALREADY_REGISTERED: ADDED -GNUTLS_MAC_SHA224: ADDED GNUTLS_DIG_SHA224: ADDED GNUTLS_SIGN_RSA_SHA224: ADDED diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in index 6fbae7a375..eb7f8a7a27 100644 --- a/includes/gnutls/gnutls.h.in +++ b/includes/gnutls/gnutls.h.in @@ -125,10 +125,9 @@ extern "C" GNUTLS_MAC_MD2, GNUTLS_MAC_SHA256, GNUTLS_MAC_SHA384, - GNUTLS_MAC_SHA512, - /* There is no SHA-224 MAC algorithm but we need this declaration - to align with gnutls_digest_algorithm_t. */ - GNUTLS_MAC_SHA224 + GNUTLS_MAC_SHA512 + /* If you add anything here, make sure you align with + gnutls_digest_algorithm_t, in particular SHA-224. */ } gnutls_mac_algorithm_t; /* The enumerations here should have the same value with @@ -144,7 +143,7 @@ extern "C" GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256, GNUTLS_DIG_SHA384 = GNUTLS_MAC_SHA384, GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512, - GNUTLS_DIG_SHA224 = GNUTLS_MAC_SHA224 + GNUTLS_DIG_SHA224 } gnutls_digest_algorithm_t; /* exported for other gnutls headers. This is the maximum number of |