fix wolfSSL_EVP_CIPHER_CTX_ctrl() SM GCM/CCM type

This commit is contained in:
gojimmypi
2023-11-17 07:56:56 -08:00
parent 4c6c2942b1
commit 16dba37ae6
2 changed files with 5 additions and 5 deletions

View File

@@ -14682,7 +14682,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 &&

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;
} }