diff options
| author | Pauli <pauli@openssl.org> | 2021-05-17 12:18:53 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-18 13:24:41 +1000 |
| commit | 4547a71930a27fca9ae62c38962d6dc67ee0b4bf (patch) | |
| tree | a389a8777f6a2dc29c696627202688b7cc8de255 /crypto | |
| parent | 678d0dba6cdcae7dd742d4d0d65da101e9ada1d2 (diff) | |
seal: make EVP_SealInit() library context aware
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15300)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/p_seal.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c index 9371d110e9..76d3278b8c 100644 --- a/crypto/evp/p_seal.c +++ b/crypto/evp/p_seal.c @@ -9,6 +9,7 @@ #include <stdio.h> #include "internal/cryptlib.h" +#include "internal/provider.h" #include <openssl/rand.h> #include <openssl/rsa.h> #include <openssl/evp.h> @@ -20,6 +21,9 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, EVP_PKEY **pubk, int npubk) { unsigned char key[EVP_MAX_KEY_LENGTH]; + const OSSL_PROVIDER *prov = EVP_CIPHER_provider(type); + OSSL_LIB_CTX *libctx = prov != NULL ? ossl_provider_libctx(prov) : NULL; + EVP_PKEY_CTX *pctx = NULL; int i, len; int rv = 0; @@ -35,7 +39,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, return 0; len = EVP_CIPHER_CTX_iv_length(ctx); - if (len < 0 || RAND_bytes(iv, len) <= 0) + if (len < 0 || RAND_priv_bytes_ex(libctx, iv, len) <= 0) goto err; len = EVP_CIPHER_CTX_key_length(ctx); @@ -47,9 +51,9 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, for (i = 0; i < npubk; i++) { size_t keylen = len; - EVP_PKEY_CTX *pctx = NULL; - if ((pctx = EVP_PKEY_CTX_new(pubk[i], NULL)) == NULL) { + pctx = EVP_PKEY_CTX_new_from_pkey(libctx, pubk[i], NULL); + if (pctx == NULL) { ERR_raise(ERR_LIB_EVP, ERR_R_MALLOC_FAILURE); goto err; } @@ -60,8 +64,10 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, ekl[i] = (int)keylen; EVP_PKEY_CTX_free(pctx); } + pctx = NULL; rv = npubk; err: + EVP_PKEY_CTX_free(pctx); OPENSSL_cleanse(key, sizeof(key)); return rv; } |