mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-12 20:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add iv length and key length params to the cipher init calls

Browse Source 
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8700)
This commit is contained in:
Matt Caswell 2019-04-10 13:23:58 +01:00
parent 819a7ae9fc
commit 344cfa34e5
3 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/evp/evp_enc.c
View File

@ -241,7 +241,11 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
return 0;
}
return ctx->cipher->einit(ctx->provctx, key, iv);
return ctx->cipher->einit(ctx->provctx,
key,
EVP_CIPHER_CTX_key_length(ctx),
iv,
EVP_CIPHER_CTX_iv_length(ctx));
}
if (ctx->cipher->dinit == NULL) {
@ -249,7 +253,11 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
return 0;
}
return ctx->cipher->dinit(ctx->provctx, key, iv);
return ctx->cipher->dinit(ctx->provctx,
key,
EVP_CIPHER_CTX_key_length(ctx),
iv,
EVP_CIPHER_CTX_iv_length(ctx));
/* TODO(3.0): Remove legacy code below */
legacy:

8
include/openssl/core_numbers.h
View File

@ -126,10 +126,14 @@ OSSL_CORE_MAKE_FUNC(size_t, OP_digest_block_size, (void))
OSSL_CORE_MAKE_FUNC(void *, OP_cipher_newctx, (void))
OSSL_CORE_MAKE_FUNC(int, OP_cipher_encrypt_init, (void *vctx,
const unsigned char *key,
const unsigned char *iv))
size_t keylen,
const unsigned char *iv,
size_t ivlen))
OSSL_CORE_MAKE_FUNC(int, OP_cipher_decrypt_init, (void *vctx,
const unsigned char *key,
const unsigned char *iv))
size_t keylen,
const unsigned char *iv,
size_t ivlen))
OSSL_CORE_MAKE_FUNC(int, OP_cipher_update,
(void *, unsigned char *out, size_t *outl,
const unsigned char *in, size_t inl))

46
providers/common/ciphers/aes.c
View File

@ -17,35 +17,49 @@
#include "internal/provider_algs.h"
#include "ciphers_locl.h"
static void PROV_AES_KEY_generic_init(PROV_AES_KEY *ctx,
static int PROV_AES_KEY_generic_init(PROV_AES_KEY *ctx,
const unsigned char *iv,
size_t ivlen,
int enc)
{
if (iv != NULL)
if (iv != NULL && ctx->mode != EVP_CIPH_ECB_MODE) {
if (ivlen != AES_BLOCK_SIZE)
return 0;
memcpy(ctx->iv, iv, AES_BLOCK_SIZE);
}
ctx->enc = enc;
}
static int aes_einit(void *vctx, const unsigned char *key,
const unsigned char *iv)
{
PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx;
PROV_AES_KEY_generic_init(ctx, iv, 1);
if (key != NULL)
return ctx->ciph->init(ctx, key, ctx->keylen);
return 1;
}
static int aes_dinit(void *vctx, const unsigned char *key,
const unsigned char *iv)
static int aes_einit(void *vctx, const unsigned char *key, size_t keylen,
const unsigned char *iv, size_t ivlen)
{
PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx;
PROV_AES_KEY_generic_init(ctx, iv, 0);
if (key != NULL)
if (!PROV_AES_KEY_generic_init(ctx, iv, ivlen, 1))
return 0;
if (key != NULL) {
if (keylen != ctx->keylen)
return 0;
return ctx->ciph->init(ctx, key, ctx->keylen);
}
return 1;
}
static int aes_dinit(void *vctx, const unsigned char *key, size_t keylen,
const unsigned char *iv, size_t ivlen)
{
PROV_AES_KEY *ctx = (PROV_AES_KEY *)vctx;
if (!PROV_AES_KEY_generic_init(ctx, iv, ivlen, 0))
return 0;
if (key != NULL) {
if (keylen != ctx->keylen)
return 0;
return ctx->ciph->init(ctx, key, ctx->keylen);
}
return 1;
}