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

fixed a cipher suite name typo, changed the selection of the ECDH-RSA ciphers in InitSuites()

Browse Source
This commit is contained in:
John Safranek
2012-06-30 15:50:25 -07:00
parent 5dc0303dee
commit b1e39f66a3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/internal.c
View File

@@ -527,14 +527,14 @@ void InitSuites(Suites* suites, ProtocolVersion pv, byte haveDH, byte havePSK,
#endif #endif
#ifdef BUILD_TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
if (tls1_2 && haveRSA && haveStaticECC) { if (tls1_2 && (haveRSA || haveECDSA) && haveStaticECC) {
suites->suites[idx++] = ECC_BYTE; suites->suites[idx++] = ECC_BYTE;
suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256; suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256;
} }
#endif #endif
#ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
if (tls1_2 && haveRSA && haveStaticECC) { if (tls1_2 && (haveRSA || haveECDSA) && haveStaticECC) {
suites->suites[idx++] = ECC_BYTE; suites->suites[idx++] = ECC_BYTE;
suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384; suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384;
} }
@@ -646,7 +646,7 @@ void InitSuites(Suites* suites, ProtocolVersion pv, byte haveDH, byte havePSK,
#endif #endif
#ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
if (tls && haveRSA && haveStaticECC) { if (tls && (haveRSA || haveECDSA) && haveStaticECC) {
suites->suites[idx++] = ECC_BYTE; suites->suites[idx++] = ECC_BYTE;
suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_256_CBC_SHA; suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_256_CBC_SHA;
} }
@@ -660,7 +660,7 @@ void InitSuites(Suites* suites, ProtocolVersion pv, byte haveDH, byte havePSK,
#endif #endif
#ifdef BUILD_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA #ifdef BUILD_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
if (tls && haveRSA && haveStaticECC) { if (tls && (haveRSA || haveECDSA) && haveStaticECC) {
suites->suites[idx++] = ECC_BYTE; suites->suites[idx++] = ECC_BYTE;
suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_128_CBC_SHA; suites->suites[idx++] = TLS_ECDH_RSA_WITH_AES_128_CBC_SHA;
} }
@@ -3942,7 +3942,7 @@ const char* const cipher_names[] =
#endif #endif
#ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
"ECDHE-EDCSA-AES128-GCM-SHA256", "ECDHE-ECDSA-AES128-GCM-SHA256",
#endif #endif
#ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 #ifdef BUILD_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384