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

Merge pull request #6213 from SparkiDev/regression_fixes_6

Browse Source 
Regression testing fixes
This commit is contained in:
JacobBarthelmeh
2023-03-21 20:17:30 -06:00
committed by GitHub
parent 1eeb54e981 9ec742b11f
commit 147395476f
12 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/internal.c
View File

@@ -2404,7 +2404,7 @@ void wolfSSL_CRYPTO_cleanup_ex_data(WOLFSSL_CRYPTO_EX_DATA* ex_data)
} }
#endif /* HAVE_EX_DATA_CLEANUP_HOOKS */ #endif /* HAVE_EX_DATA_CLEANUP_HOOKS */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
/* free all ech configs in the list */ /* free all ech configs in the list */
static void FreeEchConfigs(WOLFSSL_EchConfig* configs, void* heap) static void FreeEchConfigs(WOLFSSL_EchConfig* configs, void* heap)
{ {
@@ -2591,7 +2591,7 @@ void SSL_CtxResourceFree(WOLFSSL_CTX* ctx)
} }
#endif #endif
#endif #endif
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
FreeEchConfigs(ctx->echConfigs, ctx->heap); FreeEchConfigs(ctx->echConfigs, ctx->heap);
ctx->echConfigs = NULL; ctx->echConfigs = NULL;
#endif #endif
@@ -6934,8 +6934,10 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
#endif #endif
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK) #if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
ssl->options.noPskDheKe = ctx->noPskDheKe; ssl->options.noPskDheKe = ctx->noPskDheKe;
#ifdef HAVE_SUPPORTED_CURVES
ssl->options.onlyPskDheKe = ctx->onlyPskDheKe; ssl->options.onlyPskDheKe = ctx->onlyPskDheKe;
#endif #endif /* HAVE_SUPPORTED_CURVES */
#endif /* HAVE_SESSION_TICKET || !NO_PSK */
#if defined(WOLFSSL_POST_HANDSHAKE_AUTH) #if defined(WOLFSSL_POST_HANDSHAKE_AUTH)
ssl->options.postHandshakeAuth = ctx->postHandshakeAuth; ssl->options.postHandshakeAuth = ctx->postHandshakeAuth;
ssl->options.verifyPostHandshake = ctx->verifyPostHandshake; ssl->options.verifyPostHandshake = ctx->verifyPostHandshake;
@@ -7612,8 +7614,8 @@ void SSL_ResourceFree(WOLFSSL* ssl)
FreeHandshakeHashes(ssl); FreeHandshakeHashes(ssl);
ssl->options.useEch = 0; ssl->options.useEch = 0;
} }
#endif #endif /* HAVE_ECH */
#endif #endif /* WOLFSSL_TLS13 */
#ifdef WOLFSSL_HAVE_TLS_UNIQUE #ifdef WOLFSSL_HAVE_TLS_UNIQUE
ForceZero(&ssl->clientFinished, TLS_FINISHED_SZ_MAX); ForceZero(&ssl->clientFinished, TLS_FINISHED_SZ_MAX);
ForceZero(&ssl->serverFinished, TLS_FINISHED_SZ_MAX); ForceZero(&ssl->serverFinished, TLS_FINISHED_SZ_MAX);

4
src/ssl.c
View File

@@ -450,7 +450,7 @@ const WOLF_EC_NIST_NAME kNistCurves[] = {
}; };
#endif #endif
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
/* create the hpke key and ech config to send to clients */ /* create the hpke key and ech config to send to clients */
int wolfSSL_CTX_GenerateEchConfig(WOLFSSL_CTX* ctx, const char* publicName, int wolfSSL_CTX_GenerateEchConfig(WOLFSSL_CTX* ctx, const char* publicName,
word16 kemId, word16 kdfId, word16 aeadId) word16 kemId, word16 kdfId, word16 aeadId)
@@ -1039,7 +1039,7 @@ int GetEchConfigsEx(WOLFSSL_EchConfig* configs, byte* output, word32* outputLen)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* HAVE_ECH */ #endif /* WOLFSSL_TLS13 && HAVE_ECH */
#if defined(WOLFSSL_RENESAS_TSIP_TLS) || defined(WOLFSSL_RENESAS_SCEPROTECT) #if defined(WOLFSSL_RENESAS_TSIP_TLS) || defined(WOLFSSL_RENESAS_SCEPROTECT)

