wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to allow signature_algorithms extension to send SHA1 (if enabled) and NO_OLD_TLS is defined. This resolves an issue connected to ISS servers.

Browse Source
This commit is contained in:
David Garske
2017-03-01 19:07:13 -08:00
parent b86dfd582f
commit d903059e05
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/internal.c
View File

@@ -1672,7 +1672,7 @@ static void InitSuitesHashSigAlgo(Suites* suites, int haveECDSAsig,
suites->hashSigAlgo[idx++] = sha256_mac;
suites->hashSigAlgo[idx++] = ecc_dsa_sa_algo;
#endif
#if !defined(NO_SHA) && !defined(NO_OLD_TLS)
#if !defined(NO_SHA)
suites->hashSigAlgo[idx++] = sha_mac;
suites->hashSigAlgo[idx++] = ecc_dsa_sa_algo;
#endif
@@ -1691,7 +1691,7 @@ static void InitSuitesHashSigAlgo(Suites* suites, int haveECDSAsig,
suites->hashSigAlgo[idx++] = sha256_mac;
suites->hashSigAlgo[idx++] = rsa_sa_algo;
#endif
#if !defined(NO_SHA) && !defined(NO_OLD_TLS)
#if !defined(NO_SHA)
suites->hashSigAlgo[idx++] = sha_mac;
suites->hashSigAlgo[idx++] = rsa_sa_algo;
#endif
@@ -14749,7 +14749,7 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
#endif
break;
case sha_mac:
#ifndef NO_OLD_TLS
#ifndef NO_SHA
hashType = WC_HASH_TYPE_SHA;
#endif
break;
@@ -17756,7 +17756,7 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif
break;
case sha_mac:
#ifndef NO_OLD_TLS
#ifndef NO_SHA
hashType = WC_HASH_TYPE_SHA;
#endif
break;
@@ -17850,7 +17850,7 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif
break;
case sha_mac:
#ifndef NO_OLD_TLS
#ifndef NO_SHA
typeH = SHAh;
#endif
break;
@@ -18020,7 +18020,7 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif
break;
case sha_mac:
#ifndef NO_OLD_TLS
#ifndef NO_SHA
hashType = WC_HASH_TYPE_SHA;
#endif
break;
@@ -18109,7 +18109,7 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif
break;
case sha_mac:
#ifndef NO_OLD_TLS
#ifndef NO_SHA
typeH = SHAh;
#endif
break;