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

A bit more consistent naming for structure variables

Browse Source
This commit is contained in:
Andras Fekete
2023-01-04 21:04:58 -05:00
parent 25ce553e8f
commit 124c04b01a
3 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api.c
View File

@@ -46081,7 +46081,7 @@ static int test_evp_cipher_aes_gcm(void)
/* /*
* The call to EVP_CipherInit below (with NULL key) should clear the * The call to EVP_CipherInit below (with NULL key) should clear the
* ivGenEnable flag set by EVP_CTRL_GCM_SET_IV_FIXED. As such, a * authIvGenEnable flag set by EVP_CTRL_GCM_SET_IV_FIXED. As such, a
* subsequent EVP_CTRL_GCM_IV_GEN should fail. This matches OpenSSL * subsequent EVP_CTRL_GCM_IV_GEN should fail. This matches OpenSSL
* behavior. * behavior.
*/ */

108
wolfcrypt/src/evp.c
View File

@@ -612,13 +612,13 @@ static int wolfSSL_EVP_CipherUpdate_GCM(WOLFSSL_EVP_CIPHER_CTX *ctx,
/* Buffer input for one-shot API */ /* Buffer input for one-shot API */
if (inl > 0) { if (inl > 0) {
byte* tmp; byte* tmp;
tmp = (byte*)XREALLOC(ctx->buffer, tmp = (byte*)XREALLOC(ctx->authBuffer,
ctx->bufferLen + inl, NULL, ctx->authBufferLen + inl, NULL,
DYNAMIC_TYPE_OPENSSL); DYNAMIC_TYPE_OPENSSL);
if (tmp) { if (tmp) {
XMEMCPY(tmp + ctx->bufferLen, in, inl); XMEMCPY(tmp + ctx->authBufferLen, in, inl);
ctx->bufferLen += inl; ctx->authBufferLen += inl;
ctx->buffer = tmp; ctx->authBuffer = tmp;
*outl = 0; *outl = 0;
} }
else { else {
@@ -703,13 +703,13 @@ static int wolfSSL_EVP_CipherUpdate_CCM(WOLFSSL_EVP_CIPHER_CTX *ctx,
/* Buffer input for one-shot API */ /* Buffer input for one-shot API */
if (inl > 0) { if (inl > 0) {
byte* tmp; byte* tmp;
tmp = (byte*)XREALLOC(ctx->buffer, tmp = (byte*)XREALLOC(ctx->authBuffer,
ctx->bufferLen + inl, NULL, ctx->authBufferLen + inl, NULL,
DYNAMIC_TYPE_OPENSSL); DYNAMIC_TYPE_OPENSSL);
if (tmp) { if (tmp) {
XMEMCPY(tmp + ctx->bufferLen, in, inl); XMEMCPY(tmp + ctx->authBufferLen, in, inl);
ctx->bufferLen += inl; ctx->authBufferLen += inl;
ctx->buffer = tmp; ctx->authBuffer = tmp;
*outl = 0; *outl = 0;
} }
else { else {
@@ -957,36 +957,36 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, unsigned char *out,
case AES_192_GCM_TYPE: case AES_192_GCM_TYPE:
case AES_256_GCM_TYPE: case AES_256_GCM_TYPE:
#ifndef WOLFSSL_AESGCM_STREAM #ifndef WOLFSSL_AESGCM_STREAM
if ((ctx->buffer && ctx->bufferLen > 0) if ((ctx->authBuffer && ctx->authBufferLen > 0)
|| (ctx->bufferLen == 0)) { || (ctx->authBufferLen == 0)) {
if (ctx->enc) if (ctx->enc)
ret = wc_AesGcmEncrypt(&ctx->cipher.aes, out, ret = wc_AesGcmEncrypt(&ctx->cipher.aes, out,
ctx->buffer, ctx->bufferLen, ctx->authBuffer, ctx->authBufferLen,
ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz, ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz,
ctx->authIn, ctx->authInSz); ctx->authIn, ctx->authInSz);
else else
ret = wc_AesGcmDecrypt(&ctx->cipher.aes, out, ret = wc_AesGcmDecrypt(&ctx->cipher.aes, out,
ctx->buffer, ctx->bufferLen, ctx->authBuffer, ctx->authBufferLen,
ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz, ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz,
ctx->authIn, ctx->authInSz); ctx->authIn, ctx->authInSz);
if (ret == 0) { if (ret == 0) {
ret = WOLFSSL_SUCCESS; ret = WOLFSSL_SUCCESS;
*outl = ctx->bufferLen; *outl = ctx->authBufferLen;
} }
else { else {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
*outl = 0; *outl = 0;
} }
XFREE(ctx->buffer, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(ctx->authBuffer, NULL, DYNAMIC_TYPE_OPENSSL);
ctx->buffer = NULL; ctx->authBuffer = NULL;
ctx->bufferLen = 0; ctx->authBufferLen = 0;
if (ctx->incIv) { if (ctx->authIncIv) {
IncCtr((byte*)ctx->cipher.aes.reg, IncCtr((byte*)ctx->cipher.aes.reg,
ctx->cipher.aes.nonceSz); ctx->cipher.aes.nonceSz);
ctx->incIv = 0; ctx->authIncIv = 0;
} }
} }
else { else {
@@ -1002,7 +1002,7 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, unsigned char *out,
else { else {
ret = wc_AesGcmDecryptFinal(&ctx->cipher.aes, ctx->authTag, ret = wc_AesGcmDecryptFinal(&ctx->cipher.aes, ctx->authTag,
ctx->authTagSz); ctx->authTagSz);
if (ctx->incIv) { if (ctx->authIncIv) {
IncCtr((byte*)ctx->cipher.aes.reg, ctx->cipher.aes.nonceSz); IncCtr((byte*)ctx->cipher.aes.reg, ctx->cipher.aes.nonceSz);
} }
} }
@@ -1023,8 +1023,8 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
#endif /* WOLFSSL_AESGCM_STREAM */ #endif /* WOLFSSL_AESGCM_STREAM */
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
if (ctx->incIv) { if (ctx->authIncIv) {
ctx->incIv = 0; ctx->authIncIv = 0;
} }
else { else {
/* Clear IV, since IV reuse is not recommended for AES GCM. */ /* Clear IV, since IV reuse is not recommended for AES GCM. */
@@ -1042,44 +1042,44 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, unsigned char *out,
case AES_128_CCM_TYPE: case AES_128_CCM_TYPE:
case AES_192_CCM_TYPE: case AES_192_CCM_TYPE:
case AES_256_CCM_TYPE: case AES_256_CCM_TYPE:
if ((ctx->buffer && ctx->bufferLen > 0) if ((ctx->authBuffer && ctx->authBufferLen > 0)
|| (ctx->bufferLen == 0)) { || (ctx->authBufferLen == 0)) {
if (ctx->enc) if (ctx->enc)
ret = wc_AesCcmEncrypt(&ctx->cipher.aes, out, ret = wc_AesCcmEncrypt(&ctx->cipher.aes, out,
ctx->buffer, ctx->bufferLen, ctx->authBuffer, ctx->authBufferLen,
ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz, ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz,
ctx->authIn, ctx->authInSz); ctx->authIn, ctx->authInSz);
else else
ret = wc_AesCcmDecrypt(&ctx->cipher.aes, out, ret = wc_AesCcmDecrypt(&ctx->cipher.aes, out,
ctx->buffer, ctx->bufferLen, ctx->authBuffer, ctx->authBufferLen,
ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz, ctx->iv, ctx->ivSz, ctx->authTag, ctx->authTagSz,
ctx->authIn, ctx->authInSz); ctx->authIn, ctx->authInSz);
if (ret == 0) { if (ret == 0) {
ret = WOLFSSL_SUCCESS; ret = WOLFSSL_SUCCESS;
*outl = ctx->bufferLen; *outl = ctx->authBufferLen;
} }
else { else {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
*outl = 0; *outl = 0;
} }
XFREE(ctx->buffer, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(ctx->authBuffer, NULL, DYNAMIC_TYPE_OPENSSL);
ctx->buffer = NULL; ctx->authBuffer = NULL;
ctx->bufferLen = 0; ctx->authBufferLen = 0;
if (ctx->incIv) { if (ctx->authIncIv) {
IncCtr((byte*)ctx->cipher.aes.reg, IncCtr((byte*)ctx->cipher.aes.reg,
ctx->cipher.aes.nonceSz); ctx->cipher.aes.nonceSz);
ctx->incIv = 0; ctx->authIncIv = 0;
} }
} }
else { else {
*outl = 0; *outl = 0;
} }
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
if (ctx->incIv) { if (ctx->authIncIv) {
ctx->incIv = 0; ctx->authIncIv = 0;
} }
else { else {
/* Clear IV, since IV reuse is not recommended for AES CCM. */ /* Clear IV, since IV reuse is not recommended for AES CCM. */
@@ -1184,7 +1184,7 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, unsigned char *out,
ctx->cipherType == AES_256_CCM_TYPE ctx->cipherType == AES_256_CCM_TYPE
#endif #endif
) { ) {
tmp = ctx->ivGenEnable; tmp = ctx->authIvGenEnable;
} }
#endif #endif
@@ -1205,7 +1205,7 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, unsigned char *out,
ctx->cipherType == AES_256_CCM_TYPE ctx->cipherType == AES_256_CCM_TYPE
#endif #endif
) { ) {
ctx->ivGenEnable = tmp; ctx->authIvGenEnable = tmp;
} }
#endif #endif
} }
@@ -5866,7 +5866,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* command be issued before a EVP_CTRL_GCM_IV_GEN command. * command be issued before a EVP_CTRL_GCM_IV_GEN command.
* This flag is used to enforce that. * This flag is used to enforce that.
*/ */
ctx->ivGenEnable = 1; ctx->authIvGenEnable = 1;
} }
#endif #endif
#endif /* !WC_NO_RNG */ #endif /* !WC_NO_RNG */
@@ -5883,7 +5883,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
case EVP_CTRL_GCM_IV_GEN: case EVP_CTRL_GCM_IV_GEN:
if ((ctx->flags & WOLFSSL_EVP_CIPH_FLAG_AEAD_CIPHER) == 0) if ((ctx->flags & WOLFSSL_EVP_CIPH_FLAG_AEAD_CIPHER) == 0)
break; break;
if (!ctx->ivGenEnable) { if (!ctx->authIvGenEnable) {
WOLFSSL_MSG("Must use EVP_CTRL_AEAD_SET_IV_FIXED before " WOLFSSL_MSG("Must use EVP_CTRL_AEAD_SET_IV_FIXED before "
"EVP_CTRL_GCM_IV_GEN"); "EVP_CTRL_GCM_IV_GEN");
break; break;
@@ -5911,7 +5911,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* The gcmIncIV flag indicates that the IV should be incremented * The gcmIncIV flag indicates that the IV should be incremented
* after the next cipher operation. * after the next cipher operation.
*/ */
ctx->incIv = 1; ctx->authIncIv = 1;
ret = WOLFSSL_SUCCESS; ret = WOLFSSL_SUCCESS;
break; break;
#endif /* HAVE_AESGCM && !_WIN32 && !HAVE_SELFTEST && (!HAVE_FIPS || #endif /* HAVE_AESGCM && !_WIN32 && !HAVE_SELFTEST && (!HAVE_FIPS ||
@@ -6004,18 +6004,18 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
#endif #endif
ctx->keyLen = 0; ctx->keyLen = 0;
#if defined(HAVE_AESGCM) || defined(HAVE_AESCCM) #if defined(HAVE_AESGCM) || defined(HAVE_AESCCM)
if (ctx->buffer) { if (ctx->authBuffer) {
XFREE(ctx->buffer, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(ctx->authBuffer, NULL, DYNAMIC_TYPE_OPENSSL);
ctx->buffer = NULL; ctx->authBuffer = NULL;
} }
ctx->bufferLen = 0; ctx->authBufferLen = 0;
if (ctx->authIn) { if (ctx->authIn) {
XFREE(ctx->authIn, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(ctx->authIn, NULL, DYNAMIC_TYPE_OPENSSL);
ctx->authIn = NULL; ctx->authIn = NULL;
} }
ctx->authInSz = 0; ctx->authInSz = 0;
ctx->ivGenEnable = 0; ctx->authIvGenEnable = 0;
ctx->incIv = 0; ctx->authIncIv = 0;
#endif #endif
} }
@@ -6210,7 +6210,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* If a key is provided, the flag retains its value. * If a key is provided, the flag retains its value.
*/ */
if (ret == WOLFSSL_SUCCESS && key == NULL) { if (ret == WOLFSSL_SUCCESS && key == NULL) {
ctx->ivGenEnable = 0; ctx->authIvGenEnable = 0;
} }
return ret; return ret;
@@ -6239,10 +6239,10 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
ctx->authTagSz, ctx->authIn, ctx->authTagSz, ctx->authIn,
ctx->authInSz); ctx->authInSz);
} }
if (ctx->incIv) { if (ctx->authIncIv) {
IncCtr((byte*)ctx->cipher.aes.reg, IncCtr((byte*)ctx->cipher.aes.reg,
ctx->cipher.aes.nonceSz); ctx->cipher.aes.nonceSz);
ctx->incIv = 0; ctx->authIncIv = 0;
} }
} }
#else #else
@@ -6291,7 +6291,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
/* Calculate authentication tag and compare. */ /* Calculate authentication tag and compare. */
ret = wc_AesGcmDecryptFinal(&ctx->cipher.aes, ret = wc_AesGcmDecryptFinal(&ctx->cipher.aes,
ctx->authTag, ctx->authTagSz); ctx->authTag, ctx->authTagSz);
if (ctx->incIv) { if (ctx->authIncIv) {
IncCtr((byte*)ctx->cipher.aes.reg, IncCtr((byte*)ctx->cipher.aes.reg,
ctx->cipher.aes.nonceSz); ctx->cipher.aes.nonceSz);
} }
@@ -6303,7 +6303,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
WOLFSSL_MSG("wc_AesGcmInit failed"); WOLFSSL_MSG("wc_AesGcmInit failed");
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
ctx->incIv = 0; ctx->authIncIv = 0;
} }
#endif /* WOLFSSL_AESGCM_STREAM */ #endif /* WOLFSSL_AESGCM_STREAM */
if (src == NULL) { if (src == NULL) {
@@ -6394,7 +6394,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* If a key is provided, the flag retains its value. * If a key is provided, the flag retains its value.
*/ */
if (ret == WOLFSSL_SUCCESS && key == NULL) { if (ret == WOLFSSL_SUCCESS && key == NULL) {
ctx->ivGenEnable = 0; ctx->authIvGenEnable = 0;
} }
return ret; return ret;
@@ -6422,10 +6422,10 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
ctx->authTagSz, ctx->authIn, ctx->authTagSz, ctx->authIn,
ctx->authInSz); ctx->authInSz);
} }
if (ctx->incIv) { if (ctx->authIncIv) {
IncCtr((byte*)ctx->cipher.aes.reg, IncCtr((byte*)ctx->cipher.aes.reg,
ctx->cipher.aes.nonceSz); ctx->cipher.aes.nonceSz);
ctx->incIv = 0; ctx->authIncIv = 0;
} }
} }
if (src == NULL) { if (src == NULL) {

8
wolfssl/openssl/evp.h
View File

@@ -436,8 +436,8 @@ struct WOLFSSL_EVP_CIPHER_CTX {
#define HAVE_WOLFSSL_EVP_CIPHER_CTX_IV #define HAVE_WOLFSSL_EVP_CIPHER_CTX_IV
int ivSz; int ivSz;
#if defined(HAVE_AESGCM) || defined(HAVE_AESCCM) #if defined(HAVE_AESGCM) || defined(HAVE_AESCCM)
byte* buffer; byte* authBuffer;
int bufferLen; int authBufferLen;
byte* authIn; byte* authIn;
int authInSz; int authInSz;
#endif #endif
@@ -453,8 +453,8 @@ struct WOLFSSL_EVP_CIPHER_CTX {
int authTagSz; int authTagSz;
#endif #endif
#if defined(HAVE_AESGCM) || defined(HAVE_AESCCM) #if defined(HAVE_AESGCM) || defined(HAVE_AESCCM)
byte ivGenEnable:1; byte authIvGenEnable:1;
byte incIv:1; byte authIncIv:1;
#endif #endif
#endif #endif
}; };