feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Make sure to send SCSV when application sets ciphersuites

Browse Source
This commit is contained in:
Anthony Hu
2023-12-06 14:08:53 -05:00
parent 2c9208b0c6
commit 3c5b402740
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/internal.c
View File

@@ -26104,8 +26104,6 @@ int SetCipherList(WOLFSSL_CTX* ctx, Suites* suites, const char* list)
#endif #endif
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
if (callInitSuites) { if (callInitSuites) {
byte tmp[WOLFSSL_MAX_SUITE_SZ];
XMEMCPY(tmp, suites->suites, idx); /* Store copy */
suites->setSuites = 0; /* Force InitSuites */ suites->setSuites = 0; /* Force InitSuites */
suites->hashSigAlgoSz = 0; /* Force InitSuitesHashSigAlgo call suites->hashSigAlgoSz = 0; /* Force InitSuitesHashSigAlgo call
* inside InitSuites */ * inside InitSuites */
@@ -26130,6 +26128,16 @@ int SetCipherList(WOLFSSL_CTX* ctx, Suites* suites, const char* list)
InitSuitesHashSigAlgo_ex2(suites->hashSigAlgo, haveSig, 1, keySz, InitSuitesHashSigAlgo_ex2(suites->hashSigAlgo, haveSig, 1, keySz,
&suites->hashSigAlgoSz); &suites->hashSigAlgoSz);
} }
#ifdef HAVE_RENEGOTIATION_INDICATION
if (suites->suiteSz > WOLFSSL_MAX_SUITE_SZ - 2) {
WOLFSSL_MSG("Too many ciphersuites");
return 0;
}
suites->suites[suites->suiteSz] = CIPHER_BYTE;
suites->suites[suites->suiteSz+1] = TLS_EMPTY_RENEGOTIATION_INFO_SCSV;
suites->suiteSz += 2;
#endif
suites->setSuites = 1; suites->setSuites = 1;
} }
@@ -26265,6 +26273,15 @@ int SetCipherListFromBytes(WOLFSSL_CTX* ctx, Suites* suites, const byte* list,
haveSig |= haveAnon ? SIG_ANON : 0; haveSig |= haveAnon ? SIG_ANON : 0;
InitSuitesHashSigAlgo_ex2(suites->hashSigAlgo, haveSig, 1, keySz, InitSuitesHashSigAlgo_ex2(suites->hashSigAlgo, haveSig, 1, keySz,
&suites->hashSigAlgoSz); &suites->hashSigAlgoSz);
#ifdef HAVE_RENEGOTIATION_INDICATION
if (suites->suiteSz > WOLFSSL_MAX_SUITE_SZ - 2) {
WOLFSSL_MSG("Too many ciphersuites");
return 0;
}
suites->suites[suites->suiteSz] = CIPHER_BYTE;
suites->suites[suites->suiteSz+1] = TLS_EMPTY_RENEGOTIATION_INFO_SCSV;
suites->suiteSz += 2;
#endif
suites->setSuites = 1; suites->setSuites = 1;
} }