wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6980 from gojimmypi/SM-cipher-type-PR

Browse Source 
Fix evp SM cipherType check
This commit is contained in:
Sean Parkinson
2023-11-20 07:22:54 +10:00
committed by GitHub
parent 06dcc114c1 16dba37ae6
commit 9ed0018954
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@ -14690,7 +14690,7 @@ int AddSessionToCache(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* addSession,
cacheSession->ticketNonce.data = cacheSession->ticketNonce.dataStatic; cacheSession->ticketNonce.data = cacheSession->ticketNonce.dataStatic;
cacheSession->ticketNonce.len = 0; cacheSession->ticketNonce.len = 0;
} }
#endif /* WOFLSSL_TLS13 && WOLFSSL_TICKET_NONCE_MALLOC && FIPS_VERSION_GE(5,3)*/ #endif /* WOLFSSL_TLS13 && WOLFSSL_TICKET_NONCE_MALLOC && FIPS_VERSION_GE(5,3)*/
#endif #endif
#ifdef SESSION_CERTS #ifdef SESSION_CERTS
if (overwrite && if (overwrite &&

12
wolfcrypt/src/evp.c
View File

@ -5992,8 +5992,8 @@ void wolfSSL_EVP_init(void)
} }
else else
#endif /* HAVE_CHACHA && HAVE_POLY1305 */ #endif /* HAVE_CHACHA && HAVE_POLY1305 */
#if defined(WOFLSSL_SM4_GCM) #if defined(WOLFSSL_SM4_GCM)
if (ctx->cipherType == WOLFSSL_SM4_GCM) { if (ctx->cipherType == SM4_GCM_TYPE) {
if ((arg <= 0) || (arg > SM4_BLOCK_SIZE) || (ptr == NULL)) { if ((arg <= 0) || (arg > SM4_BLOCK_SIZE) || (ptr == NULL)) {
break; break;
} }
@ -6005,8 +6005,8 @@ void wolfSSL_EVP_init(void)
} }
else else
#endif #endif
#if defined(WOFLSSL_SM4_CCM) #if defined(WOLFSSL_SM4_CCM)
if (ctx->cipherType == WOLFSSL_SM4_CCM) { if (ctx->cipherType == SM4_CCM_TYPE) {
if ((arg <= 0) || (arg > SM4_BLOCK_SIZE) || (ptr == NULL)) { if ((arg <= 0) || (arg > SM4_BLOCK_SIZE) || (ptr == NULL)) {
break; break;
} }
@ -6040,7 +6040,7 @@ void wolfSSL_EVP_init(void)
else else
#endif /* HAVE_CHACHA && HAVE_POLY1305 */ #endif /* HAVE_CHACHA && HAVE_POLY1305 */
#if defined(WOLFSSL_SM4_GCM) #if defined(WOLFSSL_SM4_GCM)
if (ctx->cipherType == WOLFSSL_SM4_GCM) { if (ctx->cipherType == SM4_GCM_TYPE) {
if (arg <= 0 || arg > SM4_BLOCK_SIZE) { if (arg <= 0 || arg > SM4_BLOCK_SIZE) {
break; break;
} }
@ -6048,7 +6048,7 @@ void wolfSSL_EVP_init(void)
else else
#endif #endif
#if defined(WOLFSSL_SM4_CCM) #if defined(WOLFSSL_SM4_CCM)
if (ctx->cipherType == WOLFSSL_SM4_CCM) { if (ctx->cipherType == SM4_CCM_TYPE) {
if (arg <= 0 || arg > SM4_BLOCK_SIZE) { if (arg <= 0 || arg > SM4_BLOCK_SIZE) {
break; break;
} }