Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -10829,7 +10829,7 @@ void wolfSSL_BUF_MEM_free(WOLFSSL_BUF_MEM* buf)
case WC_AES_192_CCM_TYPE :
case WC_AES_256_CCM_TYPE :
WOLFSSL_MSG("AES CCM");
Comment thread
aidangarske marked this conversation as resolved.
Resolved
XMEMCPY(ctx->iv, &ctx->cipher.aes.reg, ctx->ivSz);
/* CCM encrypt/decrypt takes ctx->iv directly. */
break;
#endif /* HAVE_AESCCM */
#ifdef HAVE_AES_ECB
Expand Down
335 changes: 335 additions & 0 deletions tests/api/test_evp_cipher.c
Original file line number Diff line number Diff line change
Expand Up @@ -1799,6 +1799,127 @@ int test_wolfSSL_EVP_aes_128_ccm(void)
return EXPECT_RESULT();
}

int test_evp_cipher_aes_ccm_message_iv(void)
{
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && defined(HAVE_AESCCM) && \
defined(WOLFSSL_AES_128) && !defined(HAVE_FIPS) && \
!defined(HAVE_SELFTEST)
EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX* decryptCtx = EVP_CIPHER_CTX_new();
byte key[AES_128_KEY_SIZE] = {0};
byte iv[GCM_NONCE_MID_SZ] = {1};
byte cycleIv[GCM_NONCE_MID_SZ] = {3};
byte input[4] = {1, 2, 3, 4};
byte output[sizeof(input)] = {0};
byte firstOutput[sizeof(input)] = {0};
byte tag[WC_AES_BLOCK_SIZE] = {0};
#ifdef HAVE_AESGCM
byte generated[GCM_NONCE_MID_SZ] = {0};
byte firstGenerated[GCM_NONCE_MID_SZ] = {0};
#endif
int len = 0;

ExpectNotNull(ctx);
ExpectNotNull(decryptCtx);
if (ctx != NULL && decryptCtx != NULL) {
ExpectIntEQ(EVP_EncryptInit_ex(ctx, EVP_aes_128_ccm(), NULL,
key, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
XMEMCPY(firstOutput, output, sizeof(firstOutput));
Comment thread
aidangarske marked this conversation as resolved.
Resolved
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

ExpectIntEQ(EVP_EncryptInit_ex(decryptCtx, EVP_aes_128_ccm(), NULL,
key, cycleIv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(decryptCtx, EVP_CTRL_CCM_GET_TAG,
sizeof(tag), tag), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_DecryptInit_ex(decryptCtx, NULL, NULL,
key, cycleIv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(decryptCtx, EVP_CTRL_CCM_SET_TAG,
sizeof(tag), tag), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_DecryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptInit_ex(decryptCtx, NULL, NULL, NULL, NULL),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(decryptCtx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_FAILURE);

ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_FAILURE);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectBufNE(output, firstOutput, sizeof(output));
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
(int)sizeof(input));
ExpectIntLT(EVP_Cipher(ctx, output, input, sizeof(input)), 0);

#ifdef HAVE_AESGCM
iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IV_FIXED,
-1, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
XMEMCPY(firstGenerated, generated, sizeof(generated));
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
ExpectBufNE(generated, firstGenerated, sizeof(generated));
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IV_FIXED,
-1, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
XMEMCPY(firstGenerated, generated, sizeof(generated));
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
(int)sizeof(input));
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
ExpectBufNE(generated, firstGenerated, sizeof(generated));
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
Comment thread
aidangarske marked this conversation as resolved.
Resolved
(int)sizeof(input));
#endif

}
EVP_CIPHER_CTX_free(decryptCtx);
EVP_CIPHER_CTX_free(ctx);
#endif
return EXPECT_RESULT();
}

int test_wolfssl_EVP_aes_ccm(void)
{
EXPECT_DECLS;
Expand Down Expand Up @@ -2615,6 +2736,121 @@ int test_wolfssl_EVP_sm4_ctr(void)
return res;
}

int test_evp_cipher_sm4_gcm_message_iv(void)
{
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && defined(WOLFSSL_SM4_GCM)
EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX* decryptCtx = EVP_CIPHER_CTX_new();
byte key[SM4_KEY_SIZE] = {0};
byte iv[GCM_NONCE_MID_SZ] = {1};
byte cycleIv[GCM_NONCE_MID_SZ] = {3};
byte input[4] = {1, 2, 3, 4};
byte output[sizeof(input)] = {0};
byte tag[SM4_BLOCK_SIZE] = {0};
byte generated[GCM_NONCE_MID_SZ] = {0};
byte firstGenerated[GCM_NONCE_MID_SZ] = {0};
int len = 0;

ExpectNotNull(ctx);
ExpectNotNull(decryptCtx);
if (ctx != NULL && decryptCtx != NULL) {
ExpectIntEQ(EVP_EncryptInit_ex(ctx, EVP_sm4_gcm(), NULL,
key, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

ExpectIntEQ(EVP_EncryptInit_ex(decryptCtx, EVP_sm4_gcm(), NULL,
key, cycleIv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(decryptCtx, EVP_CTRL_GCM_GET_TAG,
sizeof(tag), tag), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_DecryptInit_ex(decryptCtx, NULL, NULL,
key, cycleIv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(decryptCtx, EVP_CTRL_GCM_SET_TAG,
sizeof(tag), tag), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_DecryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptInit_ex(decryptCtx, NULL, NULL, NULL, NULL),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(decryptCtx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_FAILURE);

ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_FAILURE);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
(int)sizeof(input));
ExpectBufNE(output, input, sizeof(input));
ExpectIntLT(EVP_Cipher(ctx, output, input, sizeof(input)), 0);
Comment thread
aidangarske marked this conversation as resolved.
Resolved

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IV_FIXED,
4, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
ExpectBufEQ(generated, iv, 4);
XMEMCPY(firstGenerated, generated, sizeof(generated));
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
ExpectBufNE(generated, firstGenerated, sizeof(generated));
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IV_FIXED,
-1, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
XMEMCPY(firstGenerated, generated, sizeof(generated));
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
(int)sizeof(input));
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_SUCCESS);
ExpectBufNE(generated, firstGenerated, sizeof(generated));
ExpectBufEQ(generated, iv, 4);
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
(int)sizeof(input));

}
EVP_CIPHER_CTX_free(decryptCtx);
EVP_CIPHER_CTX_free(ctx);
#endif
return EXPECT_RESULT();
}

int test_wolfssl_EVP_sm4_gcm_zeroLen(void)
{
int res = TEST_SKIPPED;
Expand Down Expand Up @@ -2774,6 +3010,105 @@ int test_wolfssl_EVP_sm4_gcm(void)
return res;
}

int test_evp_cipher_sm4_ccm_message_iv(void)
{
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && defined(WOLFSSL_SM4_CCM)
EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX* decryptCtx = EVP_CIPHER_CTX_new();
byte key[SM4_KEY_SIZE] = {0};
byte iv[GCM_NONCE_MID_SZ] = {0};
byte cycleIv[GCM_NONCE_MID_SZ] = {3};
byte input[4] = {1, 2, 3, 4};
byte output[sizeof(input)] = {0};
byte tag[SM4_BLOCK_SIZE] = {0};
#if (defined(HAVE_AESGCM) || defined(WOLFSSL_SM4_GCM)) && \
!defined(_WIN32) && !defined(HAVE_SELFTEST) && \
(!defined(HAVE_FIPS) || FIPS_VERSION_GE(2,0))
byte generated[GCM_NONCE_MID_SZ] = {0};
#endif
int len = 0;

iv[sizeof(iv) - 1] = 1;
ExpectNotNull(ctx);
ExpectNotNull(decryptCtx);
if (ctx != NULL && decryptCtx != NULL) {
ExpectIntEQ(EVP_EncryptInit_ex(ctx, EVP_sm4_ccm(), NULL,
key, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

ExpectIntEQ(EVP_EncryptInit_ex(decryptCtx, EVP_sm4_ccm(), NULL,
key, cycleIv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(decryptCtx, EVP_CTRL_CCM_GET_TAG,
sizeof(tag), tag), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_DecryptInit_ex(decryptCtx, NULL, NULL,
key, cycleIv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(decryptCtx, EVP_CTRL_CCM_SET_TAG,
sizeof(tag), tag), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_DecryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptInit_ex(decryptCtx, NULL, NULL, NULL, NULL),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(decryptCtx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(decryptCtx, output, &len),
WOLFSSL_FAILURE);

ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_FAILURE);
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_FAILURE);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptUpdate(ctx, output, &len, input,
sizeof(input)), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_EncryptFinal_ex(ctx, output, &len),
WOLFSSL_SUCCESS);

iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv),
WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
(int)sizeof(input));
ExpectBufNE(output, input, sizeof(input));
ExpectIntLT(EVP_Cipher(ctx, output, input, sizeof(input)), 0);
ExpectIntEQ(EVP_CIPHER_CTX_reset(ctx), WOLFSSL_SUCCESS);
ExpectIntEQ(ctx->authIvUsed, 0);
iv[0]++;
ExpectIntEQ(EVP_EncryptInit_ex(ctx, EVP_sm4_ccm(), NULL, key, iv),
WOLFSSL_SUCCESS);
#if (defined(HAVE_AESGCM) || defined(WOLFSSL_SM4_GCM)) && \
!defined(_WIN32) && !defined(HAVE_SELFTEST) && \
(!defined(HAVE_FIPS) || FIPS_VERSION_GE(2,0))
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IV_FIXED,
-1, iv), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_IV_GEN,
sizeof(generated), generated),
WOLFSSL_FAILURE);
#endif
ExpectIntEQ(EVP_Cipher(ctx, output, input, sizeof(input)),
(int)sizeof(input));

}
EVP_CIPHER_CTX_free(decryptCtx);
EVP_CIPHER_CTX_free(ctx);
#endif
return EXPECT_RESULT();
}

int test_wolfssl_EVP_sm4_ccm_zeroLen(void)
{
int res = TEST_SKIPPED;
Expand Down
Loading
Loading