26
src/tls.c
View File

@@ -1268,7 +1268,7 @@ static WC_INLINE word16 TLSX_ToSemaphore(word16 type)
case TLSX_KEY_QUIC_TP_PARAMS_DRAFT: /* 0xffa5 */ case TLSX_KEY_QUIC_TP_PARAMS_DRAFT: /* 0xffa5 */
return 64; return 64;
#endif #endif
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
case TLSX_ECH: /* 0xfe0d */ case TLSX_ECH: /* 0xfe0d */
return 65; return 65;
#endif #endif
@@ -2029,7 +2029,7 @@ static int TLSX_SNI_Parse(WOLFSSL* ssl, const byte* input, word16 length,
byte type; byte type;
int matchStat; int matchStat;
byte matched; byte matched;
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
WOLFSSL_ECH* ech = NULL; WOLFSSL_ECH* ech = NULL;
WOLFSSL_EchConfig* workingConfig; WOLFSSL_EchConfig* workingConfig;
TLSX* echX; TLSX* echX;
@@ -2122,7 +2122,7 @@ static int TLSX_SNI_Parse(WOLFSSL* ssl, const byte* input, word16 length,
matched = cacheOnly || (XSTRLEN(sni->data.host_name) == size && matched = cacheOnly || (XSTRLEN(sni->data.host_name) == size &&
XSTRNCMP(sni->data.host_name, (const char*)input + offset, size) == 0); XSTRNCMP(sni->data.host_name, (const char*)input + offset, size) == 0);
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
echX = TLSX_Find(ssl->extensions, TLSX_ECH); echX = TLSX_Find(ssl->extensions, TLSX_ECH);
if (echX != NULL) if (echX != NULL)
ech = (WOLFSSL_ECH*)(echX->data); ech = (WOLFSSL_ECH*)(echX->data);
@@ -10430,7 +10430,7 @@ void TLSX_Remove(TLSX** list, TLSX_Type type, void* heap)
} }
} }
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
#define GREASE_ECH_SIZE 160 #define GREASE_ECH_SIZE 160
#define MAX_PUBLIC_NAME_SZ 256 #define MAX_PUBLIC_NAME_SZ 256
#define TLS_INFO_CONST_STRING "tls ech" #define TLS_INFO_CONST_STRING "tls ech"
@@ -11243,7 +11243,7 @@ void TLSX_FreeAll(TLSX* list, void* heap)
CID_FREE((byte*)extension->data, heap); CID_FREE((byte*)extension->data, heap);
break; break;
#endif /* WOLFSSL_DTLS_CID */ #endif /* WOLFSSL_DTLS_CID */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
case TLSX_ECH: case TLSX_ECH:
ECH_FREE((WOLFSSL_ECH*)extension->data, heap); ECH_FREE((WOLFSSL_ECH*)extension->data, heap);
break; break;
@@ -11416,7 +11416,7 @@ static int TLSX_GetSize(TLSX* list, byte* semaphore, byte msgType,
length += CID_GET_SIZE((byte*)extension->data); length += CID_GET_SIZE((byte*)extension->data);
break; break;
#endif /* WOLFSSL_DTLS_CID */ #endif /* WOLFSSL_DTLS_CID */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
case TLSX_ECH: case TLSX_ECH:
length += ECH_GET_SIZE((WOLFSSL_ECH*)extension->data); length += ECH_GET_SIZE((WOLFSSL_ECH*)extension->data);
break; break;
@@ -11624,7 +11624,7 @@ static int TLSX_Write(TLSX* list, byte* output, byte* semaphore,
break; break;
#endif /* WOLFSSL_DTLS_CID */ #endif /* WOLFSSL_DTLS_CID */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
case TLSX_ECH: case TLSX_ECH:
ret = ECH_WRITE((WOLFSSL_ECH*)extension->data, ret = ECH_WRITE((WOLFSSL_ECH*)extension->data,
output + offset, &offset); output + offset, &offset);
@@ -12302,7 +12302,7 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
#if defined(WOLFSSL_TLS13) || !defined(NO_WOLFSSL_CLIENT) #if defined(WOLFSSL_TLS13) || !defined(NO_WOLFSSL_CLIENT)
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
/* because the size of ech depends on the size of other extensions we need to /* because the size of ech depends on the size of other extensions we need to
* get the size with ech special and process ech last, return status */ * get the size with ech special and process ech last, return status */
static int TLSX_GetSizeWithEch(WOLFSSL* ssl, byte* semaphore, byte msgType, static int TLSX_GetSizeWithEch(WOLFSSL* ssl, byte* semaphore, byte msgType,
@@ -12460,7 +12460,6 @@ int TLSX_GetRequestSize(WOLFSSL* ssl, byte msgType, word16* pLength)
*/ */
} }
#endif #endif
#endif
#if defined(HAVE_ECH) #if defined(HAVE_ECH)
if (ssl->options.useEch == 1 && msgType == client_hello) { if (ssl->options.useEch == 1 && msgType == client_hello) {
ret = TLSX_GetSizeWithEch(ssl, semaphore, msgType, &length); ret = TLSX_GetSizeWithEch(ssl, semaphore, msgType, &length);
@@ -12468,7 +12467,8 @@ int TLSX_GetRequestSize(WOLFSSL* ssl, byte msgType, word16* pLength)
return ret; return ret;
} }
else else
#endif #endif /* HAVE_ECH */
#endif /* WOLFSSL_TLS13 */
{ {
if (ssl->extensions) { if (ssl->extensions) {
ret = TLSX_GetSize(ssl->extensions, semaphore, msgType, &length); ret = TLSX_GetSize(ssl->extensions, semaphore, msgType, &length);
@@ -12498,7 +12498,7 @@ int TLSX_GetRequestSize(WOLFSSL* ssl, byte msgType, word16* pLength)
return ret; return ret;
} }
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
/* return status after writing the extensions with ech written last */ /* return status after writing the extensions with ech written last */
static int TLSX_WriteWithEch(WOLFSSL* ssl, byte* output, byte* semaphore, static int TLSX_WriteWithEch(WOLFSSL* ssl, byte* output, byte* semaphore,
byte msgType, word16* pOffset) byte msgType, word16* pOffset)
@@ -12692,7 +12692,7 @@ int TLSX_WriteRequest(WOLFSSL* ssl, byte* output, byte msgType, word16* pOffset)
} }
#endif #endif
#endif #endif
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
if (ssl->options.useEch == 1 && msgType == client_hello) { if (ssl->options.useEch == 1 && msgType == client_hello) {
ret = TLSX_WriteWithEch(ssl, output, semaphore, ret = TLSX_WriteWithEch(ssl, output, semaphore,
msgType, &offset); msgType, &offset);
@@ -13663,7 +13663,7 @@ int TLSX_Parse(WOLFSSL* ssl, const byte* input, word16 length, byte msgType,
break; break;
#endif /* defined(WOLFSSL_DTLS_CID) */ #endif /* defined(WOLFSSL_DTLS_CID) */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
case TLSX_ECH: case TLSX_ECH:
ret = ECH_PARSE(ssl, input + offset, size, msgType); ret = ECH_PARSE(ssl, input + offset, size, msgType);
break; break;

8
src/tls13.c
View File

@@ -5869,7 +5869,6 @@ static int CheckPreSharedKeys(WOLFSSL* ssl, const byte* input, word32 helloSz,
#else #else
ret = DoPreSharedKeys(ssl, input, helloSz - bindersLen, suite, usingPSK, ret = DoPreSharedKeys(ssl, input, helloSz - bindersLen, suite, usingPSK,
&first); &first);
CleanupClientTickets((PreSharedKey*)ext->data);
if (ret != 0) { if (ret != 0) {
WOLFSSL_MSG_EX("DoPreSharedKeys: %d", ret); WOLFSSL_MSG_EX("DoPreSharedKeys: %d", ret);
return ret; return ret;
@@ -12837,15 +12836,16 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
FALL_THROUGH; FALL_THROUGH;
case TLS13_ACCEPT_THIRD_REPLY_DONE : case TLS13_ACCEPT_THIRD_REPLY_DONE :
#if defined(HAVE_SUPPORTED_CURVES) && (defined(HAVE_SESSION_TICKET) || \ #ifdef HAVE_SUPPORTED_CURVES
!defined(NO_PSK)) #if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
if (!ssl->options.noPskDheKe) if (!ssl->options.noPskDheKe)
#endif #endif
{ {
ssl->error = TLSX_KeyShare_DeriveSecret(ssl); ssl->error = TLSX_KeyShare_DeriveSecret(ssl);
if (ssl->error != 0) if (ssl->error != 0)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
#endif
if ((ssl->error = SendTls13EncryptedExtensions(ssl)) != 0) { if ((ssl->error = SendTls13EncryptedExtensions(ssl)) != 0) {
WOLFSSL_ERROR(ssl->error); WOLFSSL_ERROR(ssl->error);

39
tests/api.c
View File

@@ -63276,7 +63276,7 @@ static int test_extra_alerts_wrong_cs(void)
#endif #endif
#if !defined(WOLFSSL_NO_TLS12) && defined(WOLFSSL_EXTRA_ALERTS) && \ #if !defined(WOLFSSL_NO_TLS12) && defined(WOLFSSL_EXTRA_ALERTS) && \
defined(HAVE_IO_TESTS_DEPENDENCIES) defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(WOLFSSL_SP_MATH)
static void test_remove_msg(byte *msg, int tail_len, int *len, int msg_length) static void test_remove_msg(byte *msg, int tail_len, int *len, int msg_length)
{ {
@@ -63365,35 +63365,32 @@ static int test_remove_hs_message(byte hs_message_type,
XMEMSET(&test_ctx, 0, sizeof(test_ctx)); XMEMSET(&test_ctx, 0, sizeof(test_ctx));
ret = test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s, ret = test_memio_setup(&test_ctx, &ctx_c, &ctx_s, &ssl_c, &ssl_s,
wolfTLSv1_2_client_method, wolfTLSv1_2_server_method); wolfTLSv1_2_client_method, wolfTLSv1_2_server_method);
if (ret != 0) AssertIntEQ(ret, 0);
return TEST_FAIL;
ret = wolfSSL_connect(ssl_c); ret = wolfSSL_connect(ssl_c);
err = wolfSSL_get_error(ssl_c, ret); err = wolfSSL_get_error(ssl_c, ret);
if (ret == WOLFSSL_SUCCESS || err != WOLFSSL_ERROR_WANT_READ) AssertIntNE(ret, WOLFSSL_SUCCESS);
return TEST_FAIL; AssertIntEQ(err, WOLFSSL_ERROR_WANT_READ);
ret = wolfSSL_accept(ssl_s); ret = wolfSSL_accept(ssl_s);
err = wolfSSL_get_error(ssl_s, ret); err = wolfSSL_get_error(ssl_s, ret);
if (ret == WOLFSSL_SUCCESS || err != WOLFSSL_ERROR_WANT_READ) AssertIntNE(ret, WOLFSSL_SUCCESS);
return TEST_FAIL; AssertIntEQ(err, WOLFSSL_ERROR_WANT_READ);
if (extra_round) { if (extra_round) {
ret = wolfSSL_connect(ssl_c); ret = wolfSSL_connect(ssl_c);
err = wolfSSL_get_error(ssl_c, ret); err = wolfSSL_get_error(ssl_c, ret);
if (ret == WOLFSSL_SUCCESS || err != WOLFSSL_ERROR_WANT_READ) AssertIntNE(ret, WOLFSSL_SUCCESS);
return TEST_FAIL; AssertIntEQ(err, WOLFSSL_ERROR_WANT_READ);
/* this will complete handshake from server side */ /* this will complete handshake from server side */
ret = wolfSSL_accept(ssl_s); ret = wolfSSL_accept(ssl_s);
if (ret != WOLFSSL_SUCCESS) AssertIntEQ(ret, WOLFSSL_SUCCESS);
return TEST_FAIL;
} }
ret = test_remove_hs_msg_from_buffer(test_ctx.c_buff, ret = test_remove_hs_msg_from_buffer(test_ctx.c_buff,
&test_ctx.c_len, hs_message_type, &found); &test_ctx.c_len, hs_message_type, &found);
if (ret != 0) AssertIntEQ(ret, 0);
return TEST_FAIL;
if (!found) { if (!found) {
wolfSSL_free(ssl_c); wolfSSL_free(ssl_c);
@@ -63405,11 +63402,10 @@ static int test_remove_hs_message(byte hs_message_type,
ret = wolfSSL_connect(ssl_c); ret = wolfSSL_connect(ssl_c);
err = wolfSSL_get_error(ssl_c, ret); err = wolfSSL_get_error(ssl_c, ret);
if (ret == WOLFSSL_SUCCESS || err == WOLFSSL_ERROR_WANT_READ) AssertIntNE(ret, WOLFSSL_SUCCESS);
return TEST_FAIL; AssertIntNE(err, WOLFSSL_ERROR_WANT_READ);
ret = wolfSSL_get_alert_history(ssl_c, &h); ret = wolfSSL_get_alert_history(ssl_c, &h);
if (ret != WOLFSSL_SUCCESS) AssertIntEQ(ret, WOLFSSL_SUCCESS);
return TEST_FAIL;
if (alert_type != 0xff && h.last_tx.code != alert_type) if (alert_type != 0xff && h.last_tx.code != alert_type)
return TEST_FAIL; return TEST_FAIL;
if (h.last_tx.level != alert_fatal) if (h.last_tx.level != alert_fatal)
@@ -63433,16 +63429,13 @@ static int test_extra_alerts_skip_hs(void)
/* server_hello */ /* server_hello */
ret = test_remove_hs_message(_server_hello, 0, ret = test_remove_hs_message(_server_hello, 0,
unexpected_message); unexpected_message);
if (ret == TEST_FAIL) AssertIntNE(ret, TEST_FAIL);
return ret;
ret = test_remove_hs_message(_certificate, 0, ret = test_remove_hs_message(_certificate, 0,
0xff); 0xff);
if (ret == TEST_FAIL) AssertIntNE(ret, TEST_FAIL);
return ret;
ret = test_remove_hs_message(_server_key_exchange, 0, ret = test_remove_hs_message(_server_key_exchange, 0,
unexpected_message); unexpected_message);
if (ret == TEST_FAIL) AssertIntNE(ret, TEST_FAIL);
return ret;
return TEST_SUCCESS; return TEST_SUCCESS;
} }

2
wolfcrypt/src/asn.c
View File

@@ -33786,7 +33786,7 @@ static int DecodeResponseData(byte* source, word32* ioIndex,
int ret = 0; int ret = 0;
byte version; byte version;
word32 dateSz, idx = *ioIndex; word32 dateSz, idx = *ioIndex;
OcspEntry* single; OcspEntry* single = NULL;
WOLFSSL_ENTER("DecodeResponseData"); WOLFSSL_ENTER("DecodeResponseData");

2
wolfcrypt/src/integer.c
View File

@@ -5240,7 +5240,7 @@ const char *mp_s_rmap = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz+/"; "abcdefghijklmnopqrstuvwxyz+/";
#endif #endif
#if !defined(NO_DSA) || defined(HAVE_ECC) #if !defined(NO_DSA) || defined(HAVE_ECC) || defined(OPENSSL_EXTRA)
/* read a string [ASCII] in a given radix */ /* read a string [ASCII] in a given radix */
int mp_read_radix (mp_int * a, const char *str, int radix) int mp_read_radix (mp_int * a, const char *str, int radix)
{ {

20
wolfcrypt/src/rsa.c
View File

@@ -4529,16 +4529,6 @@ static int _CheckProbablePrime(mp_int* p, mp_int* q, mp_int* e, int nlen,
*isPrime = MP_NO; *isPrime = MP_NO;
if (q != NULL) {
int valid = 0;
/* 5.4 - check that |p-q| <= (2^(1/2))(2^((nlen/2)-1)) */
ret = wc_CompareDiffPQ(p, q, nlen, &valid);
if ((ret != MP_OKAY) || (!valid)) goto notOkay;
prime = q;
}
else
prime = p;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (((tmp1 = (mp_int *)XMALLOC(sizeof(*tmp1), NULL, DYNAMIC_TYPE_WOLF_BIGINT)) == NULL) || if (((tmp1 = (mp_int *)XMALLOC(sizeof(*tmp1), NULL, DYNAMIC_TYPE_WOLF_BIGINT)) == NULL) ||
((tmp2 = (mp_int *)XMALLOC(sizeof(*tmp2), NULL, DYNAMIC_TYPE_WOLF_BIGINT)) == NULL)) { ((tmp2 = (mp_int *)XMALLOC(sizeof(*tmp2), NULL, DYNAMIC_TYPE_WOLF_BIGINT)) == NULL)) {
@@ -4550,6 +4540,16 @@ static int _CheckProbablePrime(mp_int* p, mp_int* q, mp_int* e, int nlen,
ret = mp_init_multi(tmp1, tmp2, NULL, NULL, NULL, NULL); ret = mp_init_multi(tmp1, tmp2, NULL, NULL, NULL, NULL);
if (ret != MP_OKAY) goto notOkay; if (ret != MP_OKAY) goto notOkay;
if (q != NULL) {
int valid = 0;
/* 5.4 - check that |p-q| <= (2^(1/2))(2^((nlen/2)-1)) */
ret = wc_CompareDiffPQ(p, q, nlen, &valid);
if ((ret != MP_OKAY) || (!valid)) goto notOkay;
prime = q;
}
else
prime = p;
/* 4.4,5.5 - Check that prime >= (2^(1/2))(2^((nlen/2)-1)) /* 4.4,5.5 - Check that prime >= (2^(1/2))(2^((nlen/2)-1))
* This is a comparison against lowerBound */ * This is a comparison against lowerBound */
ret = mp_read_unsigned_bin(tmp1, lower_bound, nlen/16); ret = mp_read_unsigned_bin(tmp1, lower_bound, nlen/16);

18
wolfcrypt/src/sp_int.c
View File

@@ -4607,6 +4607,12 @@ static void _sp_mont_setup(const sp_int* m, sp_int_digit* rho);
#define WOLFSSL_SP_SUB_D #define WOLFSSL_SP_SUB_D
#endif #endif
/* Determine when mp_read_radix with a radix of 10 is required. */ /* Determine when mp_read_radix with a radix of 10 is required. */
#if (defined(WOLFSSL_SP_MATH_ALL) && !defined(NO_RSA) && \
!defined(WOLFSSL_RSA_VERIFY_ONLY)) || defined(HAVE_ECC) || \
!defined(NO_DSA) || defined(OPENSSL_EXTRA)
#define WOLFSSL_SP_READ_RADIX_16
#endif
/* Determine when mp_read_radix with a radix of 10 is required. */
#if defined(WOLFSSL_SP_MATH_ALL) && !defined(NO_RSA) && \ #if defined(WOLFSSL_SP_MATH_ALL) && !defined(NO_RSA) && \
!defined(WOLFSSL_RSA_VERIFY_ONLY) !defined(WOLFSSL_RSA_VERIFY_ONLY)
#define WOLFSSL_SP_READ_RADIX_10 #define WOLFSSL_SP_READ_RADIX_10
@@ -17103,8 +17109,7 @@ int sp_to_unsigned_bin_at_pos(int o, const sp_int* a, unsigned char* out)
} }
#endif /* WOLFSSL_SP_MATH_ALL && !NO_RSA && !WOLFSSL_RSA_VERIFY_ONLY */ #endif /* WOLFSSL_SP_MATH_ALL && !NO_RSA && !WOLFSSL_RSA_VERIFY_ONLY */
#if (defined(WOLFSSL_SP_MATH_ALL) && !defined(NO_RSA) && \ #ifdef WOLFSSL_SP_READ_RADIX_16
!defined(WOLFSSL_RSA_VERIFY_ONLY)) || defined(HAVE_ECC) || !defined(NO_DSA)
/* Convert hexadecimal number as string in big-endian format to a /* Convert hexadecimal number as string in big-endian format to a
* multi-precision number. * multi-precision number.
* *
@@ -17172,8 +17177,7 @@ static int _sp_read_radix_16(sp_int* a, const char* in)
return err; return err;
} }
#endif /* (WOLFSSL_SP_MATH_ALL && !NO_RSA && !WOLFSSL_RSA_VERIFY_ONLY) || #endif /* WOLFSSL_SP_READ_RADIX_16 */
* HAVE_ECC || !NO_DSA */
#ifdef WOLFSSL_SP_READ_RADIX_10 #ifdef WOLFSSL_SP_READ_RADIX_10
/* Convert decimal number as string in big-endian format to a multi-precision /* Convert decimal number as string in big-endian format to a multi-precision
@@ -17228,8 +17232,7 @@ static int _sp_read_radix_10(sp_int* a, const char* in)
} }
#endif /* WOLFSSL_SP_READ_RADIX_10 */ #endif /* WOLFSSL_SP_READ_RADIX_10 */
#if (defined(WOLFSSL_SP_MATH_ALL) && !defined(NO_RSA) && \ #if defined(WOLFSSL_SP_READ_RADIX_16) || defined(WOLFSSL_SP_READ_RADIX_10)
!defined(WOLFSSL_RSA_VERIFY_ONLY)) || defined(HAVE_ECC) || !defined(NO_DSA)
/* Convert a number as string in big-endian format to a big number. /* Convert a number as string in big-endian format to a big number.
* Only supports base-16 (hexadecimal) and base-10 (decimal). * Only supports base-16 (hexadecimal) and base-10 (decimal).
* *
@@ -17302,8 +17305,7 @@ int sp_read_radix(sp_int* a, const char* in, int radix)
return err; return err;
} }
#endif /* (WOLFSSL_SP_MATH_ALL && !NO_RSA && !WOLFSSL_RSA_VERIFY_ONLY) || #endif /* WOLFSSL_SP_READ_RADIX_16 || WOLFSSL_SP_READ_RADIX_10 */
* HAVE_ECC || !NO_DSA */
#if (defined(WOLFSSL_SP_MATH_ALL) && !defined(WOLFSSL_RSA_VERIFY_ONLY)) || \ #if (defined(WOLFSSL_SP_MATH_ALL) && !defined(WOLFSSL_RSA_VERIFY_ONLY)) || \
defined(WC_MP_TO_RADIX) defined(WC_MP_TO_RADIX)

14
wolfssl/internal.h
View File

@@ -2610,12 +2610,12 @@ typedef enum {
#ifdef WOLFSSL_QUIC #ifdef WOLFSSL_QUIC
TLSX_KEY_QUIC_TP_PARAMS_DRAFT = 0xffa5, /* from draft-ietf-quic-tls-27 */ TLSX_KEY_QUIC_TP_PARAMS_DRAFT = 0xffa5, /* from draft-ietf-quic-tls-27 */
#endif #endif
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
TLSX_ECH = 0xfe0d, /* from draft-ietf-tls-esni-13 */ TLSX_ECH = 0xfe0d, /* from draft-ietf-tls-esni-13 */
#endif #endif
} TLSX_Type; } TLSX_Type;
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
typedef enum { typedef enum {
ECH_TYPE_OUTER = 0, ECH_TYPE_OUTER = 0,
@@ -3627,7 +3627,7 @@ struct WOLFSSL_CTX {
const WOLFSSL_QUIC_METHOD *method; const WOLFSSL_QUIC_METHOD *method;
} quic; } quic;
#endif #endif
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
WOLFSSL_EchConfig* echConfigs; WOLFSSL_EchConfig* echConfigs;
#endif #endif
}; };
@@ -4397,7 +4397,7 @@ typedef struct Options {
#ifdef WOLFSSL_DTLS_CID #ifdef WOLFSSL_DTLS_CID
word16 useDtlsCID:1; word16 useDtlsCID:1;
#endif /* WOLFSSL_DTLS_CID */ #endif /* WOLFSSL_DTLS_CID */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
word16 useEch:1; word16 useEch:1;
#endif #endif
#ifdef WOLFSSL_SEND_HRR_COOKIE #ifdef WOLFSSL_SEND_HRR_COOKIE
@@ -4463,7 +4463,7 @@ typedef struct Arrays {
byte psk_key[MAX_PSK_KEY_LEN]; byte psk_key[MAX_PSK_KEY_LEN];
#endif #endif
byte clientRandom[RAN_LEN]; byte clientRandom[RAN_LEN];
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
byte clientRandomInner[RAN_LEN]; byte clientRandomInner[RAN_LEN];
#endif #endif
byte serverRandom[RAN_LEN]; byte serverRandom[RAN_LEN];
@@ -5031,7 +5031,7 @@ struct WOLFSSL {
byte serverSecret[SECRET_LEN]; byte serverSecret[SECRET_LEN];
#endif #endif
HS_Hashes* hsHashes; HS_Hashes* hsHashes;
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
HS_Hashes* hsHashesEch; HS_Hashes* hsHashesEch;
#endif #endif
void* IOCB_ReadCtx; void* IOCB_ReadCtx;
@@ -5493,7 +5493,7 @@ struct WOLFSSL {
* content have not been handled yet by quic */ * content have not been handled yet by quic */
} quic; } quic;
#endif /* WOLFSSL_QUIC */ #endif /* WOLFSSL_QUIC */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
WOLFSSL_EchConfig* echConfigs; WOLFSSL_EchConfig* echConfigs;
#endif #endif
}; };

4
wolfssl/ssl.h
View File

@@ -985,7 +985,7 @@ WOLFSSL_API WOLFSSL_METHOD *wolfSSLv23_method(void);
#endif /* WOLFSSL_DTLS */ #endif /* WOLFSSL_DTLS */
#if defined(HAVE_ECH) #if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
WOLFSSL_API int wolfSSL_CTX_GenerateEchConfig(WOLFSSL_CTX* ctx, WOLFSSL_API int wolfSSL_CTX_GenerateEchConfig(WOLFSSL_CTX* ctx,
const char* publicName, word16 kemId, word16 kdfId, word16 aeadId); const char* publicName, word16 kemId, word16 kdfId, word16 aeadId);
@@ -1000,7 +1000,7 @@ WOLFSSL_API int wolfSSL_SetEchConfigs(WOLFSSL* ssl, const byte* echConfigs,
WOLFSSL_API int wolfSSL_GetEchConfigs(WOLFSSL* ssl, byte* echConfigs, WOLFSSL_API int wolfSSL_GetEchConfigs(WOLFSSL* ssl, byte* echConfigs,
word32* echConfigsLen); word32* echConfigsLen);
#endif /* HAVE_ECH */ #endif /* WOLFSSL_TLS13 && HAVE_ECH */
#ifdef HAVE_POLY1305 #ifdef HAVE_POLY1305
WOLFSSL_API int wolfSSL_use_old_poly(WOLFSSL* ssl, int value); WOLFSSL_API int wolfSSL_use_old_poly(WOLFSSL* ssl, int value);

2
wolfssl/wolfcrypt/integer.h
View File

@@ -388,7 +388,7 @@ MP_API int mp_radix_size (mp_int * a, int radix, int *size);
!defined(NO_DSA) || !defined(NO_DH) !defined(NO_DSA) || !defined(NO_DH)
MP_API int mp_sqrmod(mp_int* a, mp_int* b, mp_int* c); MP_API int mp_sqrmod(mp_int* a, mp_int* b, mp_int* c);
#endif #endif
#if !defined(NO_DSA) || defined(HAVE_ECC) #if !defined(NO_DSA) || defined(HAVE_ECC) || defined(OPENSSL_EXTRA)
MP_API int mp_read_radix(mp_int* a, const char* str, int radix); MP_API int mp_read_radix(mp_int* a, const char* str, int radix);
#endif #endif