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

Merge pull request #776 from dgarske/fix_iis_signature_algorithms

Browse Source 
Fix issue with IIS servers and NO_OLD_TLS
This commit is contained in:
toddouska
2017-03-03 12:51:22 -08:00
committed by GitHub
parent 6800ffe8fa b5fe3ddbfa
commit 0d3ef0b399
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/internal.c
View File

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