Merge pull request #488 from cconlon/sig_algo

leave off SHA1-RSA/ECDSA signature algorithms when NO_OLD_TLS is defined
This commit is contained in:
toddouska
2016-07-26 11:05:24 -07:00
committed by GitHub

View File

@ -1704,7 +1704,7 @@ static void InitSuitesHashSigAlgo(Suites* suites, int haveECDSAsig,
suites->hashSigAlgo[idx++] = sha256_mac;
suites->hashSigAlgo[idx++] = ecc_dsa_sa_algo;
#endif
#ifndef NO_SHA
#if !defined(NO_SHA) && !defined(NO_OLD_TLS)
suites->hashSigAlgo[idx++] = sha_mac;
suites->hashSigAlgo[idx++] = ecc_dsa_sa_algo;
#endif
@ -1723,7 +1723,7 @@ static void InitSuitesHashSigAlgo(Suites* suites, int haveECDSAsig,
suites->hashSigAlgo[idx++] = sha256_mac;
suites->hashSigAlgo[idx++] = rsa_sa_algo;
#endif
#ifndef NO_SHA
#if !defined(NO_SHA) && !defined(NO_OLD_TLS)
suites->hashSigAlgo[idx++] = sha_mac;
suites->hashSigAlgo[idx++] = rsa_sa_algo;
#endif