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

Merge pull request #5196 from douzzer/20220601-multi-test-fixes

Browse Source
This commit is contained in:
Hayden Roche
2022-06-01 11:41:26 -07:00
committed by GitHub
parent 9cfcdfc7aa b212853bce
commit 8b9d2ad657
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/api.c
View File

@ -45202,7 +45202,7 @@ static void test_evp_cipher_aes_gcm(void)
* wolfSSL OpenSSH clients because there was a bug in this flow that * wolfSSL OpenSSH clients because there was a bug in this flow that
* happened to "cancel out" if both sides of the connection had the bug. * happened to "cancel out" if both sides of the connection had the bug.
*/ */
enum { enum {
NUM_ENCRYPTIONS = 3, NUM_ENCRYPTIONS = 3,
AAD_SIZE = 4 AAD_SIZE = 4
}; };
@ -45278,7 +45278,7 @@ static void test_evp_cipher_aes_gcm(void)
}, },
{ {
0x3B, 0xED, 0x18, 0x9C, 0xB3, 0xE3, 0x61, 0x1E, 0x11, 0xEB, 0x13, 0x3B, 0xED, 0x18, 0x9C, 0xB3, 0xE3, 0x61, 0x1E, 0x11, 0xEB, 0x13,
0x5B, 0xEC, 0x52, 0x49, 0x32, 0x5B, 0xEC, 0x52, 0x49, 0x32,
} }
}; };
@ -45294,7 +45294,7 @@ static void test_evp_cipher_aes_gcm(void)
}; };
const byte expCipherText3[] = { const byte expCipherText3[] = {
0xD0, 0x37, 0x59, 0x1C, 0x2F, 0x85, 0x39, 0x4D, 0xED, 0xC2, 0x32, 0x5B, 0xD0, 0x37, 0x59, 0x1C, 0x2F, 0x85, 0x39, 0x4D, 0xED, 0xC2, 0x32, 0x5B,
0x80, 0x5E, 0x6B, 0x80, 0x5E, 0x6B,
}; };
const byte* expCipherTexts[NUM_ENCRYPTIONS] = { const byte* expCipherTexts[NUM_ENCRYPTIONS] = {
expCipherText1, expCipherText1,
@ -45457,7 +45457,7 @@ static void test_evp_cipher_aes_gcm(void)
EVP_CIPHER_CTX_free(encCtx); EVP_CIPHER_CTX_free(encCtx);
EVP_CIPHER_CTX_free(decCtx); EVP_CIPHER_CTX_free(decCtx);
} }
printf(resultFmt, passed); printf(resultFmt, passed);
#endif #endif
} }

10
wolfcrypt/src/evp.c
View File

@ -1012,7 +1012,7 @@ int wolfSSL_EVP_CipherFinal(WOLFSSL_EVP_CIPHER_CTX *ctx, unsigned char *out,
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
#if defined(HAVE_AESGCM) && ((!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)) \ #if defined(HAVE_AESGCM) && ((!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)) \
|| FIPS_VERSION_GE(2,0)) || FIPS_VERSION_GE(2,0))
/* /*
* This flag needs to retain its value between wolfSSL_EVP_CipherFinal * This flag needs to retain its value between wolfSSL_EVP_CipherFinal
* calls. wolfSSL_EVP_CipherInit will clear it, so we save and restore * calls. wolfSSL_EVP_CipherInit will clear it, so we save and restore
* it here. * it here.
@ -5444,7 +5444,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
} }
#ifdef HAVE_AESGCM #ifdef HAVE_AESGCM
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
/* /*
* OpenSSL requires that a EVP_CTRL_AEAD_SET_IV_FIXED * OpenSSL requires that a EVP_CTRL_AEAD_SET_IV_FIXED
* 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.
@ -5752,7 +5752,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
#ifdef WOLFSSL_AESGCM_STREAM #ifdef WOLFSSL_AESGCM_STREAM
/* /*
* Initialize with key and IV if available. wc_AesGcmInit will fail * Initialize with key and IV if available. wc_AesGcmInit will fail
* if called with IV only and no key has been set. * if called with IV only and no key has been set.
*/ */
@ -5864,7 +5864,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
* Clear any leftover AAD on final (final is when src is * Clear any leftover AAD on final (final is when src is
* NULL). * NULL).
*/ */
XMEMSET(ctx->gcmAuthIn, 0, ctx->gcmAuthInSz); if (ctx->gcmAuthIn != NULL) {
XMEMSET(ctx->gcmAuthIn, 0, ctx->gcmAuthInSz);
}
ctx->gcmAuthInSz = 0; ctx->gcmAuthInSz = 0;
} }
if (ret == 0) { if (ret == 0) {