projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement riscv_vlen_asm for riscv32
[openssl.git]
/
crypto
/
evp
/
p_seal.c
diff --git
a/crypto/evp/p_seal.c
b/crypto/evp/p_seal.c
index 76d3278b8cb021b5a8327e72ee176c79d33a836a..94c8462ab457081e4b6cb5605845fd94f71e0646 100644
(file)
--- a/
crypto/evp/p_seal.c
+++ b/
crypto/evp/p_seal.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-202
0
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-202
1
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
*
* 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
@@
-21,28
+21,32
@@
int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
EVP_PKEY **pubk, int npubk)
{
unsigned char key[EVP_MAX_KEY_LENGTH];
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;
+ const OSSL_PROVIDER *prov;
+ OSSL_LIB_CTX *libctx = NULL;
EVP_PKEY_CTX *pctx = NULL;
EVP_PKEY_CTX *pctx = NULL;
+ const EVP_CIPHER *cipher;
int i, len;
int rv = 0;
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;
}
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_get0_provider(cipher)) != NULL)
+ libctx = ossl_provider_libctx(prov);
if ((npubk <= 0) || !pubk)
return 1;
if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
return 0;
if ((npubk <= 0) || !pubk)
return 1;
if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
return 0;
- len = EVP_CIPHER_CTX_iv_length(ctx);
- if (len < 0 || RAND_priv_bytes_ex(libctx, iv, len) <= 0)
+ len = EVP_CIPHER_CTX_
get_
iv_length(ctx);
+ if (len < 0 || RAND_priv_bytes_ex(libctx, iv, len
, 0
) <= 0)
goto err;
goto err;
- len = EVP_CIPHER_CTX_key_length(ctx);
+ len = EVP_CIPHER_CTX_
get_
key_length(ctx);
if (len < 0)
goto err;
if (len < 0)
goto err;
@@
-54,7
+58,7
@@
int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
pctx = EVP_PKEY_CTX_new_from_pkey(libctx, pubk[i], NULL);
if (pctx == NULL) {
pctx = EVP_PKEY_CTX_new_from_pkey(libctx, pubk[i], NULL);
if (pctx == NULL) {
- ERR_raise(ERR_LIB_EVP, ERR_R_
MALLOC_FAILURE
);
+ ERR_raise(ERR_LIB_EVP, ERR_R_
EVP_LIB
);
goto err;
}
goto err;
}