forked from wolfSSL/wolfssl
Always have support for SHA-224 signatures when SHA-224 built-in
This commit is contained in:
@ -1946,11 +1946,9 @@ void InitSuitesHashSigAlgo(Suites* suites, int haveECDSAsig, int haveRSAsig,
|
||||
#ifndef NO_SHA256
|
||||
AddSuiteHashSigAlgo(suites, sha256_mac, rsa_sa_algo, keySz, &idx);
|
||||
#endif
|
||||
#ifdef OPENSSL_ALL
|
||||
#ifdef WOLFSSL_SHA224
|
||||
AddSuiteHashSigAlgo(suites, sha224_mac, rsa_sa_algo, keySz, &idx);
|
||||
#endif
|
||||
#endif
|
||||
#if !defined(NO_SHA) && (!defined(NO_OLD_TLS) || \
|
||||
defined(WOLFSSL_ALLOW_TLS_SHA1))
|
||||
AddSuiteHashSigAlgo(suites, sha_mac, rsa_sa_algo, keySz, &idx);
|
||||
@ -2918,12 +2916,10 @@ static enum wc_HashType HashAlgoToType(int hashAlgo)
|
||||
case sha256_mac:
|
||||
return WC_HASH_TYPE_SHA256;
|
||||
#endif
|
||||
#ifdef OPENSSL_ALL
|
||||
#ifdef WOLFSSL_SHA224
|
||||
case sha224_mac:
|
||||
return WC_HASH_TYPE_SHA224;
|
||||
#endif
|
||||
#endif
|
||||
#if !defined(NO_SHA) && (!defined(NO_OLD_TLS) || \
|
||||
defined(WOLFSSL_ALLOW_TLS_SHA1))
|
||||
case sha_mac:
|
||||
@ -3128,12 +3124,10 @@ static int TypeHash(int hashAlgo)
|
||||
case sha256_mac:
|
||||
return SHA256h;
|
||||
#endif
|
||||
#ifdef OPENSSL_ALL
|
||||
#ifdef WOLFSSL_SHA224
|
||||
case sha224_mac:
|
||||
return SHA224h;
|
||||
#endif
|
||||
#endif
|
||||
#ifndef NO_SHA
|
||||
case sha_mac:
|
||||
return SHAh;
|
||||
@ -16835,11 +16829,9 @@ void PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo,
|
||||
/* pick highest available between both server and client */
|
||||
switch (hashAlgo) {
|
||||
case sha_mac:
|
||||
#ifdef OPENSSL_ALL
|
||||
#ifdef WOLFSSL_SHA224
|
||||
case sha224_mac:
|
||||
#endif
|
||||
#endif
|
||||
#ifndef NO_SHA256
|
||||
case sha256_mac:
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user