/*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
#include <stdio.h>
#include "internal/cryptlib.h"
+#include "internal/provider.h"
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
+#include <openssl/evp.h>
int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
unsigned char **ek, int *ekl, unsigned char *iv,
EVP_PKEY **pubk, int npubk)
{
unsigned char key[EVP_MAX_KEY_LENGTH];
+ const OSSL_PROVIDER *prov;
+ OSSL_LIB_CTX *libctx = NULL;
+ EVP_PKEY_CTX *pctx = NULL;
+ const EVP_CIPHER *cipher;
int i, len;
int rv = 0;
- if (type) {
+ if (type != NULL) {
EVP_CIPHER_CTX_reset(ctx);
if (!EVP_EncryptInit_ex(ctx, type, NULL, NULL, NULL))
return 0;
}
+ if ((cipher = EVP_CIPHER_CTX_get0_cipher(ctx)) != NULL
+ && (prov = EVP_CIPHER_provider(cipher)) != NULL)
+ libctx = ossl_provider_libctx(prov);
if ((npubk <= 0) || !pubk)
return 1;
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) <= 0)
goto err;
len = EVP_CIPHER_CTX_key_length(ctx);
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;
}
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;
}