Merge pull request #4292 from kojo1/evp

EVP_CIPHER_CTX_set_iv_length
This commit is contained in:
Chris Conlon
2021-08-11 16:13:26 -06:00
committed by GitHub
2 changed files with 9 additions and 1 deletions

View File

@ -36787,12 +36787,14 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
int ret = 0;
EVP_CIPHER_CTX *evp = NULL;
int ilen = 0;
int klen = 0;
int i, j;
const EVP_CIPHER *type;
byte *iv;
byte *key;
int ivlen;
int keylen;
#define RECORDS 16
@ -36805,6 +36807,7 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
int outl, inl;
iv = aes128_cbc_iv;
ivlen = sizeof(aes128_cbc_iv);
key = aes128_cbc_key;
keylen = sizeof(aes128_cbc_key);
type = EVP_aes_128_cbc();
@ -36820,6 +36823,10 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
if (klen > 0 && keylen != klen) {
AssertIntNE(EVP_CIPHER_CTX_set_key_length(evp, keylen), 0);
}
ilen = EVP_CIPHER_CTX_iv_length(evp);
if (ilen > 0 && ivlen != ilen) {
AssertIntNE(EVP_CIPHER_CTX_set_iv_length(evp, ivlen), 0);
}
AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 1)), 0);

View File

@ -831,6 +831,7 @@ typedef WOLFSSL_ASN1_PCTX ASN1_PCTX;
#define EVP_CIPHER_CTX_iv_length wolfSSL_EVP_CIPHER_CTX_iv_length
#define EVP_CIPHER_CTX_key_length wolfSSL_EVP_CIPHER_CTX_key_length
#define EVP_CIPHER_CTX_set_key_length wolfSSL_EVP_CIPHER_CTX_set_key_length
#define EVP_CIPHER_CTX_set_iv_length wolfSSL_EVP_CIPHER_CTX_set_iv_length
#define EVP_CIPHER_CTX_mode wolfSSL_EVP_CIPHER_CTX_mode
#define EVP_CIPHER_CTX_cipher wolfSSL_EVP_CIPHER_CTX_cipher