public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename all getters to use get/get0 in name

Browse source 
For functions that exist in 1.1.1 provide a simple aliases via #define.

Fixes #15236

Functions with OSSL_DECODER_, OSSL_ENCODER_, OSSL_STORE_LOADER_,
EVP_KEYEXCH_, EVP_KEM_, EVP_ASYM_CIPHER_, EVP_SIGNATURE_,
EVP_KEYMGMT_, EVP_RAND_, EVP_MAC_, EVP_KDF_, EVP_PKEY_,
EVP_MD_, and EVP_CIPHER_ prefixes are renamed.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15405)
This commit is contained in:
Tomas Mraz 2021-05-21 16:58:08 +02:00
parent 5e2d22d53e
commit ed576acdf5
261 changed files with 1934 additions and 1799 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.md
View file

@ -641,8 +641,8 @@ breaking changes, and mappings for the large list of deprecated functions.
*Richard Levitte* *Richard Levitte*
* Enhanced the documentation of EVP_PKEY_size(), EVP_PKEY_bits() * Enhanced the documentation of EVP_PKEY_get_size(), EVP_PKEY_get_bits()
and EVP_PKEY_security_bits(). Especially EVP_PKEY_size() needed and EVP_PKEY_get_security_bits(). Especially EVP_PKEY_get_size() needed
a new formulation to include all the things it can be used for, a new formulation to include all the things it can be used for,
as well as words of caution. as well as words of caution.

2
apps/cms.c
View file

@ -1013,7 +1013,7 @@ int cms_main(int argc, char **argv)
res = EVP_PKEY_CTX_ctrl(pctx, -1, -1, res = EVP_PKEY_CTX_ctrl(pctx, -1, -1,
EVP_PKEY_CTRL_CIPHER, EVP_PKEY_CTRL_CIPHER,
EVP_CIPHER_nid(cipher), NULL); EVP_CIPHER_get_nid(cipher), NULL);
if (res <= 0 && res != -2) if (res <= 0 && res != -2)
goto end; goto end;

3
apps/crl.c
View file

@ -347,7 +347,8 @@ int crl_main(int argc, char **argv)
BIO_printf(bio_err, "out of memory\n"); BIO_printf(bio_err, "out of memory\n");
goto end; goto end;
} }
BIO_printf(bio_out, "%s Fingerprint=", EVP_MD_name(digest)); BIO_printf(bio_out, "%s Fingerprint=",
EVP_MD_get0_name(digest));
for (j = 0; j < (int)n; j++) { for (j = 0; j < (int)n; j++) {
BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n) BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
? '\n' : ':'); ? '\n' : ':');

8
apps/dgst.c
View file

@ -287,7 +287,7 @@ int dgst_main(int argc, char **argv)
*/ */
goto end; goto end;
} }
type = EVP_PKEY_id(sigkey); type = EVP_PKEY_get_id(sigkey);
if (type == EVP_PKEY_ED25519 || type == EVP_PKEY_ED448) { if (type == EVP_PKEY_ED25519 || type == EVP_PKEY_ED448) {
/* /*
* We implement PureEdDSA for these which doesn't have a separate * We implement PureEdDSA for these which doesn't have a separate
@ -381,7 +381,7 @@ int dgst_main(int argc, char **argv)
BIO_printf(bio_err, "Error opening signature file %s\n", sigfile); BIO_printf(bio_err, "Error opening signature file %s\n", sigfile);
goto end; goto end;
} }
siglen = EVP_PKEY_size(sigkey); siglen = EVP_PKEY_get_size(sigkey);
sigbuf = app_malloc(siglen, "signature buffer"); sigbuf = app_malloc(siglen, "signature buffer");
siglen = BIO_read(sigbio, sigbuf, siglen); siglen = BIO_read(sigbio, sigbuf, siglen);
BIO_free(sigbio); BIO_free(sigbio);
@ -399,10 +399,10 @@ int dgst_main(int argc, char **argv)
md = EVP_MD_CTX_get1_md(tctx); md = EVP_MD_CTX_get1_md(tctx);
} }
if (md != NULL) if (md != NULL)
md_name = EVP_MD_name(md); md_name = EVP_MD_get0_name(md);
if (xoflen > 0) { if (xoflen > 0) {
if (!(EVP_MD_flags(md) & EVP_MD_FLAG_XOF)) { if (!(EVP_MD_get_flags(md) & EVP_MD_FLAG_XOF)) {
BIO_printf(bio_err, "Length can only be specified for XOF\n"); BIO_printf(bio_err, "Length can only be specified for XOF\n");
goto end; goto end;
} }

2
apps/dsa.c
View file

@ -269,7 +269,7 @@ int dsa_main(int argc, char **argv)
/* Passphrase setup */ /* Passphrase setup */
if (enc != NULL) if (enc != NULL)
OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_name(enc), NULL); OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_get0_name(enc), NULL);
/* Default passphrase prompter */ /* Default passphrase prompter */
if (enc != NULL || outformat == FORMAT_PVK) { if (enc != NULL || outformat == FORMAT_PVK) {

2
apps/ec.c
View file

@ -260,7 +260,7 @@ int ec_main(int argc, char **argv)
output_type, output_structure, output_type, output_structure,
NULL); NULL);
if (enc != NULL) { if (enc != NULL) {
OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_name(enc), NULL); OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_get0_name(enc), NULL);
/* Default passphrase prompter */ /* Default passphrase prompter */
OSSL_ENCODER_CTX_set_passphrase_ui(ectx, get_ui_method(), NULL); OSSL_ENCODER_CTX_set_passphrase_ui(ectx, get_ui_method(), NULL);
if (passout != NULL) if (passout != NULL)

32
apps/enc.c
View file

@ -300,11 +300,11 @@ int enc_main(int argc, char **argv)
if (!opt_cipher(ciphername, &cipher)) if (!opt_cipher(ciphername, &cipher))
goto opthelp; goto opthelp;
} }
if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) { if (cipher && EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
BIO_printf(bio_err, "%s: AEAD ciphers not supported\n", prog); BIO_printf(bio_err, "%s: AEAD ciphers not supported\n", prog);
goto end; goto end;
} }
if (cipher && (EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE)) { if (cipher && (EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)) {
BIO_printf(bio_err, "%s XTS ciphers not supported\n", prog); BIO_printf(bio_err, "%s XTS ciphers not supported\n", prog);
goto end; goto end;
} }
@ -360,7 +360,7 @@ int enc_main(int argc, char **argv)
char prompt[200]; char prompt[200];
BIO_snprintf(prompt, sizeof(prompt), "enter %s %s password:", BIO_snprintf(prompt, sizeof(prompt), "enter %s %s password:",
EVP_CIPHER_name(cipher), EVP_CIPHER_get0_name(cipher),
(enc) ? "encryption" : "decryption"); (enc) ? "encryption" : "decryption");
strbuf[0] = '\0'; strbuf[0] = '\0';
i = EVP_read_pw_string((char *)strbuf, SIZE, prompt, enc); i = EVP_read_pw_string((char *)strbuf, SIZE, prompt, enc);
@ -492,8 +492,8 @@ int enc_main(int argc, char **argv)
* concatenated into a temporary buffer * concatenated into a temporary buffer
*/ */
unsigned char tmpkeyiv[EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH]; unsigned char tmpkeyiv[EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH];
int iklen = EVP_CIPHER_key_length(cipher); int iklen = EVP_CIPHER_get_key_length(cipher);
int ivlen = EVP_CIPHER_iv_length(cipher); int ivlen = EVP_CIPHER_get_iv_length(cipher);
/* not needed if HASH_UPDATE() is fixed : */ /* not needed if HASH_UPDATE() is fixed : */
int islen = (sptr != NULL ? sizeof(salt) : 0); int islen = (sptr != NULL ? sizeof(salt) : 0);
if (!PKCS5_PBKDF2_HMAC(str, str_len, sptr, islen, if (!PKCS5_PBKDF2_HMAC(str, str_len, sptr, islen,
@ -525,7 +525,7 @@ int enc_main(int argc, char **argv)
OPENSSL_cleanse(str, str_len); OPENSSL_cleanse(str, str_len);
} }
if (hiv != NULL) { if (hiv != NULL) {
int siz = EVP_CIPHER_iv_length(cipher); int siz = EVP_CIPHER_get_iv_length(cipher);
if (siz == 0) { if (siz == 0) {
BIO_printf(bio_err, "warning: iv not used by this cipher\n"); BIO_printf(bio_err, "warning: iv not used by this cipher\n");
} else if (!set_hex(hiv, iv, siz)) { } else if (!set_hex(hiv, iv, siz)) {
@ -534,7 +534,7 @@ int enc_main(int argc, char **argv)
} }
} }
if ((hiv == NULL) && (str == NULL) if ((hiv == NULL) && (str == NULL)
&& EVP_CIPHER_iv_length(cipher) != 0) { && EVP_CIPHER_get_iv_length(cipher) != 0) {
/* /*
* No IV was explicitly set and no IV was generated. * No IV was explicitly set and no IV was generated.
* Hence the IV is undefined, making correct decryption impossible. * Hence the IV is undefined, making correct decryption impossible.
@ -543,7 +543,7 @@ int enc_main(int argc, char **argv)
goto end; goto end;
} }
if (hkey != NULL) { if (hkey != NULL) {
if (!set_hex(hkey, key, EVP_CIPHER_key_length(cipher))) { if (!set_hex(hkey, key, EVP_CIPHER_get_key_length(cipher))) {
BIO_printf(bio_err, "invalid hex key value\n"); BIO_printf(bio_err, "invalid hex key value\n");
goto end; goto end;
} }
@ -563,7 +563,7 @@ int enc_main(int argc, char **argv)
if (!EVP_CipherInit_ex(ctx, cipher, e, NULL, NULL, enc)) { if (!EVP_CipherInit_ex(ctx, cipher, e, NULL, NULL, enc)) {
BIO_printf(bio_err, "Error setting cipher %s\n", BIO_printf(bio_err, "Error setting cipher %s\n",
EVP_CIPHER_name(cipher)); EVP_CIPHER_get0_name(cipher));
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
goto end; goto end;
} }
@ -573,7 +573,7 @@ int enc_main(int argc, char **argv)
if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc)) { if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc)) {
BIO_printf(bio_err, "Error setting cipher %s\n", BIO_printf(bio_err, "Error setting cipher %s\n",
EVP_CIPHER_name(cipher)); EVP_CIPHER_get0_name(cipher));
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
goto end; goto end;
} }
@ -590,15 +590,15 @@ int enc_main(int argc, char **argv)
printf("%02X", salt[i]); printf("%02X", salt[i]);
printf("\n"); printf("\n");
} }
if (EVP_CIPHER_key_length(cipher) > 0) { if (EVP_CIPHER_get_key_length(cipher) > 0) {
printf("key="); printf("key=");
for (i = 0; i < EVP_CIPHER_key_length(cipher); i++) for (i = 0; i < EVP_CIPHER_get_key_length(cipher); i++)
printf("%02X", key[i]); printf("%02X", key[i]);
printf("\n"); printf("\n");
} }
if (EVP_CIPHER_iv_length(cipher) > 0) { if (EVP_CIPHER_get_iv_length(cipher) > 0) {
printf("iv ="); printf("iv =");
for (i = 0; i < EVP_CIPHER_iv_length(cipher); i++) for (i = 0; i < EVP_CIPHER_get_iv_length(cipher); i++)
printf("%02X", iv[i]); printf("%02X", iv[i]);
printf("\n"); printf("\n");
} }
@ -661,8 +661,8 @@ static void show_ciphers(const OBJ_NAME *name, void *arg)
/* Filter out ciphers that we cannot use */ /* Filter out ciphers that we cannot use */
cipher = EVP_get_cipherbyname(name->name); cipher = EVP_get_cipherbyname(name->name);
if (cipher == NULL || if (cipher == NULL ||
(EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0 || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0 ||
EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE) EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)
return; return;
BIO_printf(dec->bio, "-%-25s", name->name); BIO_printf(dec->bio, "-%-25s", name->name);

4
apps/gendsa.c
View file

@ -127,12 +127,12 @@ int gendsa_main(int argc, char **argv)
if (out == NULL) if (out == NULL)
goto end2; goto end2;
nbits = EVP_PKEY_bits(pkey); nbits = EVP_PKEY_get_bits(pkey);
if (nbits > OPENSSL_DSA_MAX_MODULUS_BITS) if (nbits > OPENSSL_DSA_MAX_MODULUS_BITS)
BIO_printf(bio_err, BIO_printf(bio_err,
"Warning: It is not recommended to use more than %d bit for DSA keys.\n" "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
" Your key size is %d! Larger key size may behave not as expected.\n", " Your key size is %d! Larger key size may behave not as expected.\n",
OPENSSL_DSA_MAX_MODULUS_BITS, EVP_PKEY_bits(pkey)); OPENSSL_DSA_MAX_MODULUS_BITS, EVP_PKEY_get_bits(pkey));
ctx = EVP_PKEY_CTX_new(pkey, NULL); ctx = EVP_PKEY_CTX_new(pkey, NULL);
if (ctx == NULL) { if (ctx == NULL) {

2
apps/genpkey.c
View file

@ -166,7 +166,7 @@ int genpkey_main(int argc, char **argv)
if (ciphername != NULL) { if (ciphername != NULL) {
if (!opt_cipher(ciphername, &cipher) || do_param == 1) if (!opt_cipher(ciphername, &cipher) || do_param == 1)
goto opthelp; goto opthelp;
m = EVP_CIPHER_mode(cipher); m = EVP_CIPHER_get_mode(cipher);
if (m == EVP_CIPH_GCM_MODE || m == EVP_CIPH_CCM_MODE if (m == EVP_CIPH_GCM_MODE || m == EVP_CIPH_CCM_MODE
|| m == EVP_CIPH_XTS_MODE || m == EVP_CIPH_OCB_MODE) { || m == EVP_CIPH_XTS_MODE || m == EVP_CIPH_OCB_MODE) {
BIO_printf(bio_err, "%s: cipher mode not supported\n", prog); BIO_printf(bio_err, "%s: cipher mode not supported\n", prog);

14
apps/lib/s_cb.c
View file

@ -386,13 +386,13 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
if (!SSL_get_peer_tmp_key(s, &key)) if (!SSL_get_peer_tmp_key(s, &key))
return 1; return 1;
BIO_puts(out, "Server Temp Key: "); BIO_puts(out, "Server Temp Key: ");
switch (EVP_PKEY_id(key)) { switch (EVP_PKEY_get_id(key)) {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
BIO_printf(out, "RSA, %d bits\n", EVP_PKEY_bits(key)); BIO_printf(out, "RSA, %d bits\n", EVP_PKEY_get_bits(key));
break; break;
case EVP_PKEY_DH: case EVP_PKEY_DH:
BIO_printf(out, "DH, %d bits\n", EVP_PKEY_bits(key)); BIO_printf(out, "DH, %d bits\n", EVP_PKEY_get_bits(key));
break; break;
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
case EVP_PKEY_EC: case EVP_PKEY_EC:
@ -403,13 +403,13 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
if (!EVP_PKEY_get_utf8_string_param(key, OSSL_PKEY_PARAM_GROUP_NAME, if (!EVP_PKEY_get_utf8_string_param(key, OSSL_PKEY_PARAM_GROUP_NAME,
name, sizeof(name), &name_len)) name, sizeof(name), &name_len))
strcpy(name, "?"); strcpy(name, "?");
BIO_printf(out, "ECDH, %s, %d bits\n", name, EVP_PKEY_bits(key)); BIO_printf(out, "ECDH, %s, %d bits\n", name, EVP_PKEY_get_bits(key));
} }
break; break;
#endif #endif
default: default:
BIO_printf(out, "%s, %d bits\n", OBJ_nid2sn(EVP_PKEY_id(key)), BIO_printf(out, "%s, %d bits\n", OBJ_nid2sn(EVP_PKEY_get_id(key)),
EVP_PKEY_bits(key)); EVP_PKEY_get_bits(key));
} }
EVP_PKEY_free(key); EVP_PKEY_free(key);
return 1; return 1;
@ -1426,7 +1426,7 @@ static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL, EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL,
&algname, EVP_PKEY_get0_asn1(pkey)); &algname, EVP_PKEY_get0_asn1(pkey));
BIO_printf(sdb->out, "%s, bits=%d", BIO_printf(sdb->out, "%s, bits=%d",
algname, EVP_PKEY_bits(pkey)); algname, EVP_PKEY_get_bits(pkey));
} }
break; break;
} }

157
apps/list.c
View file

@ -36,7 +36,7 @@ static const char *select_name = NULL;
{ \ { \
TYPE *impl; \ TYPE *impl; \
const char *propq = app_get0_propq(); \ const char *propq = app_get0_propq(); \
const char *name = TYPE ## _name(alg); \ const char *name = TYPE ## _get0_name(alg); \
\ \
ERR_set_mark(); \ ERR_set_mark(); \
impl = TYPE ## _fetch(NULL, name, propq); \ impl = TYPE ## _fetch(NULL, name, propq); \
@ -70,10 +70,10 @@ static void legacy_cipher_fn(const EVP_CIPHER *c,
{ {
if (select_name != NULL if (select_name != NULL
&& (c == NULL && (c == NULL
|| strcasecmp(select_name, EVP_CIPHER_name(c)) != 0)) || strcasecmp(select_name, EVP_CIPHER_get0_name(c)) != 0))
return; return;
if (c != NULL) { if (c != NULL) {
BIO_printf(arg, " %s\n", EVP_CIPHER_name(c)); BIO_printf(arg, " %s\n", EVP_CIPHER_get0_name(c));
} else { } else {
if (from == NULL) if (from == NULL)
from = "<undefined>"; from = "<undefined>";
@ -88,11 +88,11 @@ DEFINE_STACK_OF(EVP_CIPHER)
static int cipher_cmp(const EVP_CIPHER * const *a, static int cipher_cmp(const EVP_CIPHER * const *a,
const EVP_CIPHER * const *b) const EVP_CIPHER * const *b)
{ {
int ret = EVP_CIPHER_number(*a) - EVP_CIPHER_number(*b); int ret = EVP_CIPHER_get_number(*a) - EVP_CIPHER_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_CIPHER_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_CIPHER_provider(*b))); OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(*b)));
return ret; return ret;
} }
@ -138,10 +138,10 @@ static void list_ciphers(void)
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_CIPHER_provider(c))); OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(c)));
if (verbose) { if (verbose) {
const char *desc = EVP_CIPHER_description(c); const char *desc = EVP_CIPHER_get0_description(c);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -163,7 +163,7 @@ static void legacy_md_fn(const EVP_MD *m,
const char *from, const char *to, void *arg) const char *from, const char *to, void *arg)
{ {
if (m != NULL) { if (m != NULL) {
BIO_printf(arg, " %s\n", EVP_MD_name(m)); BIO_printf(arg, " %s\n", EVP_MD_get0_name(m));
} else { } else {
if (from == NULL) if (from == NULL)
from = "<undefined>"; from = "<undefined>";
@ -177,11 +177,11 @@ static void legacy_md_fn(const EVP_MD *m,
DEFINE_STACK_OF(EVP_MD) DEFINE_STACK_OF(EVP_MD)
static int md_cmp(const EVP_MD * const *a, const EVP_MD * const *b) static int md_cmp(const EVP_MD * const *a, const EVP_MD * const *b)
{ {
int ret = EVP_MD_number(*a) - EVP_MD_number(*b); int ret = EVP_MD_get_number(*a) - EVP_MD_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_MD_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_MD_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_MD_provider(*b))); OSSL_PROVIDER_name(EVP_MD_get0_provider(*b)));
return ret; return ret;
} }
@ -226,10 +226,11 @@ static void list_digests(void)
BIO_printf(bio_out, " "); BIO_printf(bio_out, " ");
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", OSSL_PROVIDER_name(EVP_MD_provider(m))); BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_MD_get0_provider(m)));
if (verbose) { if (verbose) {
const char *desc = EVP_MD_description(m); const char *desc = EVP_MD_get0_description(m);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -249,11 +250,11 @@ static void list_digests(void)
DEFINE_STACK_OF(EVP_MAC) DEFINE_STACK_OF(EVP_MAC)
static int mac_cmp(const EVP_MAC * const *a, const EVP_MAC * const *b) static int mac_cmp(const EVP_MAC * const *a, const EVP_MAC * const *b)
{ {
int ret = EVP_MAC_number(*a) - EVP_MAC_number(*b); int ret = EVP_MAC_get_number(*a) - EVP_MAC_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_MAC_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_MAC_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_MAC_provider(*b))); OSSL_PROVIDER_name(EVP_MAC_get0_provider(*b)));
return ret; return ret;
} }
@ -291,10 +292,11 @@ static void list_macs(void)
BIO_printf(bio_out, " "); BIO_printf(bio_out, " ");
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", OSSL_PROVIDER_name(EVP_MAC_provider(m))); BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_MAC_get0_provider(m)));
if (verbose) { if (verbose) {
const char *desc = EVP_MAC_description(m); const char *desc = EVP_MAC_get0_description(m);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -317,11 +319,11 @@ static void list_macs(void)
DEFINE_STACK_OF(EVP_KDF) DEFINE_STACK_OF(EVP_KDF)
static int kdf_cmp(const EVP_KDF * const *a, const EVP_KDF * const *b) static int kdf_cmp(const EVP_KDF * const *a, const EVP_KDF * const *b)
{ {
int ret = EVP_KDF_number(*a) - EVP_KDF_number(*b); int ret = EVP_KDF_get_number(*a) - EVP_KDF_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_KDF_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_KDF_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_KDF_provider(*b))); OSSL_PROVIDER_name(EVP_KDF_get0_provider(*b)));
return ret; return ret;
} }
@ -359,10 +361,11 @@ static void list_kdfs(void)
BIO_printf(bio_out, " "); BIO_printf(bio_out, " ");
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", OSSL_PROVIDER_name(EVP_KDF_provider(k))); BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_KDF_get0_provider(k)));
if (verbose) { if (verbose) {
const char *desc = EVP_KDF_description(k); const char *desc = EVP_KDF_get0_description(k);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -386,11 +389,11 @@ DEFINE_STACK_OF(EVP_RAND)
static int rand_cmp(const EVP_RAND * const *a, const EVP_RAND * const *b) static int rand_cmp(const EVP_RAND * const *a, const EVP_RAND * const *b)
{ {
int ret = strcasecmp(EVP_RAND_name(*a), EVP_RAND_name(*b)); int ret = strcasecmp(EVP_RAND_get0_name(*a), EVP_RAND_get0_name(*b));
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_RAND_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_RAND_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_RAND_provider(*b))); OSSL_PROVIDER_name(EVP_RAND_get0_provider(*b)));
return ret; return ret;
} }
@ -420,13 +423,14 @@ static void list_random_generators(void)
const EVP_RAND *m = sk_EVP_RAND_value(rands, i); const EVP_RAND *m = sk_EVP_RAND_value(rands, i);
if (select_name != NULL if (select_name != NULL
&& strcasecmp(EVP_RAND_name(m), select_name) != 0) && strcasecmp(EVP_RAND_get0_name(m), select_name) != 0)
continue; continue;
BIO_printf(bio_out, " %s", EVP_RAND_name(m)); BIO_printf(bio_out, " %s", EVP_RAND_get0_name(m));
BIO_printf(bio_out, " @ %s\n", OSSL_PROVIDER_name(EVP_RAND_provider(m))); BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_RAND_get0_provider(m)));
if (verbose) { if (verbose) {
const char *desc = EVP_RAND_description(m); const char *desc = EVP_RAND_get0_description(m);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -452,13 +456,13 @@ static void display_random(const char *name, EVP_RAND_CTX *drbg)
BIO_printf(bio_out, "%s:\n", name); BIO_printf(bio_out, "%s:\n", name);
if (drbg != NULL) { if (drbg != NULL) {
rand = EVP_RAND_CTX_rand(drbg); rand = EVP_RAND_CTX_get0_rand(drbg);
BIO_printf(bio_out, " %s", EVP_RAND_name(rand)); BIO_printf(bio_out, " %s", EVP_RAND_get0_name(rand));
BIO_printf(bio_out, " @ %s\n", BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_RAND_provider(rand))); OSSL_PROVIDER_name(EVP_RAND_get0_provider(rand)));
switch (EVP_RAND_state(drbg)) { switch (EVP_RAND_get_state(drbg)) {
case EVP_RAND_STATE_UNINITIALISED: case EVP_RAND_STATE_UNINITIALISED:
p = "uninitialised"; p = "uninitialised";
break; break;
@ -516,11 +520,11 @@ DEFINE_STACK_OF(OSSL_ENCODER)
static int encoder_cmp(const OSSL_ENCODER * const *a, static int encoder_cmp(const OSSL_ENCODER * const *a,
const OSSL_ENCODER * const *b) const OSSL_ENCODER * const *b)
{ {
int ret = OSSL_ENCODER_number(*a) - OSSL_ENCODER_number(*b); int ret = OSSL_ENCODER_get_number(*a) - OSSL_ENCODER_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(OSSL_ENCODER_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(*a)),
OSSL_PROVIDER_name(OSSL_ENCODER_provider(*b))); OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(*b)));
return ret; return ret;
} }
@ -560,11 +564,11 @@ static void list_encoders(void)
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s (%s)\n", BIO_printf(bio_out, " @ %s (%s)\n",
OSSL_PROVIDER_name(OSSL_ENCODER_provider(k)), OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(k)),
OSSL_ENCODER_properties(k)); OSSL_ENCODER_get0_properties(k));
if (verbose) { if (verbose) {
const char *desc = OSSL_ENCODER_description(k); const char *desc = OSSL_ENCODER_get0_description(k);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -584,11 +588,11 @@ DEFINE_STACK_OF(OSSL_DECODER)
static int decoder_cmp(const OSSL_DECODER * const *a, static int decoder_cmp(const OSSL_DECODER * const *a,
const OSSL_DECODER * const *b) const OSSL_DECODER * const *b)
{ {
int ret = OSSL_DECODER_number(*a) - OSSL_DECODER_number(*b); int ret = OSSL_DECODER_get_number(*a) - OSSL_DECODER_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(OSSL_DECODER_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(*a)),
OSSL_PROVIDER_name(OSSL_DECODER_provider(*b))); OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(*b)));
return ret; return ret;
} }
@ -629,11 +633,11 @@ static void list_decoders(void)
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s (%s)\n", BIO_printf(bio_out, " @ %s (%s)\n",
OSSL_PROVIDER_name(OSSL_DECODER_provider(k)), OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(k)),
OSSL_DECODER_properties(k)); OSSL_DECODER_get0_properties(k));
if (verbose) { if (verbose) {
const char *desc = OSSL_DECODER_description(k); const char *desc = OSSL_DECODER_get0_description(k);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -650,11 +654,11 @@ DEFINE_STACK_OF(EVP_KEYMGMT)
static int keymanager_cmp(const EVP_KEYMGMT * const *a, static int keymanager_cmp(const EVP_KEYMGMT * const *a,
const EVP_KEYMGMT * const *b) const EVP_KEYMGMT * const *b)
{ {
int ret = EVP_KEYMGMT_number(*a) - EVP_KEYMGMT_number(*b); int ret = EVP_KEYMGMT_get_number(*a) - EVP_KEYMGMT_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_KEYMGMT_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_KEYMGMT_provider(*b))); OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(*b)));
return ret; return ret;
} }
@ -684,7 +688,7 @@ static void list_keymanagers(void)
names = sk_OPENSSL_CSTRING_new(name_cmp); names = sk_OPENSSL_CSTRING_new(name_cmp);
if (names != NULL && EVP_KEYMGMT_names_do_all(k, collect_names, names)) { if (names != NULL && EVP_KEYMGMT_names_do_all(k, collect_names, names)) {
const char *desc = EVP_KEYMGMT_description(k); const char *desc = EVP_KEYMGMT_get0_description(k);
BIO_printf(bio_out, " Name: "); BIO_printf(bio_out, " Name: ");
if (desc != NULL) if (desc != NULL)
@ -696,7 +700,7 @@ static void list_keymanagers(void)
BIO_printf(bio_out, " IDs: "); BIO_printf(bio_out, " IDs: ");
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_KEYMGMT_provider(k))); OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(k)));
if (verbose) { if (verbose) {
print_param_types("settable key generation parameters", print_param_types("settable key generation parameters",
@ -716,11 +720,11 @@ DEFINE_STACK_OF(EVP_SIGNATURE)
static int signature_cmp(const EVP_SIGNATURE * const *a, static int signature_cmp(const EVP_SIGNATURE * const *a,
const EVP_SIGNATURE * const *b) const EVP_SIGNATURE * const *b)
{ {
int ret = EVP_SIGNATURE_number(*a) - EVP_SIGNATURE_number(*b); int ret = EVP_SIGNATURE_get_number(*a) - EVP_SIGNATURE_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_SIGNATURE_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_SIGNATURE_provider(*b))); OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(*b)));
return ret; return ret;
} }
@ -755,10 +759,10 @@ static void list_signatures(void)
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_SIGNATURE_provider(k))); OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(k)));
if (verbose) { if (verbose) {
const char *desc = EVP_SIGNATURE_description(k); const char *desc = EVP_SIGNATURE_get0_description(k);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -779,11 +783,11 @@ DEFINE_STACK_OF(EVP_KEM)
static int kem_cmp(const EVP_KEM * const *a, static int kem_cmp(const EVP_KEM * const *a,
const EVP_KEM * const *b) const EVP_KEM * const *b)
{ {
int ret = EVP_KEM_number(*a) - EVP_KEM_number(*b); int ret = EVP_KEM_get_number(*a) - EVP_KEM_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_KEM_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_KEM_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_KEM_provider(*b))); OSSL_PROVIDER_name(EVP_KEM_get0_provider(*b)));
return ret; return ret;
} }
@ -817,10 +821,11 @@ static void list_kems(void)
BIO_printf(bio_out, " "); BIO_printf(bio_out, " ");
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", OSSL_PROVIDER_name(EVP_KEM_provider(k))); BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_KEM_get0_provider(k)));
if (verbose) { if (verbose) {
const char *desc = EVP_KEM_description(k); const char *desc = EVP_KEM_get0_description(k);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -841,11 +846,11 @@ DEFINE_STACK_OF(EVP_ASYM_CIPHER)
static int asymcipher_cmp(const EVP_ASYM_CIPHER * const *a, static int asymcipher_cmp(const EVP_ASYM_CIPHER * const *a,
const EVP_ASYM_CIPHER * const *b) const EVP_ASYM_CIPHER * const *b)
{ {
int ret = EVP_ASYM_CIPHER_number(*a) - EVP_ASYM_CIPHER_number(*b); int ret = EVP_ASYM_CIPHER_get_number(*a) - EVP_ASYM_CIPHER_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_ASYM_CIPHER_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_ASYM_CIPHER_provider(*b))); OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(*b)));
return ret; return ret;
} }
@ -882,10 +887,10 @@ static void list_asymciphers(void)
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_ASYM_CIPHER_provider(k))); OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(k)));
if (verbose) { if (verbose) {
const char *desc = EVP_ASYM_CIPHER_description(k); const char *desc = EVP_ASYM_CIPHER_get0_description(k);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -906,11 +911,11 @@ DEFINE_STACK_OF(EVP_KEYEXCH)
static int kex_cmp(const EVP_KEYEXCH * const *a, static int kex_cmp(const EVP_KEYEXCH * const *a,
const EVP_KEYEXCH * const *b) const EVP_KEYEXCH * const *b)
{ {
int ret = EVP_KEYEXCH_number(*a) - EVP_KEYEXCH_number(*b); int ret = EVP_KEYEXCH_get_number(*a) - EVP_KEYEXCH_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(EVP_KEYEXCH_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(*a)),
OSSL_PROVIDER_name(EVP_KEYEXCH_provider(*b))); OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(*b)));
return ret; return ret;
} }
@ -945,10 +950,10 @@ static void list_keyexchanges(void)
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(EVP_KEYEXCH_provider(k))); OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(k)));
if (verbose) { if (verbose) {
const char *desc = EVP_KEYEXCH_description(k); const char *desc = EVP_KEYEXCH_get0_description(k);
if (desc != NULL) if (desc != NULL)
BIO_printf(bio_out, " description: %s\n", desc); BIO_printf(bio_out, " description: %s\n", desc);
@ -1191,11 +1196,11 @@ DEFINE_STACK_OF(OSSL_STORE_LOADER)
static int store_cmp(const OSSL_STORE_LOADER * const *a, static int store_cmp(const OSSL_STORE_LOADER * const *a,
const OSSL_STORE_LOADER * const *b) const OSSL_STORE_LOADER * const *b)
{ {
int ret = OSSL_STORE_LOADER_number(*a) - OSSL_STORE_LOADER_number(*b); int ret = OSSL_STORE_LOADER_get_number(*a) - OSSL_STORE_LOADER_get_number(*b);
if (ret == 0) if (ret == 0)
ret = strcmp(OSSL_PROVIDER_name(OSSL_STORE_LOADER_provider(*a)), ret = strcmp(OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(*a)),
OSSL_PROVIDER_name(OSSL_STORE_LOADER_provider(*b))); OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(*b)));
return ret; return ret;
} }
@ -1234,7 +1239,7 @@ static void list_store_loaders(void)
print_names(bio_out, names); print_names(bio_out, names);
BIO_printf(bio_out, " @ %s\n", BIO_printf(bio_out, " @ %s\n",
OSSL_PROVIDER_name(OSSL_STORE_LOADER_provider(m))); OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(m)));
} }
sk_OPENSSL_CSTRING_free(names); sk_OPENSSL_CSTRING_free(names);
} }

6
apps/pkeyutl.c
View file

@ -592,7 +592,7 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
if (pkey == NULL) if (pkey == NULL)
goto end; goto end;
*pkeysize = EVP_PKEY_size(pkey); *pkeysize = EVP_PKEY_get_size(pkey);
if (impl != NULL) if (impl != NULL)
ctx = EVP_PKEY_CTX_new(pkey, impl); ctx = EVP_PKEY_CTX_new(pkey, impl);
else else
@ -726,8 +726,8 @@ static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
int buf_len = 0; int buf_len = 0;
/* Some algorithms only support oneshot digests */ /* Some algorithms only support oneshot digests */
if (EVP_PKEY_id(pkey) == EVP_PKEY_ED25519 if (EVP_PKEY_get_id(pkey) == EVP_PKEY_ED25519
|| EVP_PKEY_id(pkey) == EVP_PKEY_ED448) { || EVP_PKEY_get_id(pkey) == EVP_PKEY_ED448) {
if (filesize < 0) { if (filesize < 0) {
BIO_printf(bio_err, BIO_printf(bio_err,
"Error: unable to determine file size for oneshot operation\n"); "Error: unable to determine file size for oneshot operation\n");

2
apps/rehash.c
View file

@ -534,7 +534,7 @@ int rehash_main(int argc, char **argv)
argv = opt_rest(); argv = opt_rest();
evpmd = EVP_sha1(); evpmd = EVP_sha1();
evpmdsize = EVP_MD_size(evpmd); evpmdsize = EVP_MD_get_size(evpmd);
if (*argv != NULL) { if (*argv != NULL) {
while (*argv != NULL) while (*argv != NULL)

2
apps/req.c
View file

@ -1601,7 +1601,7 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
else else
gctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), gctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
param, app_get0_propq()); param, app_get0_propq());
*pkeylen = EVP_PKEY_bits(param); *pkeylen = EVP_PKEY_get_bits(param);
EVP_PKEY_free(param); EVP_PKEY_free(param);
} else { } else {
if (keygen_engine != NULL) { if (keygen_engine != NULL) {

2
apps/rsa.c
View file

@ -337,7 +337,7 @@ int rsa_main(int argc, char **argv)
/* Passphrase setup */ /* Passphrase setup */
if (enc != NULL) if (enc != NULL)
OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_name(enc), NULL); OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_get0_name(enc), NULL);
/* Default passphrase prompter */ /* Default passphrase prompter */
if (enc != NULL || outformat == FORMAT_PVK) { if (enc != NULL || outformat == FORMAT_PVK) {

2
apps/rsautl.c
View file

@ -214,7 +214,7 @@ int rsautl_main(int argc, char **argv)
if (out == NULL) if (out == NULL)
goto end; goto end;
keysize = EVP_PKEY_size(pkey); keysize = EVP_PKEY_get_size(pkey);
rsa_in = app_malloc(keysize * 2, "hold rsa key"); rsa_in = app_malloc(keysize * 2, "hold rsa key");
rsa_out = app_malloc(keysize, "output rsa key"); rsa_out = app_malloc(keysize, "output rsa key");

6
apps/s_client.c
View file

@ -3099,8 +3099,8 @@ static void print_stuff(BIO *bio, SSL *s, int full)
public_key = X509_get_pubkey(sk_X509_value(sk, i)); public_key = X509_get_pubkey(sk_X509_value(sk, i));
if (public_key != NULL) { if (public_key != NULL) {
BIO_printf(bio, " a:PKEY: %s, %d (bit); sigalg: %s\n", BIO_printf(bio, " a:PKEY: %s, %d (bit); sigalg: %s\n",
OBJ_nid2sn(EVP_PKEY_base_id(public_key)), OBJ_nid2sn(EVP_PKEY_get_base_id(public_key)),
EVP_PKEY_bits(public_key), EVP_PKEY_get_bits(public_key),
OBJ_nid2sn(X509_get_signature_nid(sk_X509_value(sk, i)))); OBJ_nid2sn(X509_get_signature_nid(sk_X509_value(sk, i))));
EVP_PKEY_free(public_key); EVP_PKEY_free(public_key);
} }
@ -3180,7 +3180,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
pktmp = X509_get0_pubkey(peer); pktmp = X509_get0_pubkey(peer);
BIO_printf(bio, "Server public key is %d bit\n", BIO_printf(bio, "Server public key is %d bit\n",
EVP_PKEY_bits(pktmp)); EVP_PKEY_get_bits(pktmp));
} }
BIO_printf(bio, "Secure Renegotiation IS%s supported\n", BIO_printf(bio, "Secure Renegotiation IS%s supported\n",
SSL_get_secure_renegotiation_support(s) ? "" : " NOT"); SSL_get_secure_renegotiation_support(s) ? "" : " NOT");

34
apps/speed.c
View file

@ -1038,7 +1038,7 @@ static int SM2_sign_loop(void *args)
size_t sm2sigsize; size_t sm2sigsize;
int ret, count; int ret, count;
EVP_PKEY **sm2_pkey = tempargs->sm2_pkey; EVP_PKEY **sm2_pkey = tempargs->sm2_pkey;
const size_t max_size = EVP_PKEY_size(sm2_pkey[testnum]); const size_t max_size = EVP_PKEY_get_size(sm2_pkey[testnum]);
for (count = 0; COND(sm2_c[testnum][0]); count++) { for (count = 0; COND(sm2_c[testnum][0]); count++) {
sm2sigsize = max_size; sm2sigsize = max_size;
@ -1715,10 +1715,10 @@ int speed_main(int argc, char **argv)
if (evp_cipher == NULL) { if (evp_cipher == NULL) {
BIO_printf(bio_err, "-aead can be used only with an AEAD cipher\n"); BIO_printf(bio_err, "-aead can be used only with an AEAD cipher\n");
goto end; goto end;
} else if (!(EVP_CIPHER_flags(evp_cipher) & } else if (!(EVP_CIPHER_get_flags(evp_cipher) &
EVP_CIPH_FLAG_AEAD_CIPHER)) { EVP_CIPH_FLAG_AEAD_CIPHER)) {
BIO_printf(bio_err, "%s is not an AEAD cipher\n", BIO_printf(bio_err, "%s is not an AEAD cipher\n",
EVP_CIPHER_name(evp_cipher)); EVP_CIPHER_get0_name(evp_cipher));
goto end; goto end;
} }
} }
@ -1727,10 +1727,10 @@ int speed_main(int argc, char **argv)
BIO_printf(bio_err, "-mb can be used only with a multi-block" BIO_printf(bio_err, "-mb can be used only with a multi-block"
" capable cipher\n"); " capable cipher\n");
goto end; goto end;
} else if (!(EVP_CIPHER_flags(evp_cipher) & } else if (!(EVP_CIPHER_get_flags(evp_cipher) &
EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) { EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
BIO_printf(bio_err, "%s is not a multi-block capable\n", BIO_printf(bio_err, "%s is not a multi-block capable\n",
EVP_CIPHER_name(evp_cipher)); EVP_CIPHER_get0_name(evp_cipher));
goto end; goto end;
} else if (async_jobs > 0) { } else if (async_jobs > 0) {
BIO_printf(bio_err, "Async mode is not supported with -mb"); BIO_printf(bio_err, "Async mode is not supported with -mb");
@ -2172,18 +2172,18 @@ int speed_main(int argc, char **argv)
if (evp_cipher != NULL) { if (evp_cipher != NULL) {
int (*loopfunc) (void *) = EVP_Update_loop; int (*loopfunc) (void *) = EVP_Update_loop;
if (multiblock && (EVP_CIPHER_flags(evp_cipher) & if (multiblock && (EVP_CIPHER_get_flags(evp_cipher) &
EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) { EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
multiblock_speed(evp_cipher, lengths_single, &seconds); multiblock_speed(evp_cipher, lengths_single, &seconds);
ret = 0; ret = 0;
goto end; goto end;
} }
names[D_EVP] = EVP_CIPHER_name(evp_cipher); names[D_EVP] = EVP_CIPHER_get0_name(evp_cipher);
if (EVP_CIPHER_mode(evp_cipher) == EVP_CIPH_CCM_MODE) { if (EVP_CIPHER_get_mode(evp_cipher) == EVP_CIPH_CCM_MODE) {
loopfunc = EVP_Update_loop_ccm; loopfunc = EVP_Update_loop_ccm;
} else if (aead && (EVP_CIPHER_flags(evp_cipher) & } else if (aead && (EVP_CIPHER_get_flags(evp_cipher) &
EVP_CIPH_FLAG_AEAD_CIPHER)) { EVP_CIPH_FLAG_AEAD_CIPHER)) {
loopfunc = EVP_Update_loop_aead; loopfunc = EVP_Update_loop_aead;
if (lengths == lengths_list) { if (lengths == lengths_list) {
@ -2211,7 +2211,7 @@ int speed_main(int argc, char **argv)
EVP_CIPHER_CTX_set_padding(loopargs[k].ctx, 0); EVP_CIPHER_CTX_set_padding(loopargs[k].ctx, 0);
keylen = EVP_CIPHER_CTX_key_length(loopargs[k].ctx); keylen = EVP_CIPHER_CTX_get_key_length(loopargs[k].ctx);
loopargs[k].key = app_malloc(keylen, "evp_cipher key"); loopargs[k].key = app_malloc(keylen, "evp_cipher key");
EVP_CIPHER_CTX_rand_key(loopargs[k].ctx, loopargs[k].key); EVP_CIPHER_CTX_rand_key(loopargs[k].ctx, loopargs[k].key);
if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL, if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL,
@ -2223,7 +2223,7 @@ int speed_main(int argc, char **argv)
OPENSSL_clear_free(loopargs[k].key, keylen); OPENSSL_clear_free(loopargs[k].key, keylen);
/* SIV mode only allows for a single Update operation */ /* SIV mode only allows for a single Update operation */
if (EVP_CIPHER_mode(evp_cipher) == EVP_CIPH_SIV_MODE) if (EVP_CIPHER_get_mode(evp_cipher) == EVP_CIPH_SIV_MODE)
EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, EVP_CTRL_SET_SPEED, EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, EVP_CTRL_SET_SPEED,
1, NULL); 1, NULL);
} }
@ -2261,7 +2261,7 @@ int speed_main(int argc, char **argv)
if (!opt_cipher(evp_mac_ciphername, &cipher)) if (!opt_cipher(evp_mac_ciphername, &cipher))
goto end; goto end;
keylen = EVP_CIPHER_key_length(cipher); keylen = EVP_CIPHER_get_key_length(cipher);
EVP_CIPHER_free(cipher); EVP_CIPHER_free(cipher);
if (keylen <= 0 || keylen > (int)sizeof(key32)) { if (keylen <= 0 || keylen > (int)sizeof(key32)) {
BIO_printf(bio_err, "\nRequested CMAC cipher with unsupported key length.\n"); BIO_printf(bio_err, "\nRequested CMAC cipher with unsupported key length.\n");
@ -2795,7 +2795,7 @@ int speed_main(int argc, char **argv)
st = 0; /* set back to zero */ st = 0; /* set back to zero */
/* attach it sooner to rely on main final cleanup */ /* attach it sooner to rely on main final cleanup */
loopargs[i].sm2_pkey[testnum] = sm2_pkey; loopargs[i].sm2_pkey[testnum] = sm2_pkey;
loopargs[i].sigsize = EVP_PKEY_size(sm2_pkey); loopargs[i].sigsize = EVP_PKEY_get_size(sm2_pkey);
sm2_pctx = EVP_PKEY_CTX_new(sm2_pkey, NULL); sm2_pctx = EVP_PKEY_CTX_new(sm2_pkey, NULL);
sm2_vfy_pctx = EVP_PKEY_CTX_new(sm2_pkey, NULL); sm2_vfy_pctx = EVP_PKEY_CTX_new(sm2_pkey, NULL);
@ -3290,12 +3290,12 @@ int speed_main(int argc, char **argv)
/* free signing ctx */ /* free signing ctx */
if (loopargs[i].sm2_ctx[k] != NULL if (loopargs[i].sm2_ctx[k] != NULL
&& (pctx = EVP_MD_CTX_pkey_ctx(loopargs[i].sm2_ctx[k])) != NULL) && (pctx = EVP_MD_CTX_get_pkey_ctx(loopargs[i].sm2_ctx[k])) != NULL)
EVP_PKEY_CTX_free(pctx); EVP_PKEY_CTX_free(pctx);
EVP_MD_CTX_free(loopargs[i].sm2_ctx[k]); EVP_MD_CTX_free(loopargs[i].sm2_ctx[k]);
/* free verification ctx */ /* free verification ctx */
if (loopargs[i].sm2_vfy_ctx[k] != NULL if (loopargs[i].sm2_vfy_ctx[k] != NULL
&& (pctx = EVP_MD_CTX_pkey_ctx(loopargs[i].sm2_vfy_ctx[k])) != NULL) && (pctx = EVP_MD_CTX_get_pkey_ctx(loopargs[i].sm2_vfy_ctx[k])) != NULL)
EVP_PKEY_CTX_free(pctx); EVP_PKEY_CTX_free(pctx);
EVP_MD_CTX_free(loopargs[i].sm2_vfy_ctx[k]); EVP_MD_CTX_free(loopargs[i].sm2_vfy_ctx[k]);
/* free pkey */ /* free pkey */
@ -3575,7 +3575,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
if (!EVP_EncryptInit_ex(ctx, evp_cipher, NULL, NULL, no_iv)) if (!EVP_EncryptInit_ex(ctx, evp_cipher, NULL, NULL, no_iv))
app_bail_out("failed to initialise cipher context\n"); app_bail_out("failed to initialise cipher context\n");
if ((keylen = EVP_CIPHER_CTX_key_length(ctx)) < 0) { if ((keylen = EVP_CIPHER_CTX_get_key_length(ctx)) < 0) {
BIO_printf(bio_err, "Impossible negative key length: %d\n", keylen); BIO_printf(bio_err, "Impossible negative key length: %d\n", keylen);
goto err; goto err;
} }
@ -3589,7 +3589,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_MAC_KEY, if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_MAC_KEY,
sizeof(no_key), no_key)) sizeof(no_key), no_key))
app_bail_out("failed to set AEAD key\n"); app_bail_out("failed to set AEAD key\n");
if ((alg_name = EVP_CIPHER_name(evp_cipher)) == NULL) if ((alg_name = EVP_CIPHER_get0_name(evp_cipher)) == NULL)
app_bail_out("failed to get cipher name\n"); app_bail_out("failed to get cipher name\n");
for (j = 0; j < num; j++) { for (j = 0; j < num; j++) {

6
apps/ts.c
View file

@ -460,7 +460,7 @@ static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
goto err; goto err;
if ((algo = X509_ALGOR_new()) == NULL) if ((algo = X509_ALGOR_new()) == NULL)
goto err; goto err;
if ((algo->algorithm = OBJ_nid2obj(EVP_MD_type(md))) == NULL) if ((algo->algorithm = OBJ_nid2obj(EVP_MD_get_type(md))) == NULL)
goto err; goto err;
if ((algo->parameter = ASN1_TYPE_new()) == NULL) if ((algo->parameter = ASN1_TYPE_new()) == NULL)
goto err; goto err;
@ -509,7 +509,7 @@ static int create_digest(BIO *input, const char *digest, const EVP_MD *md,
int rv = 0; int rv = 0;
EVP_MD_CTX *md_ctx = NULL; EVP_MD_CTX *md_ctx = NULL;
md_value_len = EVP_MD_size(md); md_value_len = EVP_MD_get_size(md);
if (md_value_len < 0) if (md_value_len < 0)
return 0; return 0;
@ -529,7 +529,7 @@ static int create_digest(BIO *input, const char *digest, const EVP_MD *md,
} }
if (!EVP_DigestFinal(md_ctx, *md_value, NULL)) if (!EVP_DigestFinal(md_ctx, *md_value, NULL))
goto err; goto err;
md_value_len = EVP_MD_size(md); md_value_len = EVP_MD_get_size(md);
} else { } else {
long digest_len; long digest_len;

6
crypto/asn1/a_digest.c
View file

@ -65,15 +65,15 @@ int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
if (i < 0 || str == NULL) if (i < 0 || str == NULL)
return 0; return 0;
if (EVP_MD_provider(md) == NULL) { if (EVP_MD_get0_provider(md) == NULL) {
#if !defined(OPENSSL_NO_ENGINE) #if !defined(OPENSSL_NO_ENGINE)
ENGINE *tmpeng = ENGINE_get_digest_engine(EVP_MD_type(md)); ENGINE *tmpeng = ENGINE_get_digest_engine(EVP_MD_get_type(md));
if (tmpeng != NULL) if (tmpeng != NULL)
ENGINE_finish(tmpeng); ENGINE_finish(tmpeng);
else else
#endif #endif
fetched_md = EVP_MD_fetch(libctx, EVP_MD_name(md), propq); fetched_md = EVP_MD_fetch(libctx, EVP_MD_get0_name(md), propq);
} }
if (fetched_md == NULL) if (fetched_md == NULL)
goto err; goto err;

10
crypto/asn1/a_sign.c
View file

@ -78,7 +78,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
} }
inll = (size_t)inl; inll = (size_t)inl;
buf_in = OPENSSL_malloc(inll); buf_in = OPENSSL_malloc(inll);
outll = outl = EVP_PKEY_size(pkey); outll = outl = EVP_PKEY_get_size(pkey);
buf_out = OPENSSL_malloc(outll); buf_out = OPENSSL_malloc(outll);
if (buf_in == NULL || buf_out == NULL) { if (buf_in == NULL || buf_out == NULL) {
outl = 0; outl = 0;
@ -143,7 +143,7 @@ int ASN1_item_sign_ex(const ASN1_ITEM *it, X509_ALGOR *algor1,
rv = ASN1_item_sign_ctx(it, algor1, algor2, signature, data, ctx); rv = ASN1_item_sign_ctx(it, algor1, algor2, signature, data, ctx);
err: err:
EVP_PKEY_CTX_free(EVP_MD_CTX_pkey_ctx(ctx)); EVP_PKEY_CTX_free(EVP_MD_CTX_get_pkey_ctx(ctx));
EVP_MD_CTX_free(ctx); EVP_MD_CTX_free(ctx);
return rv; return rv;
} }
@ -160,7 +160,7 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
int rv, pkey_id; int rv, pkey_id;
md = EVP_MD_CTX_get0_md(ctx); md = EVP_MD_CTX_get0_md(ctx);
pkey = EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)); pkey = EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_get_pkey_ctx(ctx));
if (pkey == NULL) { if (pkey == NULL) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_CONTEXT_NOT_INITIALISED); ERR_raise(ERR_LIB_ASN1, ASN1_R_CONTEXT_NOT_INITIALISED);
@ -168,7 +168,7 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
} }
if (pkey->ameth == NULL) { if (pkey->ameth == NULL) {
EVP_PKEY_CTX *pctx = EVP_MD_CTX_pkey_ctx(ctx); EVP_PKEY_CTX *pctx = EVP_MD_CTX_get_pkey_ctx(ctx);
OSSL_PARAM params[2]; OSSL_PARAM params[2];
unsigned char aid[128]; unsigned char aid[128];
size_t aid_len = 0; size_t aid_len = 0;
@ -238,7 +238,7 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
pkey_id = pkey_id =
#ifndef OPENSSL_NO_SM2 #ifndef OPENSSL_NO_SM2
EVP_PKEY_id(pkey) == NID_sm2 ? NID_sm2 : EVP_PKEY_get_id(pkey) == NID_sm2 ? NID_sm2 :
#endif #endif
pkey->ameth->pkey_id; pkey->ameth->pkey_id;

4
crypto/asn1/a_verify.c
View file

@ -102,7 +102,7 @@ int ASN1_item_verify_ex(const ASN1_ITEM *it, const X509_ALGOR *alg,
if ((ctx = evp_md_ctx_new_ex(pkey, id, libctx, propq)) != NULL) { if ((ctx = evp_md_ctx_new_ex(pkey, id, libctx, propq)) != NULL) {
rv = ASN1_item_verify_ctx(it, alg, signature, data, ctx); rv = ASN1_item_verify_ctx(it, alg, signature, data, ctx);
EVP_PKEY_CTX_free(EVP_MD_CTX_pkey_ctx(ctx)); EVP_PKEY_CTX_free(EVP_MD_CTX_get_pkey_ctx(ctx));
EVP_MD_CTX_free(ctx); EVP_MD_CTX_free(ctx);
} }
return rv; return rv;
@ -118,7 +118,7 @@ int ASN1_item_verify_ctx(const ASN1_ITEM *it, const X509_ALGOR *alg,
int mdnid, pknid; int mdnid, pknid;
size_t inll = 0; size_t inll = 0;
pkey = EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)); pkey = EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_get_pkey_ctx(ctx));
if (pkey == NULL) { if (pkey == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_PASSED_NULL_PARAMETER); ERR_raise(ERR_LIB_ASN1, ERR_R_PASSED_NULL_PARAMETER);

2
crypto/asn1/d2i_param.c
View file

@ -26,7 +26,7 @@ EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
} else } else
ret = *a; ret = *a;
if (type != EVP_PKEY_id(ret) && !EVP_PKEY_set_type(ret, type)) if (type != EVP_PKEY_get_id(ret) && !EVP_PKEY_set_type(ret, type))
goto err; goto err;
if (ret->ameth == NULL || ret->ameth->param_decode == NULL) { if (ret->ameth == NULL || ret->ameth->param_decode == NULL) {

2
crypto/asn1/d2i_pr.c
View file

@ -120,7 +120,7 @@ d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
EVP_PKEY_free(ret); EVP_PKEY_free(ret);
ret = tmp; ret = tmp;
ERR_pop_to_mark(); ERR_pop_to_mark();
if (EVP_PKEY_type(keytype) != EVP_PKEY_base_id(ret)) if (EVP_PKEY_type(keytype) != EVP_PKEY_get_base_id(ret))
goto err; goto err;
} else { } else {
ERR_clear_last_mark(); ERR_clear_last_mark();

4
crypto/asn1/d2i_pu.c
View file

@ -38,12 +38,12 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
} else } else
ret = *a; ret = *a;
if (type != EVP_PKEY_id(ret) && !EVP_PKEY_set_type(ret, type)) { if (type != EVP_PKEY_get_id(ret) && !EVP_PKEY_set_type(ret, type)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB); ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
goto err; goto err;
} }
switch (EVP_PKEY_id(ret)) { switch (EVP_PKEY_get_id(ret)) {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) == NULL) { if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB); ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);

2
crypto/asn1/i2d_evp.c
View file

@ -131,7 +131,7 @@ int i2d_PublicKey(const EVP_PKEY *a, unsigned char **pp)
return i2d_provided(a, EVP_PKEY_PUBLIC_KEY, output_info, pp); return i2d_provided(a, EVP_PKEY_PUBLIC_KEY, output_info, pp);
} }
switch (EVP_PKEY_id(a)) { switch (EVP_PKEY_get_id(a)) {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
return i2d_RSAPublicKey(EVP_PKEY_get0_RSA(a), pp); return i2d_RSAPublicKey(EVP_PKEY_get0_RSA(a), pp);
#ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_DSA

6
crypto/asn1/p5_pbev2.c
View file

@ -50,7 +50,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
unsigned char iv[EVP_MAX_IV_LENGTH]; unsigned char iv[EVP_MAX_IV_LENGTH];
PBE2PARAM *pbe2 = NULL; PBE2PARAM *pbe2 = NULL;
alg_nid = EVP_CIPHER_type(cipher); alg_nid = EVP_CIPHER_get_type(cipher);
if (alg_nid == NID_undef) { if (alg_nid == NID_undef) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER); ERR_raise(ERR_LIB_ASN1, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
goto err; goto err;
@ -66,7 +66,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
goto merr; goto merr;
/* Create random IV */ /* Create random IV */
ivlen = EVP_CIPHER_iv_length(cipher); ivlen = EVP_CIPHER_get_iv_length(cipher);
if (ivlen > 0) { if (ivlen > 0) {
if (aiv) if (aiv)
memcpy(iv, aiv, ivlen); memcpy(iv, aiv, ivlen);
@ -101,7 +101,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
/* If its RC2 then we'd better setup the key length */ /* If its RC2 then we'd better setup the key length */
if (alg_nid == NID_rc2_cbc) if (alg_nid == NID_rc2_cbc)
keylen = EVP_CIPHER_key_length(cipher); keylen = EVP_CIPHER_get_key_length(cipher);
else else
keylen = -1; keylen = -1;

12
crypto/asn1/p5_scrypt.c
View file

@ -60,7 +60,7 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
goto err; goto err;
} }
alg_nid = EVP_CIPHER_type(cipher); alg_nid = EVP_CIPHER_get_type(cipher);
if (alg_nid == NID_undef) { if (alg_nid == NID_undef) {
ERR_raise(ERR_LIB_ASN1, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER); ERR_raise(ERR_LIB_ASN1, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
goto err; goto err;
@ -79,10 +79,10 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
goto merr; goto merr;
/* Create random IV */ /* Create random IV */
if (EVP_CIPHER_iv_length(cipher)) { if (EVP_CIPHER_get_iv_length(cipher)) {
if (aiv) if (aiv)
memcpy(iv, aiv, EVP_CIPHER_iv_length(cipher)); memcpy(iv, aiv, EVP_CIPHER_get_iv_length(cipher));
else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) <= 0) else if (RAND_bytes(iv, EVP_CIPHER_get_iv_length(cipher)) <= 0)
goto err; goto err;
} }
@ -103,7 +103,7 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
/* If its RC2 then we'd better setup the key length */ /* If its RC2 then we'd better setup the key length */
if (alg_nid == NID_rc2_cbc) if (alg_nid == NID_rc2_cbc)
keylen = EVP_CIPHER_key_length(cipher); keylen = EVP_CIPHER_get_key_length(cipher);
/* Setup keyfunc */ /* Setup keyfunc */
@ -234,7 +234,7 @@ int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
goto err; goto err;
} }
t = EVP_CIPHER_CTX_key_length(ctx); t = EVP_CIPHER_CTX_get_key_length(ctx);
if (t < 0) { if (t < 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH); ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
goto err; goto err;

2
crypto/asn1/x_algor.c
View file

@ -80,7 +80,7 @@ void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md)
else else
param_type = V_ASN1_NULL; param_type = V_ASN1_NULL;
X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL); X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_get_type(md)), param_type, NULL);
} }

10
crypto/cmac/cmac.c
View file

@ -96,7 +96,7 @@ int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in)
if (in->nlast_block == -1) if (in->nlast_block == -1)
return 0; return 0;
if ((bl = EVP_CIPHER_CTX_block_size(in->cctx)) < 0) if ((bl = EVP_CIPHER_CTX_get_block_size(in->cctx)) < 0)
return 0; return 0;
if (!EVP_CIPHER_CTX_copy(out->cctx, in->cctx)) if (!EVP_CIPHER_CTX_copy(out->cctx, in->cctx))
return 0; return 0;
@ -120,7 +120,7 @@ int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
return 0; return 0;
if (!EVP_EncryptInit_ex(ctx->cctx, NULL, NULL, NULL, zero_iv)) if (!EVP_EncryptInit_ex(ctx->cctx, NULL, NULL, NULL, zero_iv))
return 0; return 0;
memset(ctx->tbl, 0, EVP_CIPHER_CTX_block_size(ctx->cctx)); memset(ctx->tbl, 0, EVP_CIPHER_CTX_get_block_size(ctx->cctx));
ctx->nlast_block = 0; ctx->nlast_block = 0;
return 1; return 1;
} }
@ -143,7 +143,7 @@ int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
return 0; return 0;
if (!EVP_EncryptInit_ex(ctx->cctx, NULL, NULL, key, zero_iv)) if (!EVP_EncryptInit_ex(ctx->cctx, NULL, NULL, key, zero_iv))
return 0; return 0;
if ((bl = EVP_CIPHER_CTX_block_size(ctx->cctx)) < 0) if ((bl = EVP_CIPHER_CTX_get_block_size(ctx->cctx)) < 0)
return 0; return 0;
if (EVP_Cipher(ctx->cctx, ctx->tbl, zero_iv, bl) <= 0) if (EVP_Cipher(ctx->cctx, ctx->tbl, zero_iv, bl) <= 0)
return 0; return 0;
@ -169,7 +169,7 @@ int CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen)
return 0; return 0;
if (dlen == 0) if (dlen == 0)
return 1; return 1;
if ((bl = EVP_CIPHER_CTX_block_size(ctx->cctx)) < 0) if ((bl = EVP_CIPHER_CTX_get_block_size(ctx->cctx)) < 0)
return 0; return 0;
/* Copy into partial block if we need to */ /* Copy into partial block if we need to */
if (ctx->nlast_block > 0) { if (ctx->nlast_block > 0) {
@ -209,7 +209,7 @@ int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
if (ctx->nlast_block == -1) if (ctx->nlast_block == -1)
return 0; return 0;
if ((bl = EVP_CIPHER_CTX_block_size(ctx->cctx)) < 0) if ((bl = EVP_CIPHER_CTX_get_block_size(ctx->cctx)) < 0)
return 0; return 0;
if (poutlen != NULL) if (poutlen != NULL)
*poutlen = (size_t)bl; *poutlen = (size_t)bl;

4
crypto/cmp/cmp_ctx.c
View file

@ -1114,9 +1114,9 @@ int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt)
case OSSL_CMP_OPT_POPO_METHOD: case OSSL_CMP_OPT_POPO_METHOD:
return ctx->popoMethod; return ctx->popoMethod;
case OSSL_CMP_OPT_DIGEST_ALGNID: case OSSL_CMP_OPT_DIGEST_ALGNID:
return EVP_MD_type(ctx->digest); return EVP_MD_get_type(ctx->digest);
case OSSL_CMP_OPT_OWF_ALGNID: case OSSL_CMP_OPT_OWF_ALGNID:
return EVP_MD_type(ctx->pbm_owf); return EVP_MD_get_type(ctx->pbm_owf);
case OSSL_CMP_OPT_MAC_ALGNID: case OSSL_CMP_OPT_MAC_ALGNID:
return ctx->pbm_mac; return ctx->pbm_mac;
case OSSL_CMP_OPT_KEEP_ALIVE: case OSSL_CMP_OPT_KEEP_ALIVE:

6
crypto/cmp/cmp_protect.c
View file

@ -195,7 +195,7 @@ static int set_pbmac_algor(const OSSL_CMP_CTX *ctx, X509_ALGOR **alg)
return 0; return 0;
pbm = OSSL_CRMF_pbmp_new(ctx->libctx, ctx->pbm_slen, pbm = OSSL_CRMF_pbmp_new(ctx->libctx, ctx->pbm_slen,
EVP_MD_type(ctx->pbm_owf), ctx->pbm_itercnt, EVP_MD_get_type(ctx->pbm_owf), ctx->pbm_itercnt,
ctx->pbm_mac); ctx->pbm_mac);
pbm_str = ASN1_STRING_new(); pbm_str = ASN1_STRING_new();
if (pbm == NULL || pbm_str == NULL) if (pbm == NULL || pbm_str == NULL)
@ -227,8 +227,8 @@ static int set_sig_algor(const OSSL_CMP_CTX *ctx, X509_ALGOR **alg)
int nid = 0; int nid = 0;
ASN1_OBJECT *algo = NULL; ASN1_OBJECT *algo = NULL;
if (!OBJ_find_sigid_by_algs(&nid, EVP_MD_type(ctx->digest), if (!OBJ_find_sigid_by_algs(&nid, EVP_MD_get_type(ctx->digest),
EVP_PKEY_id(ctx->pkey))) { EVP_PKEY_get_id(ctx->pkey))) {
ERR_raise(ERR_LIB_CMP, CMP_R_UNSUPPORTED_KEY_TYPE); ERR_raise(ERR_LIB_CMP, CMP_R_UNSUPPORTED_KEY_TYPE);
return 0; return 0;
} }

15
crypto/cms/cms_dh.c
View file

@ -53,7 +53,7 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
* Pad to full p parameter size as that is checked by * Pad to full p parameter size as that is checked by
* EVP_PKEY_set1_encoded_public_key() * EVP_PKEY_set1_encoded_public_key()
*/ */
plen = EVP_PKEY_size(pk); plen = EVP_PKEY_get_size(pk);
if ((bnpub = ASN1_INTEGER_to_BN(public_key, NULL)) == NULL) if ((bnpub = ASN1_INTEGER_to_BN(public_key, NULL)) == NULL)
goto err; goto err;
if ((buf = OPENSSL_malloc(plen)) == NULL) if ((buf = OPENSSL_malloc(plen)) == NULL)
@ -122,19 +122,20 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
goto err; goto err;
kekcipher = EVP_CIPHER_fetch(pctx->libctx, name, pctx->propquery); kekcipher = EVP_CIPHER_fetch(pctx->libctx, name, pctx->propquery);
if (kekcipher == NULL || EVP_CIPHER_mode(kekcipher) != EVP_CIPH_WRAP_MODE) if (kekcipher == NULL
|| EVP_CIPHER_get_mode(kekcipher) != EVP_CIPH_WRAP_MODE)
goto err; goto err;
if (!EVP_EncryptInit_ex(kekctx, kekcipher, NULL, NULL, NULL)) if (!EVP_EncryptInit_ex(kekctx, kekcipher, NULL, NULL, NULL))
goto err; goto err;
if (EVP_CIPHER_asn1_to_param(kekctx, kekalg->parameter) <= 0) if (EVP_CIPHER_asn1_to_param(kekctx, kekalg->parameter) <= 0)
goto err; goto err;
keylen = EVP_CIPHER_CTX_key_length(kekctx); keylen = EVP_CIPHER_CTX_get_key_length(kekctx);
if (EVP_PKEY_CTX_set_dh_kdf_outlen(pctx, keylen) <= 0) if (EVP_PKEY_CTX_set_dh_kdf_outlen(pctx, keylen) <= 0)
goto err; goto err;
/* Use OBJ_nid2obj to ensure we use built in OID that isn't freed */ /* Use OBJ_nid2obj to ensure we use built in OID that isn't freed */
if (EVP_PKEY_CTX_set0_dh_kdf_oid(pctx, if (EVP_PKEY_CTX_set0_dh_kdf_oid(pctx,
OBJ_nid2obj(EVP_CIPHER_type(kekcipher))) OBJ_nid2obj(EVP_CIPHER_get_type(kekcipher)))
<= 0) <= 0)
goto err; goto err;
@ -258,7 +259,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
kdf_md = EVP_sha1(); kdf_md = EVP_sha1();
if (EVP_PKEY_CTX_set_dh_kdf_md(pctx, kdf_md) <= 0) if (EVP_PKEY_CTX_set_dh_kdf_md(pctx, kdf_md) <= 0)
goto err; goto err;
} else if (EVP_MD_type(kdf_md) != NID_sha1) } else if (EVP_MD_get_type(kdf_md) != NID_sha1)
/* Unsupported digest */ /* Unsupported digest */
goto err; goto err;
@ -267,10 +268,10 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
/* Get wrap NID */ /* Get wrap NID */
ctx = CMS_RecipientInfo_kari_get0_ctx(ri); ctx = CMS_RecipientInfo_kari_get0_ctx(ri);
wrap_nid = EVP_CIPHER_CTX_type(ctx); wrap_nid = EVP_CIPHER_CTX_get_type(ctx);
if (EVP_PKEY_CTX_set0_dh_kdf_oid(pctx, OBJ_nid2obj(wrap_nid)) <= 0) if (EVP_PKEY_CTX_set0_dh_kdf_oid(pctx, OBJ_nid2obj(wrap_nid)) <= 0)
goto err; goto err;
keylen = EVP_CIPHER_CTX_key_length(ctx); keylen = EVP_CIPHER_CTX_get_key_length(ctx);
/* Package wrap algorithm in an AlgorithmIdentifier */ /* Package wrap algorithm in an AlgorithmIdentifier */

12
crypto/cms/cms_ec.c
View file

@ -182,14 +182,14 @@ static int ecdh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
goto err; goto err;
OBJ_obj2txt(name, sizeof(name), kekalg->algorithm, 0); OBJ_obj2txt(name, sizeof(name), kekalg->algorithm, 0);
kekcipher = EVP_CIPHER_fetch(pctx->libctx, name, pctx->propquery); kekcipher = EVP_CIPHER_fetch(pctx->libctx, name, pctx->propquery);
if (kekcipher == NULL || EVP_CIPHER_mode(kekcipher) != EVP_CIPH_WRAP_MODE) if (kekcipher == NULL || EVP_CIPHER_get_mode(kekcipher) != EVP_CIPH_WRAP_MODE)
goto err; goto err;
if (!EVP_EncryptInit_ex(kekctx, kekcipher, NULL, NULL, NULL)) if (!EVP_EncryptInit_ex(kekctx, kekcipher, NULL, NULL, NULL))
goto err; goto err;
if (EVP_CIPHER_asn1_to_param(kekctx, kekalg->parameter) <= 0) if (EVP_CIPHER_asn1_to_param(kekctx, kekalg->parameter) <= 0)
goto err; goto err;
keylen = EVP_CIPHER_CTX_key_length(kekctx); keylen = EVP_CIPHER_CTX_get_key_length(kekctx);
if (EVP_PKEY_CTX_set_ecdh_kdf_outlen(pctx, keylen) <= 0) if (EVP_PKEY_CTX_set_ecdh_kdf_outlen(pctx, keylen) <= 0)
goto err; goto err;
@ -313,12 +313,12 @@ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri)
/* Lookup NID for KDF+cofactor+digest */ /* Lookup NID for KDF+cofactor+digest */
if (!OBJ_find_sigid_by_algs(&kdf_nid, EVP_MD_type(kdf_md), ecdh_nid)) if (!OBJ_find_sigid_by_algs(&kdf_nid, EVP_MD_get_type(kdf_md), ecdh_nid))
goto err; goto err;
/* Get wrap NID */ /* Get wrap NID */
ctx = CMS_RecipientInfo_kari_get0_ctx(ri); ctx = CMS_RecipientInfo_kari_get0_ctx(ri);
wrap_nid = EVP_CIPHER_CTX_type(ctx); wrap_nid = EVP_CIPHER_CTX_get_type(ctx);
keylen = EVP_CIPHER_CTX_key_length(ctx); keylen = EVP_CIPHER_CTX_get_key_length(ctx);
/* Package wrap algorithm in an AlgorithmIdentifier */ /* Package wrap algorithm in an AlgorithmIdentifier */
@ -400,7 +400,7 @@ int ossl_cms_ecdsa_dsa_sign(CMS_SignerInfo *si, int verify)
hnid = OBJ_obj2nid(alg1->algorithm); hnid = OBJ_obj2nid(alg1->algorithm);
if (hnid == NID_undef) if (hnid == NID_undef)
return -1; return -1;
if (!OBJ_find_sigid_by_algs(&snid, hnid, EVP_PKEY_id(pkey))) if (!OBJ_find_sigid_by_algs(&snid, hnid, EVP_PKEY_get_id(pkey)))
return -1; return -1;
X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF, 0); X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF, 0);
} }

15
crypto/cms/cms_enc.c
View file

@ -62,7 +62,8 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
cipher = EVP_get_cipherbyobj(calg->algorithm); cipher = EVP_get_cipherbyobj(calg->algorithm);
} }
if (cipher != NULL) { if (cipher != NULL) {
fetched_ciph = EVP_CIPHER_fetch(libctx, EVP_CIPHER_name(cipher), propq); fetched_ciph = EVP_CIPHER_fetch(libctx, EVP_CIPHER_get0_name(cipher),
propq);
if (fetched_ciph != NULL) if (fetched_ciph != NULL)
cipher = fetched_ciph; cipher = fetched_ciph;
} }
@ -79,9 +80,9 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
} }
if (enc) { if (enc) {
calg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_type(ctx)); calg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_get_type(ctx));
/* Generate a random IV if we need one */ /* Generate a random IV if we need one */
ivlen = EVP_CIPHER_CTX_iv_length(ctx); ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
if (ivlen > 0) { if (ivlen > 0) {
if (RAND_bytes_ex(libctx, iv, ivlen, 0) <= 0) if (RAND_bytes_ex(libctx, iv, ivlen, 0) <= 0)
goto err; goto err;
@ -92,7 +93,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
ERR_raise(ERR_LIB_CMS, CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR); ERR_raise(ERR_LIB_CMS, CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
goto err; goto err;
} }
if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) { if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) {
piv = aparams.iv; piv = aparams.iv;
if (ec->taglen > 0 if (ec->taglen > 0
&& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
@ -102,7 +103,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
} }
} }
} }
len = EVP_CIPHER_CTX_key_length(ctx); len = EVP_CIPHER_CTX_get_key_length(ctx);
if (len <= 0) if (len <= 0)
goto err; goto err;
tkeylen = (size_t)len; tkeylen = (size_t)len;
@ -160,10 +161,10 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
ERR_raise(ERR_LIB_CMS, ERR_R_MALLOC_FAILURE); ERR_raise(ERR_LIB_CMS, ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) { if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) {
memcpy(aparams.iv, piv, ivlen); memcpy(aparams.iv, piv, ivlen);
aparams.iv_len = ivlen; aparams.iv_len = ivlen;
aparams.tag_len = EVP_CIPHER_CTX_tag_length(ctx); aparams.tag_len = EVP_CIPHER_CTX_get_tag_length(ctx);
if (aparams.tag_len <= 0) if (aparams.tag_len <= 0)
goto err; goto err;
} }

10
crypto/cms/cms_env.c
View file

@ -557,7 +557,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
} }
(void)ERR_pop_to_mark(); (void)ERR_pop_to_mark();
fixlen = EVP_CIPHER_key_length(cipher); fixlen = EVP_CIPHER_get_key_length(cipher);
EVP_CIPHER_free(fetched_cipher); EVP_CIPHER_free(fetched_cipher);
} }
@ -1108,7 +1108,7 @@ static BIO *cms_EnvelopedData_Decryption_init_bio(CMS_ContentInfo *cms)
* If the selected cipher supports unprotected attributes, * If the selected cipher supports unprotected attributes,
* deal with it using special ctrl function * deal with it using special ctrl function
*/ */
if ((EVP_CIPHER_flags(EVP_CIPHER_CTX_get0_cipher(ctx)) if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
& EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0 & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0
&& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED, 0, && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED, 0,
cms->d.envelopedData->unprotectedAttrs) <= 0) { cms->d.envelopedData->unprotectedAttrs) <= 0) {
@ -1228,7 +1228,7 @@ int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain)
* If the selected cipher supports unprotected attributes, * If the selected cipher supports unprotected attributes,
* deal with it using special ctrl function * deal with it using special ctrl function
*/ */
if ((EVP_CIPHER_flags(EVP_CIPHER_CTX_get0_cipher(ctx)) if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
& EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) { & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) {
if (env->unprotectedAttrs == NULL) if (env->unprotectedAttrs == NULL)
env->unprotectedAttrs = sk_X509_ATTRIBUTE_new_null(); env->unprotectedAttrs = sk_X509_ATTRIBUTE_new_null();
@ -1261,10 +1261,10 @@ int ossl_cms_AuthEnvelopedData_final(CMS_ContentInfo *cms, BIO *cmsbio)
* The tag is set only for encryption. There is nothing to do for * The tag is set only for encryption. There is nothing to do for
* decryption. * decryption.
*/ */
if (!EVP_CIPHER_CTX_encrypting(ctx)) if (!EVP_CIPHER_CTX_is_encrypting(ctx))
return 1; return 1;
taglen = EVP_CIPHER_CTX_tag_length(ctx); taglen = EVP_CIPHER_CTX_get_tag_length(ctx);
if (taglen <= 0 if (taglen <= 0
|| (tag = OPENSSL_malloc(taglen)) == NULL || (tag = OPENSSL_malloc(taglen)) == NULL
|| EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen, || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen,

14
crypto/cms/cms_kari.c
View file

@ -218,7 +218,7 @@ static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
unsigned char *out = NULL; unsigned char *out = NULL;
int outlen; int outlen;
keklen = EVP_CIPHER_CTX_key_length(kari->ctx); keklen = EVP_CIPHER_CTX_get_key_length(kari->ctx);
if (keklen > EVP_MAX_KEY_LENGTH) if (keklen > EVP_MAX_KEY_LENGTH)
return 0; return 0;
/* Derive KEK */ /* Derive KEK */
@ -424,14 +424,14 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
/* If a suitable wrap algorithm is already set nothing to do */ /* If a suitable wrap algorithm is already set nothing to do */
kekcipher = EVP_CIPHER_CTX_get0_cipher(ctx); kekcipher = EVP_CIPHER_CTX_get0_cipher(ctx);
if (kekcipher != NULL) { if (kekcipher != NULL) {
if (EVP_CIPHER_CTX_mode(ctx) != EVP_CIPH_WRAP_MODE) if (EVP_CIPHER_CTX_get_mode(ctx) != EVP_CIPH_WRAP_MODE)
return 0; return 0;
return 1; return 1;
} }
if (cipher == NULL) if (cipher == NULL)
return 0; return 0;
keylen = EVP_CIPHER_key_length(cipher); keylen = EVP_CIPHER_get_key_length(cipher);
if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_GET_WRAP_CIPHER) != 0) { if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_GET_WRAP_CIPHER) != 0) {
/* TODO: make this not get a method we can call directly */ /* TODO: make this not get a method we can call directly */
ret = EVP_CIPHER_meth_get_ctrl(cipher)(NULL, EVP_CTRL_GET_WRAP_CIPHER, ret = EVP_CIPHER_meth_get_ctrl(cipher)(NULL, EVP_CTRL_GET_WRAP_CIPHER,
0, &kekcipher); 0, &kekcipher);
@ -439,9 +439,9 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
return 0; return 0;
if (kekcipher != NULL) { if (kekcipher != NULL) {
if (EVP_CIPHER_mode(kekcipher) != EVP_CIPH_WRAP_MODE) if (EVP_CIPHER_get_mode(kekcipher) != EVP_CIPH_WRAP_MODE)
return 0; return 0;
kekcipher_name = EVP_CIPHER_name(kekcipher); kekcipher_name = EVP_CIPHER_get0_name(kekcipher);
goto enc; goto enc;
} }
} }
@ -451,7 +451,7 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
* DES3 wrap otherwise use AES wrap similar to key size. * DES3 wrap otherwise use AES wrap similar to key size.
*/ */
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
if (EVP_CIPHER_type(cipher) == NID_des_ede3_cbc) if (EVP_CIPHER_get_type(cipher) == NID_des_ede3_cbc)
kekcipher_name = SN_id_smime_alg_CMS3DESwrap; kekcipher_name = SN_id_smime_alg_CMS3DESwrap;
else else
#endif #endif

4
crypto/cms/cms_lib.c
View file

@ -455,12 +455,12 @@ int ossl_cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
return 0; return 0;
} }
BIO_get_md_ctx(chain, &mtmp); BIO_get_md_ctx(chain, &mtmp);
if (EVP_MD_CTX_type(mtmp) == nid if (EVP_MD_CTX_get_type(mtmp) == nid
/* /*
* Workaround for broken implementations that use signature * Workaround for broken implementations that use signature
* algorithm OID instead of digest. * algorithm OID instead of digest.
*/ */
|| EVP_MD_pkey_type(EVP_MD_CTX_get0_md(mtmp)) == nid) || EVP_MD_get_pkey_type(EVP_MD_CTX_get0_md(mtmp)) == nid)
return EVP_MD_CTX_copy_ex(mctx, mtmp); return EVP_MD_CTX_copy_ex(mctx, mtmp);
chain = BIO_next(chain); chain = BIO_next(chain);
} }

8
crypto/cms/cms_pwri.c
View file

@ -91,7 +91,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
goto err; goto err;
} }
ivlen = EVP_CIPHER_CTX_iv_length(ctx); ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
if (ivlen > 0) { if (ivlen > 0) {
if (RAND_bytes_ex(ossl_cms_ctx_get0_libctx(cms_ctx), iv, ivlen, 0) <= 0) if (RAND_bytes_ex(ossl_cms_ctx_get0_libctx(cms_ctx), iv, ivlen, 0) <= 0)
@ -111,7 +111,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
} }
} }
encalg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_type(ctx)); encalg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_get_type(ctx));
EVP_CIPHER_CTX_free(ctx); EVP_CIPHER_CTX_free(ctx);
ctx = NULL; ctx = NULL;
@ -182,7 +182,7 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
const unsigned char *in, size_t inlen, const unsigned char *in, size_t inlen,
EVP_CIPHER_CTX *ctx) EVP_CIPHER_CTX *ctx)
{ {
size_t blocklen = EVP_CIPHER_CTX_block_size(ctx); size_t blocklen = EVP_CIPHER_CTX_get_block_size(ctx);
unsigned char *tmp; unsigned char *tmp;
int outl, rv = 0; int outl, rv = 0;
if (inlen < 2 * blocklen) { if (inlen < 2 * blocklen) {
@ -237,7 +237,7 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
const unsigned char *in, size_t inlen, const unsigned char *in, size_t inlen,
EVP_CIPHER_CTX *ctx, const CMS_CTX *cms_ctx) EVP_CIPHER_CTX *ctx, const CMS_CTX *cms_ctx)
{ {
size_t blocklen = EVP_CIPHER_CTX_block_size(ctx); size_t blocklen = EVP_CIPHER_CTX_get_block_size(ctx);
size_t olen; size_t olen;
int dummy; int dummy;
/* /*

9
crypto/cms/cms_sd.c
View file

@ -469,7 +469,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
goto err; goto err;
if (EVP_PKEY_CTX_set_signature_md(si->pctx, md) <= 0) if (EVP_PKEY_CTX_set_signature_md(si->pctx, md) <= 0)
goto err; goto err;
} else if (EVP_DigestSignInit_ex(si->mctx, &si->pctx, EVP_MD_name(md), } else if (EVP_DigestSignInit_ex(si->mctx, &si->pctx,
EVP_MD_get0_name(md),
ossl_cms_ctx_get0_libctx(ctx), ossl_cms_ctx_get0_libctx(ctx),
ossl_cms_ctx_get0_propq(ctx), ossl_cms_ctx_get0_propq(ctx),
pk, NULL) <= 0) { pk, NULL) <= 0) {
@ -718,7 +719,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
pctx = si->pctx; pctx = si->pctx;
if (!EVP_DigestFinal_ex(mctx, md, &mdlen)) if (!EVP_DigestFinal_ex(mctx, md, &mdlen))
goto err; goto err;
siglen = EVP_PKEY_size(si->pkey); siglen = EVP_PKEY_get_size(si->pkey);
sig = OPENSSL_malloc(siglen); sig = OPENSSL_malloc(siglen);
if (sig == NULL) { if (sig == NULL) {
ERR_raise(ERR_LIB_CMS, ERR_R_MALLOC_FAILURE); ERR_raise(ERR_LIB_CMS, ERR_R_MALLOC_FAILURE);
@ -733,7 +734,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
unsigned char *sig; unsigned char *sig;
unsigned int siglen; unsigned int siglen;
sig = OPENSSL_malloc(EVP_PKEY_size(si->pkey)); sig = OPENSSL_malloc(EVP_PKEY_get_size(si->pkey));
if (sig == NULL) { if (sig == NULL) {
ERR_raise(ERR_LIB_CMS, ERR_R_MALLOC_FAILURE); ERR_raise(ERR_LIB_CMS, ERR_R_MALLOC_FAILURE);
goto err; goto err;
@ -875,7 +876,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
goto err; goto err;
} }
mctx = si->mctx; mctx = si->mctx;
if (EVP_DigestVerifyInit_ex(mctx, &si->pctx, EVP_MD_name(md), libctx, if (EVP_DigestVerifyInit_ex(mctx, &si->pctx, EVP_MD_get0_name(md), libctx,
propq, si->pkey, NULL) <= 0) propq, si->pkey, NULL) <= 0)
goto err; goto err;

2
crypto/cms/cms_smime.c
View file

@ -630,7 +630,7 @@ CMS_ContentInfo *CMS_encrypt_ex(STACK_OF(X509) *certs, BIO *data,
X509 *recip; X509 *recip;
cms = (EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) cms = (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
? CMS_AuthEnvelopedData_create_ex(cipher, libctx, propq) ? CMS_AuthEnvelopedData_create_ex(cipher, libctx, propq)
: CMS_EnvelopedData_create_ex(cipher, libctx, propq); : CMS_EnvelopedData_create_ex(cipher, libctx, propq);
if (cms == NULL) if (cms == NULL)

4
crypto/core_namemap.c
View file

@ -409,14 +409,14 @@ static void get_legacy_cipher_names(const OBJ_NAME *on, void *arg)
{ {
const EVP_CIPHER *cipher = (void *)OBJ_NAME_get(on->name, on->type); const EVP_CIPHER *cipher = (void *)OBJ_NAME_get(on->name, on->type);
get_legacy_evp_names(NID_undef, EVP_CIPHER_type(cipher), NULL, arg); get_legacy_evp_names(NID_undef, EVP_CIPHER_get_type(cipher), NULL, arg);
} }
static void get_legacy_md_names(const OBJ_NAME *on, void *arg) static void get_legacy_md_names(const OBJ_NAME *on, void *arg)
{ {
const EVP_MD *md = (void *)OBJ_NAME_get(on->name, on->type); const EVP_MD *md = (void *)OBJ_NAME_get(on->name, on->type);
get_legacy_evp_names(0, EVP_MD_type(md), NULL, arg); get_legacy_evp_names(0, EVP_MD_get_type(md), NULL, arg);
} }
static void get_legacy_pkey_meth_names(const EVP_PKEY_ASN1_METHOD *ameth, static void get_legacy_pkey_meth_names(const EVP_PKEY_ASN1_METHOD *ameth,

10
crypto/crmf/crmf_lib.c
View file

@ -621,7 +621,7 @@ X509
} }
(void)ERR_pop_to_mark(); (void)ERR_pop_to_mark();
cikeysize = EVP_CIPHER_key_length(cipher); cikeysize = EVP_CIPHER_get_key_length(cipher);
/* first the symmetric key needs to be decrypted */ /* first the symmetric key needs to be decrypted */
pkctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq); pkctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq);
if (pkctx != NULL && EVP_PKEY_decrypt_init(pkctx)) { if (pkctx != NULL && EVP_PKEY_decrypt_init(pkctx)) {
@ -646,11 +646,11 @@ X509
} else { } else {
goto end; goto end;
} }
if ((iv = OPENSSL_malloc(EVP_CIPHER_iv_length(cipher))) == NULL) if ((iv = OPENSSL_malloc(EVP_CIPHER_get_iv_length(cipher))) == NULL)
goto end; goto end;
if (ASN1_TYPE_get_octetstring(ecert->symmAlg->parameter, iv, if (ASN1_TYPE_get_octetstring(ecert->symmAlg->parameter, iv,
EVP_CIPHER_iv_length(cipher)) EVP_CIPHER_get_iv_length(cipher))
!= EVP_CIPHER_iv_length(cipher)) { != EVP_CIPHER_get_iv_length(cipher)) {
ERR_raise(ERR_LIB_CRMF, CRMF_R_MALFORMED_IV); ERR_raise(ERR_LIB_CRMF, CRMF_R_MALFORMED_IV);
goto end; goto end;
} }
@ -660,7 +660,7 @@ X509
* keep the original pointer in outbuf so the memory can be freed later * keep the original pointer in outbuf so the memory can be freed later
*/ */
if ((p = outbuf = OPENSSL_malloc(ecert->encValue->length + if ((p = outbuf = OPENSSL_malloc(ecert->encValue->length +
EVP_CIPHER_block_size(cipher))) == NULL EVP_CIPHER_get_block_size(cipher))) == NULL
|| (evp_ctx = EVP_CIPHER_CTX_new()) == NULL) || (evp_ctx = EVP_CIPHER_CTX_new()) == NULL)
goto end; goto end;
EVP_CIPHER_CTX_set_padding(evp_ctx, 0); EVP_CIPHER_CTX_set_padding(evp_ctx, 0);

4
crypto/dh/dh_kdf.c
View file

@ -36,7 +36,7 @@ int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen,
EVP_KDF_CTX *kctx = NULL; EVP_KDF_CTX *kctx = NULL;
EVP_KDF *kdf = NULL; EVP_KDF *kdf = NULL;
OSSL_PARAM params[5], *p = params; OSSL_PARAM params[5], *p = params;
const char *mdname = EVP_MD_name(md); const char *mdname = EVP_MD_get0_name(md);
kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_X942KDF_ASN1, propq); kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_X942KDF_ASN1, propq);
kctx = EVP_KDF_CTX_new(kdf); kctx = EVP_KDF_CTX_new(kdf);
@ -67,7 +67,7 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
const unsigned char *ukm, size_t ukmlen, const EVP_MD *md) const unsigned char *ukm, size_t ukmlen, const EVP_MD *md)
{ {
char key_alg[OSSL_MAX_NAME_SIZE]; char key_alg[OSSL_MAX_NAME_SIZE];
const OSSL_PROVIDER *prov = EVP_MD_provider(md); const OSSL_PROVIDER *prov = EVP_MD_get0_provider(md);
OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov); OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov);
if (!OBJ_obj2txt(key_alg, sizeof(key_alg), key_oid, 0)) if (!OBJ_obj2txt(key_alg, sizeof(key_alg), key_oid, 0))

2
crypto/dh/dh_pmeth.c
View file

@ -296,7 +296,7 @@ static DH *ffc_params_generate(OSSL_LIB_CTX *libctx, DH_PKEY_CTX *dctx,
} }
if (dctx->md != NULL) if (dctx->md != NULL)
ossl_ffc_set_digest(&ret->params, EVP_MD_name(dctx->md), NULL); ossl_ffc_set_digest(&ret->params, EVP_MD_get0_name(dctx->md), NULL);
# ifndef FIPS_MODULE # ifndef FIPS_MODULE
if (dctx->paramgen_type == DH_PARAMGEN_TYPE_FIPS_186_2) if (dctx->paramgen_type == DH_PARAMGEN_TYPE_FIPS_186_2)

34
crypto/dsa/dsa_pmeth.c
View file

@ -83,7 +83,7 @@ static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
DSA_PKEY_CTX *dctx = ctx->data; DSA_PKEY_CTX *dctx = ctx->data;
DSA *dsa = ctx->pkey->pkey.dsa; DSA *dsa = ctx->pkey->pkey.dsa;
if (dctx->md != NULL && tbslen != (size_t)EVP_MD_size(dctx->md)) if (dctx->md != NULL && tbslen != (size_t)EVP_MD_get_size(dctx->md))
return 0; return 0;
ret = DSA_sign(0, tbs, tbslen, sig, &sltmp, dsa); ret = DSA_sign(0, tbs, tbslen, sig, &sltmp, dsa);
@ -102,7 +102,7 @@ static int pkey_dsa_verify(EVP_PKEY_CTX *ctx,
DSA_PKEY_CTX *dctx = ctx->data; DSA_PKEY_CTX *dctx = ctx->data;
DSA *dsa = ctx->pkey->pkey.dsa; DSA *dsa = ctx->pkey->pkey.dsa;
if (dctx->md != NULL && tbslen != (size_t)EVP_MD_size(dctx->md)) if (dctx->md != NULL && tbslen != (size_t)EVP_MD_get_size(dctx->md))
return 0; return 0;
ret = DSA_verify(0, tbs, tbslen, sig, siglen, dsa); ret = DSA_verify(0, tbs, tbslen, sig, siglen, dsa);
@ -128,9 +128,9 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 1; return 1;
case EVP_PKEY_CTRL_DSA_PARAMGEN_MD: case EVP_PKEY_CTRL_DSA_PARAMGEN_MD:
if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1 && if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha256) { EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256) {
ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE); ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE);
return 0; return 0;
} }
@ -138,17 +138,17 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 1; return 1;
case EVP_PKEY_CTRL_MD: case EVP_PKEY_CTRL_MD:
if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1 && if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
EVP_MD_type((const EVP_MD *)p2) != NID_dsa && EVP_MD_get_type((const EVP_MD *)p2) != NID_dsa &&
EVP_MD_type((const EVP_MD *)p2) != NID_dsaWithSHA && EVP_MD_get_type((const EVP_MD *)p2) != NID_dsaWithSHA &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_512) { EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512) {
ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE); ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE);
return 0; return 0;
} }
@ -217,7 +217,7 @@ static int pkey_dsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
return 0; return 0;
} }
if (dctx->md != NULL) if (dctx->md != NULL)
ossl_ffc_set_digest(&dsa->params, EVP_MD_name(dctx->md), NULL); ossl_ffc_set_digest(&dsa->params, EVP_MD_get0_name(dctx->md), NULL);
ret = ossl_ffc_params_FIPS186_4_generate(NULL, &dsa->params, ret = ossl_ffc_params_FIPS186_4_generate(NULL, &dsa->params,
FFC_PARAM_TYPE_DSA, dctx->nbits, FFC_PARAM_TYPE_DSA, dctx->nbits,

2
crypto/ec/ec_ameth.c
View file

@ -405,7 +405,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
{ {
switch (op) { switch (op) {
case ASN1_PKEY_CTRL_DEFAULT_MD_NID: case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
if (EVP_PKEY_id(pkey) == EVP_PKEY_SM2) { if (EVP_PKEY_get_id(pkey) == EVP_PKEY_SM2) {
/* For SM2, the only valid digest-alg is SM3 */ /* For SM2, the only valid digest-alg is SM3 */
*(int *)arg2 = NID_sm3; *(int *)arg2 = NID_sm3;
return 2; /* Make it mandatory */ return 2; /* Make it mandatory */

26
crypto/ec/ec_pmeth.c
View file

@ -126,7 +126,7 @@ static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
return 0; return 0;
} }
type = (dctx->md != NULL) ? EVP_MD_type(dctx->md) : NID_sha1; type = (dctx->md != NULL) ? EVP_MD_get_type(dctx->md) : NID_sha1;
ret = ECDSA_sign(type, tbs, tbslen, sig, &sltmp, ec); ret = ECDSA_sign(type, tbs, tbslen, sig, &sltmp, ec);
@ -145,7 +145,7 @@ static int pkey_ec_verify(EVP_PKEY_CTX *ctx,
EC_KEY *ec = ctx->pkey->pkey.ec; EC_KEY *ec = ctx->pkey->pkey.ec;
if (dctx->md) if (dctx->md)
type = EVP_MD_type(dctx->md); type = EVP_MD_get_type(dctx->md);
else else
type = NID_sha1; type = NID_sha1;
@ -335,17 +335,17 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return dctx->kdf_ukmlen; return dctx->kdf_ukmlen;
case EVP_PKEY_CTRL_MD: case EVP_PKEY_CTRL_MD:
if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1 && if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
EVP_MD_type((const EVP_MD *)p2) != NID_ecdsa_with_SHA1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_ecdsa_with_SHA1 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sha3_512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512 &&
EVP_MD_type((const EVP_MD *)p2) != NID_sm3) { EVP_MD_get_type((const EVP_MD *)p2) != NID_sm3) {
ERR_raise(ERR_LIB_EC, EC_R_INVALID_DIGEST_TYPE); ERR_raise(ERR_LIB_EC, EC_R_INVALID_DIGEST_TYPE);
return 0; return 0;
} }

2
crypto/ec/ecdh_kdf.c
View file

@ -30,7 +30,7 @@ int ossl_ecdh_kdf_X9_63(unsigned char *out, size_t outlen,
int ret = 0; int ret = 0;
EVP_KDF_CTX *kctx = NULL; EVP_KDF_CTX *kctx = NULL;
OSSL_PARAM params[4], *p = params; OSSL_PARAM params[4], *p = params;
const char *mdname = EVP_MD_name(md); const char *mdname = EVP_MD_get0_name(md);
EVP_KDF *kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_X963KDF, propq); EVP_KDF *kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_X963KDF, propq);
if ((kctx = EVP_KDF_CTX_new(kdf)) != NULL) { if ((kctx = EVP_KDF_CTX_new(kdf)) != NULL) {

20
crypto/ec/ecx_meth.c
View file

@ -265,7 +265,7 @@ static int ecx_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
ECX_KEY *ecx = NULL; ECX_KEY *ecx = NULL;
if (pkey->keymgmt != NULL) if (pkey->keymgmt != NULL)
libctx = ossl_provider_libctx(EVP_KEYMGMT_provider(pkey->keymgmt)); libctx = ossl_provider_libctx(EVP_KEYMGMT_get0_provider(pkey->keymgmt));
ecx = ossl_ecx_key_op(NULL, priv, len, pkey->ameth->pkey_id, ecx = ossl_ecx_key_op(NULL, priv, len, pkey->ameth->pkey_id,
KEY_OP_PRIVATE, libctx, NULL); KEY_OP_PRIVATE, libctx, NULL);
@ -283,7 +283,7 @@ static int ecx_set_pub_key(EVP_PKEY *pkey, const unsigned char *pub, size_t len)
ECX_KEY *ecx = NULL; ECX_KEY *ecx = NULL;
if (pkey->keymgmt != NULL) if (pkey->keymgmt != NULL)
libctx = ossl_provider_libctx(EVP_KEYMGMT_provider(pkey->keymgmt)); libctx = ossl_provider_libctx(EVP_KEYMGMT_get0_provider(pkey->keymgmt));
ecx = ossl_ecx_key_op(NULL, pub, len, pkey->ameth->pkey_id, ecx = ossl_ecx_key_op(NULL, pub, len, pkey->ameth->pkey_id,
KEY_OP_PUBLIC, libctx, NULL); KEY_OP_PUBLIC, libctx, NULL);
@ -806,7 +806,7 @@ static int pkey_ecd_digestsign25519(EVP_MD_CTX *ctx, unsigned char *sig,
size_t *siglen, const unsigned char *tbs, size_t *siglen, const unsigned char *tbs,
size_t tbslen) size_t tbslen)
{ {
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
if (sig == NULL) { if (sig == NULL) {
*siglen = ED25519_SIGSIZE; *siglen = ED25519_SIGSIZE;
@ -828,7 +828,7 @@ static int pkey_ecd_digestsign448(EVP_MD_CTX *ctx, unsigned char *sig,
size_t *siglen, const unsigned char *tbs, size_t *siglen, const unsigned char *tbs,
size_t tbslen) size_t tbslen)
{ {
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
if (sig == NULL) { if (sig == NULL) {
*siglen = ED448_SIGSIZE; *siglen = ED448_SIGSIZE;
@ -850,7 +850,7 @@ static int pkey_ecd_digestverify25519(EVP_MD_CTX *ctx, const unsigned char *sig,
size_t siglen, const unsigned char *tbs, size_t siglen, const unsigned char *tbs,
size_t tbslen) size_t tbslen)
{ {
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
if (siglen != ED25519_SIGSIZE) if (siglen != ED25519_SIGSIZE)
return 0; return 0;
@ -863,7 +863,7 @@ static int pkey_ecd_digestverify448(EVP_MD_CTX *ctx, const unsigned char *sig,
size_t siglen, const unsigned char *tbs, size_t siglen, const unsigned char *tbs,
size_t tbslen) size_t tbslen)
{ {
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
if (siglen != ED448_SIGSIZE) if (siglen != ED448_SIGSIZE)
return 0; return 0;
@ -1177,7 +1177,7 @@ static int s390x_pkey_ecd_digestsign25519(EVP_MD_CTX *ctx,
} ed25519; } ed25519;
unsigned long long buff[512]; unsigned long long buff[512];
} param; } param;
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
int rc; int rc;
if (sig == NULL) { if (sig == NULL) {
@ -1217,7 +1217,7 @@ static int s390x_pkey_ecd_digestsign448(EVP_MD_CTX *ctx,
} ed448; } ed448;
unsigned long long buff[512]; unsigned long long buff[512];
} param; } param;
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
int rc; int rc;
if (sig == NULL) { if (sig == NULL) {
@ -1260,7 +1260,7 @@ static int s390x_pkey_ecd_digestverify25519(EVP_MD_CTX *ctx,
} ed25519; } ed25519;
unsigned long long buff[512]; unsigned long long buff[512];
} param; } param;
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
if (siglen != ED25519_SIGSIZE) if (siglen != ED25519_SIGSIZE)
return 0; return 0;
@ -1287,7 +1287,7 @@ static int s390x_pkey_ecd_digestverify448(EVP_MD_CTX *ctx,
} ed448; } ed448;
unsigned long long buff[512]; unsigned long long buff[512];
} param; } param;
const ECX_KEY *edkey = EVP_MD_CTX_pkey_ctx(ctx)->pkey->pkey.ecx; const ECX_KEY *edkey = EVP_MD_CTX_get_pkey_ctx(ctx)->pkey->pkey.ecx;
if (siglen != ED448_SIGSIZE) if (siglen != ED448_SIGSIZE)
return 0; return 0;

2
crypto/encode_decode/decoder_lib.c
View file

@ -300,7 +300,7 @@ int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder)
return 0; return 0;
} }
prov = OSSL_DECODER_provider(decoder); prov = OSSL_DECODER_get0_provider(decoder);
provctx = OSSL_PROVIDER_get0_provider_ctx(prov); provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
if ((decoderctx = decoder->newctx(provctx)) == NULL if ((decoderctx = decoder->newctx(provctx)) == NULL

14
crypto/encode_decode/decoder_meth.c
View file

@ -401,7 +401,7 @@ OSSL_DECODER *ossl_decoder_fetch_by_number(OSSL_LIB_CTX *libctx, int id,
* Library of basic method functions * Library of basic method functions
*/ */
const OSSL_PROVIDER *OSSL_DECODER_provider(const OSSL_DECODER *decoder) const OSSL_PROVIDER *OSSL_DECODER_get0_provider(const OSSL_DECODER *decoder)
{ {
if (!ossl_assert(decoder != NULL)) { if (!ossl_assert(decoder != NULL)) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER); ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@ -411,7 +411,7 @@ const OSSL_PROVIDER *OSSL_DECODER_provider(const OSSL_DECODER *decoder)
return decoder->base.prov; return decoder->base.prov;
} }
const char *OSSL_DECODER_properties(const OSSL_DECODER *decoder) const char *OSSL_DECODER_get0_properties(const OSSL_DECODER *decoder)
{ {
if (!ossl_assert(decoder != NULL)) { if (!ossl_assert(decoder != NULL)) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER); ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@ -421,7 +421,7 @@ const char *OSSL_DECODER_properties(const OSSL_DECODER *decoder)
return decoder->base.propdef; return decoder->base.propdef;
} }
int OSSL_DECODER_number(const OSSL_DECODER *decoder) int OSSL_DECODER_get_number(const OSSL_DECODER *decoder)
{ {
if (!ossl_assert(decoder != NULL)) { if (!ossl_assert(decoder != NULL)) {
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER); ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@ -431,12 +431,12 @@ int OSSL_DECODER_number(const OSSL_DECODER *decoder)
return decoder->base.id; return decoder->base.id;
} }
const char *OSSL_DECODER_name(const OSSL_DECODER *decoder) const char *OSSL_DECODER_get0_name(const OSSL_DECODER *decoder)
{ {
return decoder->base.name; return decoder->base.name;
} }
const char *OSSL_DECODER_description(const OSSL_DECODER *decoder) const char *OSSL_DECODER_get0_description(const OSSL_DECODER *decoder)
{ {
return decoder->base.description; return decoder->base.description;
} }
@ -511,7 +511,7 @@ const OSSL_PARAM *
OSSL_DECODER_gettable_params(OSSL_DECODER *decoder) OSSL_DECODER_gettable_params(OSSL_DECODER *decoder)
{ {
if (decoder != NULL && decoder->gettable_params != NULL) { if (decoder != NULL && decoder->gettable_params != NULL) {
void *provctx = ossl_provider_ctx(OSSL_DECODER_provider(decoder)); void *provctx = ossl_provider_ctx(OSSL_DECODER_get0_provider(decoder));
return decoder->gettable_params(provctx); return decoder->gettable_params(provctx);
} }
@ -529,7 +529,7 @@ const OSSL_PARAM *
OSSL_DECODER_settable_ctx_params(OSSL_DECODER *decoder) OSSL_DECODER_settable_ctx_params(OSSL_DECODER *decoder)
{ {
if (decoder != NULL && decoder->settable_ctx_params != NULL) { if (decoder != NULL && decoder->settable_ctx_params != NULL) {
void *provctx = ossl_provider_ctx(OSSL_DECODER_provider(decoder)); void *provctx = ossl_provider_ctx(OSSL_DECODER_get0_provider(decoder));
return decoder->settable_ctx_params(provctx); return decoder->settable_ctx_params(provctx);
} }

6
crypto/encode_decode/decoder_pkey.c
View file

@ -108,8 +108,8 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
if (keymgmt != NULL) { if (keymgmt != NULL) {
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
void *keydata = NULL; void *keydata = NULL;
const OSSL_PROVIDER *keymgmt_prov = EVP_KEYMGMT_provider(keymgmt); const OSSL_PROVIDER *keymgmt_prov = EVP_KEYMGMT_get0_provider(keymgmt);
const OSSL_PROVIDER *decoder_prov = OSSL_DECODER_provider(decoder); const OSSL_PROVIDER *decoder_prov = OSSL_DECODER_get0_provider(decoder);
/* /*
* If the EVP_KEYMGMT and the OSSL_DECODER are from the * If the EVP_KEYMGMT and the OSSL_DECODER are from the
@ -226,7 +226,7 @@ static void collect_decoder(OSSL_DECODER *decoder, void *arg)
{ {
struct collect_decoder_data_st *data = arg; struct collect_decoder_data_st *data = arg;
size_t i, end_i; size_t i, end_i;
const OSSL_PROVIDER *prov = OSSL_DECODER_provider(decoder); const OSSL_PROVIDER *prov = OSSL_DECODER_get0_provider(decoder);
void *provctx = OSSL_PROVIDER_get0_provider_ctx(prov); void *provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
if (data->error_occurred) if (data->error_occurred)

2
crypto/encode_decode/encoder_lib.c
View file

@ -279,7 +279,7 @@ int OSSL_ENCODER_CTX_add_encoder(OSSL_ENCODER_CTX *ctx, OSSL_ENCODER *encoder)
return 0; return 0;
} }
prov = OSSL_ENCODER_provider(encoder); prov = OSSL_ENCODER_get0_provider(encoder);
provctx = OSSL_PROVIDER_get0_provider_ctx(prov); provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
if ((encoderctx = encoder->newctx(provctx)) == NULL if ((encoderctx = encoder->newctx(provctx)) == NULL

14
crypto/encode_decode/encoder_meth.c
View file

@ -413,7 +413,7 @@ OSSL_ENCODER *ossl_encoder_fetch_by_number(OSSL_LIB_CTX *libctx, int id,
* Library of basic method functions * Library of basic method functions
*/ */
const OSSL_PROVIDER *OSSL_ENCODER_provider(const OSSL_ENCODER *encoder) const OSSL_PROVIDER *OSSL_ENCODER_get0_provider(const OSSL_ENCODER *encoder)
{ {
if (!ossl_assert(encoder != NULL)) { if (!ossl_assert(encoder != NULL)) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER); ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@ -423,7 +423,7 @@ const OSSL_PROVIDER *OSSL_ENCODER_provider(const OSSL_ENCODER *encoder)
return encoder->base.prov; return encoder->base.prov;
} }
const char *OSSL_ENCODER_properties(const OSSL_ENCODER *encoder) const char *OSSL_ENCODER_get0_properties(const OSSL_ENCODER *encoder)
{ {
if (!ossl_assert(encoder != NULL)) { if (!ossl_assert(encoder != NULL)) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER); ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@ -433,7 +433,7 @@ const char *OSSL_ENCODER_properties(const OSSL_ENCODER *encoder)
return encoder->base.propdef; return encoder->base.propdef;
} }
int OSSL_ENCODER_number(const OSSL_ENCODER *encoder) int OSSL_ENCODER_get_number(const OSSL_ENCODER *encoder)
{ {
if (!ossl_assert(encoder != NULL)) { if (!ossl_assert(encoder != NULL)) {
ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER); ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@ -443,12 +443,12 @@ int OSSL_ENCODER_number(const OSSL_ENCODER *encoder)
return encoder->base.id; return encoder->base.id;
} }
const char *OSSL_ENCODER_name(const OSSL_ENCODER *encoder) const char *OSSL_ENCODER_get0_name(const OSSL_ENCODER *encoder)
{ {
return encoder->base.name; return encoder->base.name;
} }
const char *OSSL_ENCODER_description(const OSSL_ENCODER *encoder) const char *OSSL_ENCODER_get0_description(const OSSL_ENCODER *encoder)
{ {
return encoder->base.description; return encoder->base.description;
} }
@ -528,7 +528,7 @@ const OSSL_PARAM *
OSSL_ENCODER_gettable_params(OSSL_ENCODER *encoder) OSSL_ENCODER_gettable_params(OSSL_ENCODER *encoder)
{ {
if (encoder != NULL && encoder->gettable_params != NULL) { if (encoder != NULL && encoder->gettable_params != NULL) {
void *provctx = ossl_provider_ctx(OSSL_ENCODER_provider(encoder)); void *provctx = ossl_provider_ctx(OSSL_ENCODER_get0_provider(encoder));
return encoder->gettable_params(provctx); return encoder->gettable_params(provctx);
} }
@ -545,7 +545,7 @@ int OSSL_ENCODER_get_params(OSSL_ENCODER *encoder, OSSL_PARAM params[])
const OSSL_PARAM *OSSL_ENCODER_settable_ctx_params(OSSL_ENCODER *encoder) const OSSL_PARAM *OSSL_ENCODER_settable_ctx_params(OSSL_ENCODER *encoder)
{ {
if (encoder != NULL && encoder->settable_ctx_params != NULL) { if (encoder != NULL && encoder->settable_ctx_params != NULL) {
void *provctx = ossl_provider_ctx(OSSL_ENCODER_provider(encoder)); void *provctx = ossl_provider_ctx(OSSL_ENCODER_get0_provider(encoder));
return encoder->settable_ctx_params(provctx); return encoder->settable_ctx_params(provctx);
} }

10
crypto/encode_decode/encoder_pkey.c
View file

@ -98,7 +98,7 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
end_i = sk_OPENSSL_CSTRING_num(data->names); end_i = sk_OPENSSL_CSTRING_num(data->names);
for (i = 0; i < end_i; i++) { for (i = 0; i < end_i; i++) {
const char *name = sk_OPENSSL_CSTRING_value(data->names, i); const char *name = sk_OPENSSL_CSTRING_value(data->names, i);
const OSSL_PROVIDER *prov = OSSL_ENCODER_provider(encoder); const OSSL_PROVIDER *prov = OSSL_ENCODER_get0_provider(encoder);
void *provctx = OSSL_PROVIDER_get0_provider_ctx(prov); void *provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
if (!OSSL_ENCODER_is_a(encoder, name) if (!OSSL_ENCODER_is_a(encoder, name)
@ -173,8 +173,8 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
OSSL_ENCODER *encoder = OSSL_ENCODER *encoder =
OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst); OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
const EVP_PKEY *pk = data->pk; const EVP_PKEY *pk = data->pk;
const OSSL_PROVIDER *k_prov = EVP_KEYMGMT_provider(pk->keymgmt); const OSSL_PROVIDER *k_prov = EVP_KEYMGMT_get0_provider(pk->keymgmt);
const OSSL_PROVIDER *e_prov = OSSL_ENCODER_provider(encoder); const OSSL_PROVIDER *e_prov = OSSL_ENCODER_get0_provider(encoder);
if (k_prov != e_prov) { if (k_prov != e_prov) {
data->encoder_inst = encoder_inst; data->encoder_inst = encoder_inst;
@ -226,7 +226,7 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
} }
if (evp_pkey_is_provided(pkey)) { if (evp_pkey_is_provided(pkey)) {
prov = EVP_KEYMGMT_provider(pkey->keymgmt); prov = EVP_KEYMGMT_get0_provider(pkey->keymgmt);
libctx = ossl_provider_libctx(prov); libctx = ossl_provider_libctx(prov);
} }
@ -312,7 +312,7 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
} }
if (evp_pkey_is_provided(pkey)) { if (evp_pkey_is_provided(pkey)) {
const OSSL_PROVIDER *prov = EVP_KEYMGMT_provider(pkey->keymgmt); const OSSL_PROVIDER *prov = EVP_KEYMGMT_get0_provider(pkey->keymgmt);
libctx = ossl_provider_libctx(prov); libctx = ossl_provider_libctx(prov);
} }

18
crypto/engine/eng_openssl.c
View file

@ -205,7 +205,7 @@ typedef struct {
static int test_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int test_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
const int n = EVP_CIPHER_CTX_key_length(ctx); const int n = EVP_CIPHER_CTX_get_key_length(ctx);
# ifdef TEST_ENG_OPENSSL_RC4_P_INIT # ifdef TEST_ENG_OPENSSL_RC4_P_INIT
fprintf(stderr, "(TEST_ENG_OPENSSL_RC4) test_init_key() called\n"); fprintf(stderr, "(TEST_ENG_OPENSSL_RC4) test_init_key() called\n");
@ -285,9 +285,9 @@ static int test_cipher_nids(const int **nids)
if (!init) { if (!init) {
const EVP_CIPHER *cipher; const EVP_CIPHER *cipher;
if ((cipher = test_r4_cipher()) != NULL) if ((cipher = test_r4_cipher()) != NULL)
cipher_nids[pos++] = EVP_CIPHER_nid(cipher); cipher_nids[pos++] = EVP_CIPHER_get_nid(cipher);
if ((cipher = test_r4_40_cipher()) != NULL) if ((cipher = test_r4_40_cipher()) != NULL)
cipher_nids[pos++] = EVP_CIPHER_nid(cipher); cipher_nids[pos++] = EVP_CIPHER_get_nid(cipher);
cipher_nids[pos] = 0; cipher_nids[pos] = 0;
init = 1; init = 1;
} }
@ -328,7 +328,7 @@ static int test_sha1_init(EVP_MD_CTX *ctx)
# ifdef TEST_ENG_OPENSSL_SHA_P_INIT # ifdef TEST_ENG_OPENSSL_SHA_P_INIT
fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_init() called\n"); fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_init() called\n");
# endif # endif
return SHA1_Init(EVP_MD_CTX_md_data(ctx)); return SHA1_Init(EVP_MD_CTX_get0_md_data(ctx));
} }
static int test_sha1_update(EVP_MD_CTX *ctx, const void *data, size_t count) static int test_sha1_update(EVP_MD_CTX *ctx, const void *data, size_t count)
@ -336,7 +336,7 @@ static int test_sha1_update(EVP_MD_CTX *ctx, const void *data, size_t count)
# ifdef TEST_ENG_OPENSSL_SHA_P_UPDATE # ifdef TEST_ENG_OPENSSL_SHA_P_UPDATE
fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_update() called\n"); fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_update() called\n");
# endif # endif
return SHA1_Update(EVP_MD_CTX_md_data(ctx), data, count); return SHA1_Update(EVP_MD_CTX_get0_md_data(ctx), data, count);
} }
static int test_sha1_final(EVP_MD_CTX *ctx, unsigned char *md) static int test_sha1_final(EVP_MD_CTX *ctx, unsigned char *md)
@ -344,7 +344,7 @@ static int test_sha1_final(EVP_MD_CTX *ctx, unsigned char *md)
# ifdef TEST_ENG_OPENSSL_SHA_P_FINAL # ifdef TEST_ENG_OPENSSL_SHA_P_FINAL
fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_final() called\n"); fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_final() called\n");
# endif # endif
return SHA1_Final(md, EVP_MD_CTX_md_data(ctx)); return SHA1_Final(md, EVP_MD_CTX_get0_md_data(ctx));
} }
static EVP_MD *sha1_md = NULL; static EVP_MD *sha1_md = NULL;
@ -383,7 +383,7 @@ static int test_digest_nids(const int **nids)
if (!init) { if (!init) {
const EVP_MD *md; const EVP_MD *md;
if ((md = test_sha_md()) != NULL) if ((md = test_sha_md()) != NULL)
digest_nids[pos++] = EVP_MD_type(md); digest_nids[pos++] = EVP_MD_get_type(md);
digest_nids[pos] = 0; digest_nids[pos] = 0;
init = 1; init = 1;
} }
@ -522,7 +522,7 @@ static int ossl_hmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
static int ossl_int_update(EVP_MD_CTX *ctx, const void *data, size_t count) static int ossl_int_update(EVP_MD_CTX *ctx, const void *data, size_t count)
{ {
OSSL_HMAC_PKEY_CTX *hctx = EVP_PKEY_CTX_get_data(EVP_MD_CTX_pkey_ctx(ctx)); OSSL_HMAC_PKEY_CTX *hctx = EVP_PKEY_CTX_get_data(EVP_MD_CTX_get_pkey_ctx(ctx));
if (!HMAC_Update(hctx->ctx, data, count)) if (!HMAC_Update(hctx->ctx, data, count))
return 0; return 0;
return 1; return 1;
@ -540,7 +540,7 @@ static int ossl_hmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig,
{ {
unsigned int hlen; unsigned int hlen;
OSSL_HMAC_PKEY_CTX *hctx = EVP_PKEY_CTX_get_data(ctx); OSSL_HMAC_PKEY_CTX *hctx = EVP_PKEY_CTX_get_data(ctx);
int l = EVP_MD_CTX_size(mctx); int l = EVP_MD_CTX_get_size(mctx);
if (l < 0) if (l < 0)
return 0; return 0;

16
crypto/evp/asymcipher.c
View file

@ -79,8 +79,8 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
EVP_ASYM_CIPHER_fetch(ctx->libctx, supported_ciph, ctx->propquery); EVP_ASYM_CIPHER_fetch(ctx->libctx, supported_ciph, ctx->propquery);
if (cipher == NULL if (cipher == NULL
|| (EVP_KEYMGMT_provider(ctx->keymgmt) || (EVP_KEYMGMT_get0_provider(ctx->keymgmt)
!= EVP_ASYM_CIPHER_provider(cipher))) { != EVP_ASYM_CIPHER_get0_provider(cipher))) {
/* /*
* We don't need to free ctx->keymgmt here, as it's not necessarily * We don't need to free ctx->keymgmt here, as it's not necessarily
* tied to this operation. It will be freed by EVP_PKEY_CTX_free(). * tied to this operation. It will be freed by EVP_PKEY_CTX_free().
@ -415,7 +415,7 @@ int EVP_ASYM_CIPHER_up_ref(EVP_ASYM_CIPHER *cipher)
return 1; return 1;
} }
OSSL_PROVIDER *EVP_ASYM_CIPHER_provider(const EVP_ASYM_CIPHER *cipher) OSSL_PROVIDER *EVP_ASYM_CIPHER_get0_provider(const EVP_ASYM_CIPHER *cipher)
{ {
return cipher->prov; return cipher->prov;
} }
@ -434,17 +434,17 @@ int EVP_ASYM_CIPHER_is_a(const EVP_ASYM_CIPHER *cipher, const char *name)
return evp_is_a(cipher->prov, cipher->name_id, NULL, name); return evp_is_a(cipher->prov, cipher->name_id, NULL, name);
} }
int EVP_ASYM_CIPHER_number(const EVP_ASYM_CIPHER *cipher) int EVP_ASYM_CIPHER_get_number(const EVP_ASYM_CIPHER *cipher)
{ {
return cipher->name_id; return cipher->name_id;
} }
const char *EVP_ASYM_CIPHER_name(const EVP_ASYM_CIPHER *cipher) const char *EVP_ASYM_CIPHER_get0_name(const EVP_ASYM_CIPHER *cipher)
{ {
return cipher->type_name; return cipher->type_name;
} }
const char *EVP_ASYM_CIPHER_description(const EVP_ASYM_CIPHER *cipher) const char *EVP_ASYM_CIPHER_get0_description(const EVP_ASYM_CIPHER *cipher)
{ {
return cipher->description; return cipher->description;
} }
@ -478,7 +478,7 @@ const OSSL_PARAM *EVP_ASYM_CIPHER_gettable_ctx_params(const EVP_ASYM_CIPHER *cip
if (cip == NULL || cip->gettable_ctx_params == NULL) if (cip == NULL || cip->gettable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_ASYM_CIPHER_provider(cip)); provctx = ossl_provider_ctx(EVP_ASYM_CIPHER_get0_provider(cip));
return cip->gettable_ctx_params(NULL, provctx); return cip->gettable_ctx_params(NULL, provctx);
} }
@ -489,6 +489,6 @@ const OSSL_PARAM *EVP_ASYM_CIPHER_settable_ctx_params(const EVP_ASYM_CIPHER *cip
if (cip == NULL || cip->settable_ctx_params == NULL) if (cip == NULL || cip->settable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_ASYM_CIPHER_provider(cip)); provctx = ossl_provider_ctx(EVP_ASYM_CIPHER_get0_provider(cip));
return cip->settable_ctx_params(NULL, provctx); return cip->settable_ctx_params(NULL, provctx);
} }

4
crypto/evp/bio_enc.c
View file

@ -135,7 +135,7 @@ static int enc_read(BIO *b, char *out, int outl)
} }
} }
blocksize = EVP_CIPHER_CTX_block_size(ctx->cipher); blocksize = EVP_CIPHER_CTX_get_block_size(ctx->cipher);
if (blocksize == 1) if (blocksize == 1)
blocksize = 0; blocksize = 0;
@ -312,7 +312,7 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
ctx->ok = 1; ctx->ok = 1;
ctx->finished = 0; ctx->finished = 0;
if (!EVP_CipherInit_ex(ctx->cipher, NULL, NULL, NULL, NULL, if (!EVP_CipherInit_ex(ctx->cipher, NULL, NULL, NULL, NULL,
EVP_CIPHER_CTX_encrypting(ctx->cipher))) EVP_CIPHER_CTX_is_encrypting(ctx->cipher)))
return 0; return 0;
ret = BIO_ctrl(next, cmd, num, ptr); ret = BIO_ctrl(next, cmd, num, ptr);
break; break;

2
crypto/evp/bio_md.c
View file

@ -214,7 +214,7 @@ static int md_gets(BIO *bp, char *buf, int size)
ctx = BIO_get_data(bp); ctx = BIO_get_data(bp);
if (size < EVP_MD_CTX_size(ctx)) if (size < EVP_MD_CTX_get_size(ctx))
return 0; return 0;
if (EVP_DigestFinal_ex(ctx, (unsigned char *)buf, &ret) <= 0) if (EVP_DigestFinal_ex(ctx, (unsigned char *)buf, &ret) <= 0)

12
crypto/evp/bio_ok.c
View file

@ -443,8 +443,8 @@ static int sig_out(BIO *b)
ctx = BIO_get_data(b); ctx = BIO_get_data(b);
md = ctx->md; md = ctx->md;
digest = EVP_MD_CTX_get0_md(md); digest = EVP_MD_CTX_get0_md(md);
md_size = EVP_MD_size(digest); md_size = EVP_MD_get_size(digest);
md_data = EVP_MD_CTX_md_data(md); md_data = EVP_MD_CTX_get0_md_data(md);
if (ctx->buf_len + 2 * md_size > OK_BLOCK_SIZE) if (ctx->buf_len + 2 * md_size > OK_BLOCK_SIZE)
return 1; return 1;
@ -487,8 +487,8 @@ static int sig_in(BIO *b)
ctx = BIO_get_data(b); ctx = BIO_get_data(b);
md = ctx->md; md = ctx->md;
digest = EVP_MD_CTX_get0_md(md); digest = EVP_MD_CTX_get0_md(md);
md_size = EVP_MD_size(digest); md_size = EVP_MD_get_size(digest);
md_data = EVP_MD_CTX_md_data(md); md_data = EVP_MD_CTX_get0_md_data(md);
if ((int)(ctx->buf_len - ctx->buf_off) < 2 * md_size) if ((int)(ctx->buf_len - ctx->buf_off) < 2 * md_size)
return 1; return 1;
@ -533,7 +533,7 @@ static int block_out(BIO *b)
ctx = BIO_get_data(b); ctx = BIO_get_data(b);
md = ctx->md; md = ctx->md;
digest = EVP_MD_CTX_get0_md(md); digest = EVP_MD_CTX_get0_md(md);
md_size = EVP_MD_size(digest); md_size = EVP_MD_get_size(digest);
tl = ctx->buf_len - OK_BLOCK_BLOCK; tl = ctx->buf_len - OK_BLOCK_BLOCK;
ctx->buf[0] = (unsigned char)(tl >> 24); ctx->buf[0] = (unsigned char)(tl >> 24);
@ -563,7 +563,7 @@ static int block_in(BIO *b)
ctx = BIO_get_data(b); ctx = BIO_get_data(b);
md = ctx->md; md = ctx->md;
md_size = EVP_MD_size(EVP_MD_CTX_get0_md(md)); md_size = EVP_MD_get_size(EVP_MD_CTX_get0_md(md));
assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */ assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */
tl = ctx->buf[0]; tl = ctx->buf[0];

28
crypto/evp/ctrl_params_translate.c
View file

@ -710,12 +710,12 @@ cleanup_translation_ctx(enum state state,
*/ */
static const char *get_cipher_name(void *cipher) static const char *get_cipher_name(void *cipher)
{ {
return EVP_CIPHER_name(cipher); return EVP_CIPHER_get0_name(cipher);
} }
static const char *get_md_name(void *md) static const char *get_md_name(void *md)
{ {
return EVP_MD_name(md); return EVP_MD_get0_name(md);
} }
static const void *get_cipher_by_name(OSSL_LIB_CTX *libctx, const char *name) static const void *get_cipher_by_name(OSSL_LIB_CTX *libctx, const char *name)
@ -1456,7 +1456,7 @@ static int get_payload_group_name(enum state state,
EVP_PKEY *pkey = ctx->p2; EVP_PKEY *pkey = ctx->p2;
ctx->p2 = NULL; ctx->p2 = NULL;
switch (EVP_PKEY_base_id(pkey)) { switch (EVP_PKEY_get_base_id(pkey)) {
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
case EVP_PKEY_DH: case EVP_PKEY_DH:
{ {
@ -1512,7 +1512,7 @@ static int get_payload_private_key(enum state state,
if (ctx->params->data_type != OSSL_PARAM_UNSIGNED_INTEGER) if (ctx->params->data_type != OSSL_PARAM_UNSIGNED_INTEGER)
return 0; return 0;
switch (EVP_PKEY_base_id(pkey)) { switch (EVP_PKEY_get_base_id(pkey)) {
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
case EVP_PKEY_DH: case EVP_PKEY_DH:
{ {
@ -1548,7 +1548,7 @@ static int get_payload_public_key(enum state state,
int ret; int ret;
ctx->p2 = NULL; ctx->p2 = NULL;
switch (EVP_PKEY_base_id(pkey)) { switch (EVP_PKEY_get_base_id(pkey)) {
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
case EVP_PKEY_DH: case EVP_PKEY_DH:
switch (ctx->params->data_type) { switch (ctx->params->data_type) {
@ -1618,7 +1618,7 @@ static int get_dh_dsa_payload_p(enum state state,
const BIGNUM *bn = NULL; const BIGNUM *bn = NULL;
EVP_PKEY *pkey = ctx->p2; EVP_PKEY *pkey = ctx->p2;
switch (EVP_PKEY_base_id(pkey)) { switch (EVP_PKEY_get_base_id(pkey)) {
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
case EVP_PKEY_DH: case EVP_PKEY_DH:
bn = DH_get0_p(EVP_PKEY_get0_DH(pkey)); bn = DH_get0_p(EVP_PKEY_get0_DH(pkey));
@ -1642,7 +1642,7 @@ static int get_dh_dsa_payload_q(enum state state,
{ {
const BIGNUM *bn = NULL; const BIGNUM *bn = NULL;
switch (EVP_PKEY_base_id(ctx->p2)) { switch (EVP_PKEY_get_base_id(ctx->p2)) {
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
case EVP_PKEY_DH: case EVP_PKEY_DH:
bn = DH_get0_q(EVP_PKEY_get0_DH(ctx->p2)); bn = DH_get0_q(EVP_PKEY_get0_DH(ctx->p2));
@ -1664,7 +1664,7 @@ static int get_dh_dsa_payload_g(enum state state,
{ {
const BIGNUM *bn = NULL; const BIGNUM *bn = NULL;
switch (EVP_PKEY_base_id(ctx->p2)) { switch (EVP_PKEY_get_base_id(ctx->p2)) {
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
case EVP_PKEY_DH: case EVP_PKEY_DH:
bn = DH_get0_g(EVP_PKEY_get0_DH(ctx->p2)); bn = DH_get0_g(EVP_PKEY_get0_DH(ctx->p2));
@ -1720,7 +1720,7 @@ static int get_rsa_payload_n(enum state state,
{ {
const BIGNUM *bn = NULL; const BIGNUM *bn = NULL;
if (EVP_PKEY_base_id(ctx->p2) != EVP_PKEY_RSA) if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)
return 0; return 0;
bn = RSA_get0_n(EVP_PKEY_get0_RSA(ctx->p2)); bn = RSA_get0_n(EVP_PKEY_get0_RSA(ctx->p2));
@ -1733,7 +1733,7 @@ static int get_rsa_payload_e(enum state state,
{ {
const BIGNUM *bn = NULL; const BIGNUM *bn = NULL;
if (EVP_PKEY_base_id(ctx->p2) != EVP_PKEY_RSA) if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)
return 0; return 0;
bn = RSA_get0_e(EVP_PKEY_get0_RSA(ctx->p2)); bn = RSA_get0_e(EVP_PKEY_get0_RSA(ctx->p2));
@ -1746,7 +1746,7 @@ static int get_rsa_payload_d(enum state state,
{ {
const BIGNUM *bn = NULL; const BIGNUM *bn = NULL;
if (EVP_PKEY_base_id(ctx->p2) != EVP_PKEY_RSA) if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA)
return 0; return 0;
bn = RSA_get0_d(EVP_PKEY_get0_RSA(ctx->p2)); bn = RSA_get0_d(EVP_PKEY_get0_RSA(ctx->p2));
@ -1846,7 +1846,7 @@ static int get_rsa_payload_coefficient(enum state state,
const struct translation_st *translation, \ const struct translation_st *translation, \
struct translation_ctx_st *ctx) \ struct translation_ctx_st *ctx) \
{ \ { \
if (EVP_PKEY_base_id(ctx->p2) != EVP_PKEY_RSA) \ if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) \
return 0; \ return 0; \
return get_rsa_payload_factor(state, translation, ctx, n - 1); \ return get_rsa_payload_factor(state, translation, ctx, n - 1); \
} }
@ -1857,7 +1857,7 @@ static int get_rsa_payload_coefficient(enum state state,
const struct translation_st *translation, \ const struct translation_st *translation, \
struct translation_ctx_st *ctx) \ struct translation_ctx_st *ctx) \
{ \ { \
if (EVP_PKEY_base_id(ctx->p2) != EVP_PKEY_RSA) \ if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) \
return 0; \ return 0; \
return get_rsa_payload_exponent(state, translation, ctx, \ return get_rsa_payload_exponent(state, translation, ctx, \
n - 1); \ n - 1); \
@ -1869,7 +1869,7 @@ static int get_rsa_payload_coefficient(enum state state,
const struct translation_st *translation, \ const struct translation_st *translation, \
struct translation_ctx_st *ctx) \ struct translation_ctx_st *ctx) \
{ \ { \
if (EVP_PKEY_base_id(ctx->p2) != EVP_PKEY_RSA) \ if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA) \
return 0; \ return 0; \
return get_rsa_payload_coefficient(state, translation, ctx, \ return get_rsa_payload_coefficient(state, translation, ctx, \
n - 1); \ n - 1); \

12
crypto/evp/digest.c
View file

@ -411,7 +411,7 @@ int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *isize)
if (ctx->digest == NULL) if (ctx->digest == NULL)
return 0; return 0;
sz = EVP_MD_size(ctx->digest); sz = EVP_MD_get_size(ctx->digest);
if (sz < 0) if (sz < 0)
return 0; return 0;
mdsize = sz; mdsize = sz;
@ -654,7 +654,7 @@ const OSSL_PARAM *EVP_MD_gettable_params(const EVP_MD *digest)
{ {
if (digest != NULL && digest->gettable_params != NULL) if (digest != NULL && digest->gettable_params != NULL)
return digest->gettable_params( return digest->gettable_params(
ossl_provider_ctx(EVP_MD_provider(digest))); ossl_provider_ctx(EVP_MD_get0_provider(digest)));
return NULL; return NULL;
} }
@ -682,7 +682,7 @@ const OSSL_PARAM *EVP_MD_settable_ctx_params(const EVP_MD *md)
void *provctx; void *provctx;
if (md != NULL && md->settable_ctx_params != NULL) { if (md != NULL && md->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_MD_provider(md)); provctx = ossl_provider_ctx(EVP_MD_get0_provider(md));
return md->settable_ctx_params(NULL, provctx); return md->settable_ctx_params(NULL, provctx);
} }
return NULL; return NULL;
@ -707,7 +707,7 @@ const OSSL_PARAM *EVP_MD_CTX_settable_params(EVP_MD_CTX *ctx)
pctx->op.sig.algctx); pctx->op.sig.algctx);
if (ctx->digest != NULL && ctx->digest->settable_ctx_params != NULL) { if (ctx->digest != NULL && ctx->digest->settable_ctx_params != NULL) {
alg = ossl_provider_ctx(EVP_MD_provider(ctx->digest)); alg = ossl_provider_ctx(EVP_MD_get0_provider(ctx->digest));
return ctx->digest->settable_ctx_params(ctx->algctx, alg); return ctx->digest->settable_ctx_params(ctx->algctx, alg);
} }
@ -738,7 +738,7 @@ const OSSL_PARAM *EVP_MD_gettable_ctx_params(const EVP_MD *md)
void *provctx; void *provctx;
if (md != NULL && md->gettable_ctx_params != NULL) { if (md != NULL && md->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_MD_provider(md)); provctx = ossl_provider_ctx(EVP_MD_get0_provider(md));
return md->gettable_ctx_params(NULL, provctx); return md->gettable_ctx_params(NULL, provctx);
} }
return NULL; return NULL;
@ -763,7 +763,7 @@ const OSSL_PARAM *EVP_MD_CTX_gettable_params(EVP_MD_CTX *ctx)
pctx->op.sig.algctx); pctx->op.sig.algctx);
if (ctx->digest != NULL && ctx->digest->gettable_ctx_params != NULL) { if (ctx->digest != NULL && ctx->digest->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_MD_provider(ctx->digest)); provctx = ossl_provider_ctx(EVP_MD_get0_provider(ctx->digest));
return ctx->digest->gettable_ctx_params(ctx->algctx, provctx); return ctx->digest->gettable_ctx_params(ctx->algctx, provctx);
} }
return NULL; return NULL;

214
crypto/evp/e_aes.c
View file

@ -147,16 +147,18 @@ static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
int ret, mode; int ret, mode;
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
mode = EVP_CIPHER_CTX_mode(ctx); mode = EVP_CIPHER_CTX_get_mode(ctx);
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
&& !enc) { && !enc) {
ret = aesni_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = aesni_set_decrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) aesni_decrypt; dat->block = (block128_f) aesni_decrypt;
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
(cbc128_f) aesni_cbc_encrypt : NULL; (cbc128_f) aesni_cbc_encrypt : NULL;
} else { } else {
ret = aesni_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = aesni_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) aesni_encrypt; dat->block = (block128_f) aesni_encrypt;
if (mode == EVP_CIPH_CBC_MODE) if (mode == EVP_CIPH_CBC_MODE)
@ -179,7 +181,7 @@ static int aesni_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
aesni_cbc_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks, aesni_cbc_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks,
ctx->iv, EVP_CIPHER_CTX_encrypting(ctx)); ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -187,13 +189,13 @@ static int aesni_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int aesni_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int aesni_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
size_t bl = EVP_CIPHER_CTX_block_size(ctx); size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
if (len < bl) if (len < bl)
return 1; return 1;
aesni_ecb_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks, aesni_ecb_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -225,7 +227,7 @@ static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (!iv && !key) if (!iv && !key)
return 1; return 1;
if (key) { if (key) {
aesni_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, aesni_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&gctx->ks.ks); &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f) aesni_encrypt); CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f) aesni_encrypt);
gctx->ctr = (ctr128_f) aesni_ctr32_encrypt_blocks; gctx->ctr = (ctr128_f) aesni_ctr32_encrypt_blocks;
@ -265,7 +267,7 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (key) { if (key) {
/* The key is two half length keys in reality */ /* The key is two half length keys in reality */
const int bytes = EVP_CIPHER_CTX_key_length(ctx) / 2; const int bytes = EVP_CIPHER_CTX_get_key_length(ctx) / 2;
const int bits = bytes * 8; const int bits = bytes * 8;
/* /*
@ -316,7 +318,7 @@ static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (!iv && !key) if (!iv && !key)
return 1; return 1;
if (key) { if (key) {
aesni_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, aesni_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&cctx->ks.ks); &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
&cctx->ks, (block128_f) aesni_encrypt); &cctx->ks, (block128_f) aesni_encrypt);
@ -349,9 +351,9 @@ static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
* needs both. We could possibly optimise to remove setting the * needs both. We could possibly optimise to remove setting the
* decrypt for an encryption operation. * decrypt for an encryption operation.
*/ */
aesni_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, aesni_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksenc.ks); &octx->ksenc.ks);
aesni_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, aesni_set_decrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksdec.ks); &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb, if (!CRYPTO_ocb128_init(&octx->ocb,
&octx->ksenc.ks, &octx->ksdec.ks, &octx->ksenc.ks, &octx->ksdec.ks,
@ -448,8 +450,8 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
int ret, mode, bits; int ret, mode, bits;
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
mode = EVP_CIPHER_CTX_mode(ctx); mode = EVP_CIPHER_CTX_get_mode(ctx);
bits = EVP_CIPHER_CTX_key_length(ctx) * 8; bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
&& !enc) { && !enc) {
ret = 0; ret = 0;
@ -548,7 +550,7 @@ static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (!iv && !key) if (!iv && !key)
return 1; return 1;
if (key) { if (key) {
int bits = EVP_CIPHER_CTX_key_length(ctx) * 8; int bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
aes_t4_set_encrypt_key(key, bits, &gctx->ks.ks); aes_t4_set_encrypt_key(key, bits, &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
(block128_f) aes_t4_encrypt); (block128_f) aes_t4_encrypt);
@ -601,7 +603,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (key) { if (key) {
/* The key is two half length keys in reality */ /* The key is two half length keys in reality */
const int bytes = EVP_CIPHER_CTX_key_length(ctx) / 2; const int bytes = EVP_CIPHER_CTX_get_key_length(ctx) / 2;
const int bits = bytes * 8; const int bits = bytes * 8;
/* /*
@ -671,7 +673,7 @@ static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (!iv && !key) if (!iv && !key)
return 1; return 1;
if (key) { if (key) {
int bits = EVP_CIPHER_CTX_key_length(ctx) * 8; int bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
aes_t4_set_encrypt_key(key, bits, &cctx->ks.ks); aes_t4_set_encrypt_key(key, bits, &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
&cctx->ks, (block128_f) aes_t4_encrypt); &cctx->ks, (block128_f) aes_t4_encrypt);
@ -703,9 +705,9 @@ static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
* needs both. We could possibly optimise to remove setting the * needs both. We could possibly optimise to remove setting the
* decrypt for an encryption operation. * decrypt for an encryption operation.
*/ */
aes_t4_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, aes_t4_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksenc.ks); &octx->ksenc.ks);
aes_t4_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, aes_t4_set_decrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksdec.ks); &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb, if (!CRYPTO_ocb128_init(&octx->ocb,
&octx->ksenc.ks, &octx->ksdec.ks, &octx->ksenc.ks, &octx->ksdec.ks,
@ -969,7 +971,7 @@ static int s390x_aes_ecb_init_key(EVP_CIPHER_CTX *ctx,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx); S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx);
const int keylen = EVP_CIPHER_CTX_key_length(ctx); const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
cctx->fc = S390X_AES_FC(keylen); cctx->fc = S390X_AES_FC(keylen);
if (!enc) if (!enc)
@ -994,8 +996,8 @@ static int s390x_aes_ofb_init_key(EVP_CIPHER_CTX *ctx,
{ {
S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx); S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
const unsigned char *iv = ctx->oiv; const unsigned char *iv = ctx->oiv;
const int keylen = EVP_CIPHER_CTX_key_length(ctx); const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
const int ivlen = EVP_CIPHER_CTX_iv_length(ctx); const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
memcpy(cctx->kmo.param.cv, iv, ivlen); memcpy(cctx->kmo.param.cv, iv, ivlen);
memcpy(cctx->kmo.param.k, key, keylen); memcpy(cctx->kmo.param.k, key, keylen);
@ -1049,8 +1051,8 @@ static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
{ {
S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx); S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
const unsigned char *iv = ctx->oiv; const unsigned char *iv = ctx->oiv;
const int keylen = EVP_CIPHER_CTX_key_length(ctx); const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
const int ivlen = EVP_CIPHER_CTX_iv_length(ctx); const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
cctx->fc = S390X_AES_FC(keylen); cctx->fc = S390X_AES_FC(keylen);
cctx->fc |= 16 << 24; /* 16 bytes cipher feedback */ cctx->fc |= 16 << 24; /* 16 bytes cipher feedback */
@ -1067,8 +1069,8 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx); S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
const int keylen = EVP_CIPHER_CTX_key_length(ctx); const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
const int enc = EVP_CIPHER_CTX_encrypting(ctx); const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
int n = cctx->res; int n = cctx->res;
int rem; int rem;
unsigned char tmp; unsigned char tmp;
@ -1115,8 +1117,8 @@ static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
{ {
S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx); S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
const unsigned char *iv = ctx->oiv; const unsigned char *iv = ctx->oiv;
const int keylen = EVP_CIPHER_CTX_key_length(ctx); const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
const int ivlen = EVP_CIPHER_CTX_iv_length(ctx); const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
cctx->fc = S390X_AES_FC(keylen); cctx->fc = S390X_AES_FC(keylen);
cctx->fc |= 1 << 24; /* 1 byte cipher feedback */ cctx->fc |= 1 << 24; /* 1 byte cipher feedback */
@ -1345,7 +1347,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
switch (type) { switch (type) {
case EVP_CTRL_INIT: case EVP_CTRL_INIT:
ivlen = EVP_CIPHER_iv_length(c->cipher); ivlen = EVP_CIPHER_get_iv_length(c->cipher);
gctx->key_set = 0; gctx->key_set = 0;
gctx->iv_set = 0; gctx->iv_set = 0;
gctx->ivlen = ivlen; gctx->ivlen = ivlen;
@ -1385,7 +1387,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_AEAD_SET_TAG: case EVP_CTRL_AEAD_SET_TAG:
buf = EVP_CIPHER_CTX_buf_noconst(c); buf = EVP_CIPHER_CTX_buf_noconst(c);
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (arg <= 0 || arg > 16 || enc) if (arg <= 0 || arg > 16 || enc)
return 0; return 0;
@ -1394,7 +1396,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 1; return 1;
case EVP_CTRL_AEAD_GET_TAG: case EVP_CTRL_AEAD_GET_TAG:
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (arg <= 0 || arg > 16 || !enc || gctx->taglen < 0) if (arg <= 0 || arg > 16 || !enc || gctx->taglen < 0)
return 0; return 0;
@ -1418,7 +1420,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
if (arg) if (arg)
memcpy(gctx->iv, ptr, arg); memcpy(gctx->iv, ptr, arg);
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (enc && RAND_bytes(gctx->iv + arg, gctx->ivlen - arg) <= 0) if (enc && RAND_bytes(gctx->iv + arg, gctx->ivlen - arg) <= 0)
return 0; return 0;
@ -1444,7 +1446,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 1; return 1;
case EVP_CTRL_GCM_SET_IV_INV: case EVP_CTRL_GCM_SET_IV_INV:
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (gctx->iv_gen == 0 || gctx->key_set == 0 || enc) if (gctx->iv_gen == 0 || gctx->key_set == 0 || enc)
return 0; return 0;
@ -1470,7 +1472,7 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
len -= EVP_GCM_TLS_EXPLICIT_IV_LEN; len -= EVP_GCM_TLS_EXPLICIT_IV_LEN;
/* If decrypting correct for tag too. */ /* If decrypting correct for tag too. */
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (!enc) { if (!enc) {
if (len < EVP_GCM_TLS_TAG_LEN) if (len < EVP_GCM_TLS_TAG_LEN)
return 0; return 0;
@ -1518,7 +1520,7 @@ static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx,
return 1; return 1;
if (key != NULL) { if (key != NULL) {
keylen = EVP_CIPHER_CTX_key_length(ctx); keylen = EVP_CIPHER_CTX_get_key_length(ctx);
memcpy(&gctx->kma.param.k, key, keylen); memcpy(&gctx->kma.param.k, key, keylen);
gctx->fc = S390X_AES_FC(keylen); gctx->fc = S390X_AES_FC(keylen);
@ -1554,7 +1556,7 @@ static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx); S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
const unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx); const unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
const int enc = EVP_CIPHER_CTX_encrypting(ctx); const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
int rv = -1; int rv = -1;
if (out != in || len < (EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN)) if (out != in || len < (EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN))
@ -1643,7 +1645,7 @@ static int s390x_aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
OPENSSL_cleanse(tmp, gctx->mreslen); OPENSSL_cleanse(tmp, gctx->mreslen);
gctx->iv_set = 0; gctx->iv_set = 0;
enc = EVP_CIPHER_CTX_encrypting(ctx); enc = EVP_CIPHER_CTX_is_encrypting(ctx);
if (enc) { if (enc) {
gctx->taglen = 16; gctx->taglen = 16;
} else { } else {
@ -1866,7 +1868,7 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx); S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
unsigned char *ivec = ctx->iv; unsigned char *ivec = ctx->iv;
unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx); unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
const int enc = EVP_CIPHER_CTX_encrypting(ctx); const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
if (out != in if (out != in
|| len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m)) || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m))
@ -1924,7 +1926,7 @@ static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
return 1; return 1;
if (key != NULL) { if (key != NULL) {
keylen = EVP_CIPHER_CTX_key_length(ctx); keylen = EVP_CIPHER_CTX_get_key_length(ctx);
cctx->aes.ccm.fc = S390X_AES_FC(keylen); cctx->aes.ccm.fc = S390X_AES_FC(keylen);
memcpy(cctx->aes.ccm.kmac_param.k, key, keylen); memcpy(cctx->aes.ccm.kmac_param.k, key, keylen);
@ -1957,7 +1959,7 @@ static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx); S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
const int enc = EVP_CIPHER_CTX_encrypting(ctx); const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
int rv; int rv;
unsigned char *buf; unsigned char *buf;
@ -2079,7 +2081,7 @@ static int s390x_aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
/* Correct length for explicit iv. */ /* Correct length for explicit iv. */
len -= EVP_CCM_TLS_EXPLICIT_IV_LEN; len -= EVP_CCM_TLS_EXPLICIT_IV_LEN;
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (!enc) { if (!enc) {
if (len < cctx->aes.ccm.m) if (len < cctx->aes.ccm.m)
return 0; return 0;
@ -2117,7 +2119,7 @@ static int s390x_aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
if ((arg & 1) || arg < 4 || arg > 16) if ((arg & 1) || arg < 4 || arg > 16)
return 0; return 0;
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (enc && ptr) if (enc && ptr)
return 0; return 0;
@ -2131,7 +2133,7 @@ static int s390x_aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 1; return 1;
case EVP_CTRL_AEAD_GET_TAG: case EVP_CTRL_AEAD_GET_TAG:
enc = EVP_CIPHER_CTX_encrypting(c); enc = EVP_CIPHER_CTX_is_encrypting(c);
if (!enc || !cctx->aes.ccm.tag_set) if (!enc || !cctx->aes.ccm.tag_set)
return 0; return 0;
@ -2302,13 +2304,13 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
int ret, mode; int ret, mode;
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
mode = EVP_CIPHER_CTX_mode(ctx); mode = EVP_CIPHER_CTX_get_mode(ctx);
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
&& !enc) { && !enc) {
#ifdef HWAES_CAPABLE #ifdef HWAES_CAPABLE
if (HWAES_CAPABLE) { if (HWAES_CAPABLE) {
ret = HWAES_set_decrypt_key(key, ret = HWAES_set_decrypt_key(key,
EVP_CIPHER_CTX_key_length(ctx) * 8, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) HWAES_decrypt; dat->block = (block128_f) HWAES_decrypt;
dat->stream.cbc = NULL; dat->stream.cbc = NULL;
@ -2320,7 +2322,8 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#endif #endif
#ifdef BSAES_CAPABLE #ifdef BSAES_CAPABLE
if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) { if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) {
ret = AES_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = AES_set_decrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) AES_decrypt; dat->block = (block128_f) AES_decrypt;
dat->stream.cbc = (cbc128_f) ossl_bsaes_cbc_encrypt; dat->stream.cbc = (cbc128_f) ossl_bsaes_cbc_encrypt;
@ -2329,7 +2332,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#ifdef VPAES_CAPABLE #ifdef VPAES_CAPABLE
if (VPAES_CAPABLE) { if (VPAES_CAPABLE) {
ret = vpaes_set_decrypt_key(key, ret = vpaes_set_decrypt_key(key,
EVP_CIPHER_CTX_key_length(ctx) * 8, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) vpaes_decrypt; dat->block = (block128_f) vpaes_decrypt;
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
@ -2338,7 +2341,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#endif #endif
{ {
ret = AES_set_decrypt_key(key, ret = AES_set_decrypt_key(key,
EVP_CIPHER_CTX_key_length(ctx) * 8, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) AES_decrypt; dat->block = (block128_f) AES_decrypt;
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
@ -2347,7 +2350,8 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
} else } else
#ifdef HWAES_CAPABLE #ifdef HWAES_CAPABLE
if (HWAES_CAPABLE) { if (HWAES_CAPABLE) {
ret = HWAES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = HWAES_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) HWAES_encrypt; dat->block = (block128_f) HWAES_encrypt;
dat->stream.cbc = NULL; dat->stream.cbc = NULL;
@ -2366,7 +2370,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#endif #endif
#ifdef BSAES_CAPABLE #ifdef BSAES_CAPABLE
if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) { if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) {
ret = AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = AES_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) AES_encrypt; dat->block = (block128_f) AES_encrypt;
dat->stream.ctr = (ctr128_f) ossl_bsaes_ctr32_encrypt_blocks; dat->stream.ctr = (ctr128_f) ossl_bsaes_ctr32_encrypt_blocks;
@ -2374,7 +2378,8 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#endif #endif
#ifdef VPAES_CAPABLE #ifdef VPAES_CAPABLE
if (VPAES_CAPABLE) { if (VPAES_CAPABLE) {
ret = vpaes_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = vpaes_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) vpaes_encrypt; dat->block = (block128_f) vpaes_encrypt;
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
@ -2382,7 +2387,7 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
} else } else
#endif #endif
{ {
ret = AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = AES_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks.ks); &dat->ks.ks);
dat->block = (block128_f) AES_encrypt; dat->block = (block128_f) AES_encrypt;
dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
@ -2408,8 +2413,8 @@ static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (dat->stream.cbc) if (dat->stream.cbc)
(*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv, (*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
else if (EVP_CIPHER_CTX_encrypting(ctx)) else if (EVP_CIPHER_CTX_is_encrypting(ctx))
CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv, CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv,
dat->block); dat->block);
else else
@ -2422,7 +2427,7 @@ static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
size_t bl = EVP_CIPHER_CTX_block_size(ctx); size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
size_t i; size_t i;
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
@ -2440,7 +2445,7 @@ static int aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_ofb128_encrypt(in, out, len, &dat->ks, CRYPTO_ofb128_encrypt(in, out, len, &dat->ks,
ctx->iv, &num, dat->block); ctx->iv, &num, dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
@ -2452,10 +2457,10 @@ static int aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_encrypt(in, out, len, &dat->ks, CRYPTO_cfb128_encrypt(in, out, len, &dat->ks,
ctx->iv, &num, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
} }
@ -2465,10 +2470,10 @@ static int aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks, CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks,
ctx->iv, &num, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
} }
@ -2479,29 +2484,29 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) { if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks, CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks,
ctx->iv, &num, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
} }
while (len >= MAXBITCHUNK) { while (len >= MAXBITCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks, CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,
ctx->iv, &num, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
len -= MAXBITCHUNK; len -= MAXBITCHUNK;
out += MAXBITCHUNK; out += MAXBITCHUNK;
in += MAXBITCHUNK; in += MAXBITCHUNK;
} }
if (len) { if (len) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks, CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,
ctx->iv, &num, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
} }
@ -2511,7 +2516,7 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
unsigned int num = EVP_CIPHER_CTX_num(ctx); unsigned int num = EVP_CIPHER_CTX_get_num(ctx);
EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx); EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
if (dat->stream.ctr) if (dat->stream.ctr)
@ -2550,7 +2555,7 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_INIT: case EVP_CTRL_INIT:
gctx->key_set = 0; gctx->key_set = 0;
gctx->iv_set = 0; gctx->iv_set = 0;
gctx->ivlen = EVP_CIPHER_iv_length(c->cipher); gctx->ivlen = EVP_CIPHER_get_iv_length(c->cipher);
gctx->iv = c->iv; gctx->iv = c->iv;
gctx->taglen = -1; gctx->taglen = -1;
gctx->iv_gen = 0; gctx->iv_gen = 0;
@ -3112,7 +3117,7 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (key) { if (key) {
do { do {
/* The key is two half length keys in reality */ /* The key is two half length keys in reality */
const int bytes = EVP_CIPHER_CTX_key_length(ctx) / 2; const int bytes = EVP_CIPHER_CTX_get_key_length(ctx) / 2;
const int bits = bytes * 8; const int bits = bytes * 8;
/* /*
@ -3241,7 +3246,7 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
xctx->xts.key1, xctx->xts.key2, xctx->xts.key1, xctx->xts.key2,
ctx->iv); ctx->iv);
else if (CRYPTO_xts128_encrypt(&xctx->xts, ctx->iv, in, out, len, else if (CRYPTO_xts128_encrypt(&xctx->xts, ctx->iv, in, out, len,
EVP_CIPHER_CTX_encrypting(ctx))) EVP_CIPHER_CTX_is_encrypting(ctx)))
return 0; return 0;
return 1; return 1;
} }
@ -3288,7 +3293,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 0; return 0;
len -= EVP_CCM_TLS_EXPLICIT_IV_LEN; len -= EVP_CCM_TLS_EXPLICIT_IV_LEN;
/* If decrypting correct for tag too */ /* If decrypting correct for tag too */
if (!EVP_CIPHER_CTX_encrypting(c)) { if (!EVP_CIPHER_CTX_is_encrypting(c)) {
if (len < cctx->M) if (len < cctx->M)
return 0; return 0;
len -= cctx->M; len -= cctx->M;
@ -3319,7 +3324,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_AEAD_SET_TAG: case EVP_CTRL_AEAD_SET_TAG:
if ((arg & 1) || arg < 4 || arg > 16) if ((arg & 1) || arg < 4 || arg > 16)
return 0; return 0;
if (EVP_CIPHER_CTX_encrypting(c) && ptr) if (EVP_CIPHER_CTX_is_encrypting(c) && ptr)
return 0; return 0;
if (ptr) { if (ptr) {
cctx->tag_set = 1; cctx->tag_set = 1;
@ -3329,7 +3334,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 1; return 1;
case EVP_CTRL_AEAD_GET_TAG: case EVP_CTRL_AEAD_GET_TAG:
if (!EVP_CIPHER_CTX_encrypting(c) || !cctx->tag_set) if (!EVP_CIPHER_CTX_is_encrypting(c) || !cctx->tag_set)
return 0; return 0;
if (!CRYPTO_ccm128_tag(&cctx->ccm, ptr, (size_t)arg)) if (!CRYPTO_ccm128_tag(&cctx->ccm, ptr, (size_t)arg))
return 0; return 0;
@ -3366,7 +3371,8 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
do { do {
#ifdef HWAES_CAPABLE #ifdef HWAES_CAPABLE
if (HWAES_CAPABLE) { if (HWAES_CAPABLE) {
HWAES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, HWAES_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&cctx->ks.ks); &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
@ -3378,7 +3384,8 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
#endif #endif
#ifdef VPAES_CAPABLE #ifdef VPAES_CAPABLE
if (VPAES_CAPABLE) { if (VPAES_CAPABLE) {
vpaes_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, vpaes_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&cctx->ks.ks); &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
&cctx->ks, (block128_f) vpaes_encrypt); &cctx->ks, (block128_f) vpaes_encrypt);
@ -3387,7 +3394,7 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
break; break;
} }
#endif #endif
AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, AES_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&cctx->ks.ks); &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
&cctx->ks, (block128_f) AES_encrypt); &cctx->ks, (block128_f) AES_encrypt);
@ -3410,7 +3417,7 @@ static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (out != in || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->M)) if (out != in || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->M))
return -1; return -1;
/* If encrypting set explicit IV from sequence number (start of AAD) */ /* If encrypting set explicit IV from sequence number (start of AAD) */
if (EVP_CIPHER_CTX_encrypting(ctx)) if (EVP_CIPHER_CTX_is_encrypting(ctx))
memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx), memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx),
EVP_CCM_TLS_EXPLICIT_IV_LEN); EVP_CCM_TLS_EXPLICIT_IV_LEN);
/* Get rest of IV from explicit IV */ /* Get rest of IV from explicit IV */
@ -3422,11 +3429,12 @@ static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
len)) len))
return -1; return -1;
/* Use saved AAD */ /* Use saved AAD */
CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx), cctx->tls_aad_len); CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx),
cctx->tls_aad_len);
/* Fix buffer to point to payload */ /* Fix buffer to point to payload */
in += EVP_CCM_TLS_EXPLICIT_IV_LEN; in += EVP_CCM_TLS_EXPLICIT_IV_LEN;
out += EVP_CCM_TLS_EXPLICIT_IV_LEN; out += EVP_CCM_TLS_EXPLICIT_IV_LEN;
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len, if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
cctx->str) : cctx->str) :
CRYPTO_ccm128_encrypt(ccm, in, out, len)) CRYPTO_ccm128_encrypt(ccm, in, out, len))
@ -3484,7 +3492,7 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
/* The tag must be set before actually decrypting data */ /* The tag must be set before actually decrypting data */
if (!EVP_CIPHER_CTX_encrypting(ctx) && !cctx->tag_set) if (!EVP_CIPHER_CTX_is_encrypting(ctx) && !cctx->tag_set)
return -1; return -1;
/* If not set length yet do it */ /* If not set length yet do it */
@ -3493,7 +3501,7 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1; return -1;
cctx->len_set = 1; cctx->len_set = 1;
} }
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len, if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
cctx->str) : cctx->str) :
CRYPTO_ccm128_encrypt(ccm, in, out, len)) CRYPTO_ccm128_encrypt(ccm, in, out, len))
@ -3546,17 +3554,17 @@ static int aes_wrap_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (!iv && !key) if (!iv && !key)
return 1; return 1;
if (key) { if (key) {
if (EVP_CIPHER_CTX_encrypting(ctx)) if (EVP_CIPHER_CTX_is_encrypting(ctx))
AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, AES_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&wctx->ks.ks); &wctx->ks.ks);
else else
AES_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, AES_set_decrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&wctx->ks.ks); &wctx->ks.ks);
if (!iv) if (!iv)
wctx->iv = NULL; wctx->iv = NULL;
} }
if (iv) { if (iv) {
memcpy(ctx->iv, iv, EVP_CIPHER_CTX_iv_length(ctx)); memcpy(ctx->iv, iv, EVP_CIPHER_CTX_get_iv_length(ctx));
wctx->iv = ctx->iv; wctx->iv = ctx->iv;
} }
return 1; return 1;
@ -3568,7 +3576,7 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX,ctx); EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX,ctx);
size_t rv; size_t rv;
/* AES wrap with padding has IV length of 4, without padding 8 */ /* AES wrap with padding has IV length of 4, without padding 8 */
int pad = EVP_CIPHER_CTX_iv_length(ctx) == 4; int pad = EVP_CIPHER_CTX_get_iv_length(ctx) == 4;
/* No final operation so always return zero length */ /* No final operation so always return zero length */
if (!in) if (!in)
return 0; return 0;
@ -3576,7 +3584,7 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (!inlen) if (!inlen)
return -1; return -1;
/* If decrypting need at least 16 bytes and multiple of 8 */ /* If decrypting need at least 16 bytes and multiple of 8 */
if (!EVP_CIPHER_CTX_encrypting(ctx) && (inlen < 16 || inlen & 0x7)) if (!EVP_CIPHER_CTX_is_encrypting(ctx) && (inlen < 16 || inlen & 0x7))
return -1; return -1;
/* If not padding input must be multiple of 8 */ /* If not padding input must be multiple of 8 */
if (!pad && inlen & 0x7) if (!pad && inlen & 0x7)
@ -3586,7 +3594,7 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 0; return 0;
} }
if (!out) { if (!out) {
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
/* If padding round up to multiple of 8 */ /* If padding round up to multiple of 8 */
if (pad) if (pad)
inlen = (inlen + 7) / 8 * 8; inlen = (inlen + 7) / 8 * 8;
@ -3602,7 +3610,7 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
} }
if (pad) { if (pad) {
if (EVP_CIPHER_CTX_encrypting(ctx)) if (EVP_CIPHER_CTX_is_encrypting(ctx))
rv = CRYPTO_128_wrap_pad(&wctx->ks.ks, wctx->iv, rv = CRYPTO_128_wrap_pad(&wctx->ks.ks, wctx->iv,
out, in, inlen, out, in, inlen,
(block128_f) AES_encrypt); (block128_f) AES_encrypt);
@ -3611,7 +3619,7 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out, in, inlen, out, in, inlen,
(block128_f) AES_decrypt); (block128_f) AES_decrypt);
} else { } else {
if (EVP_CIPHER_CTX_encrypting(ctx)) if (EVP_CIPHER_CTX_is_encrypting(ctx))
rv = CRYPTO_128_wrap(&wctx->ks.ks, wctx->iv, rv = CRYPTO_128_wrap(&wctx->ks.ks, wctx->iv,
out, in, inlen, (block128_f) AES_encrypt); out, in, inlen, (block128_f) AES_encrypt);
else else
@ -3720,7 +3728,7 @@ static int aes_ocb_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_INIT: case EVP_CTRL_INIT:
octx->key_set = 0; octx->key_set = 0;
octx->iv_set = 0; octx->iv_set = 0;
octx->ivlen = EVP_CIPHER_iv_length(c->cipher); octx->ivlen = EVP_CIPHER_get_iv_length(c->cipher);
octx->iv = c->iv; octx->iv = c->iv;
octx->taglen = 16; octx->taglen = 16;
octx->data_buf_len = 0; octx->data_buf_len = 0;
@ -3748,13 +3756,13 @@ static int aes_ocb_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
octx->taglen = arg; octx->taglen = arg;
return 1; return 1;
} }
if (arg != octx->taglen || EVP_CIPHER_CTX_encrypting(c)) if (arg != octx->taglen || EVP_CIPHER_CTX_is_encrypting(c))
return 0; return 0;
memcpy(octx->tag, ptr, arg); memcpy(octx->tag, ptr, arg);
return 1; return 1;
case EVP_CTRL_AEAD_GET_TAG: case EVP_CTRL_AEAD_GET_TAG:
if (arg != octx->taglen || !EVP_CIPHER_CTX_encrypting(c)) if (arg != octx->taglen || !EVP_CIPHER_CTX_is_encrypting(c))
return 0; return 0;
memcpy(ptr, octx->tag, arg); memcpy(ptr, octx->tag, arg);
@ -3788,9 +3796,9 @@ static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
*/ */
# ifdef HWAES_CAPABLE # ifdef HWAES_CAPABLE
if (HWAES_CAPABLE) { if (HWAES_CAPABLE) {
HWAES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, HWAES_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksenc.ks); &octx->ksenc.ks);
HWAES_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, HWAES_set_decrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksdec.ks); &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb, if (!CRYPTO_ocb128_init(&octx->ocb,
&octx->ksenc.ks, &octx->ksdec.ks, &octx->ksenc.ks, &octx->ksdec.ks,
@ -3804,9 +3812,11 @@ static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
# endif # endif
# ifdef VPAES_CAPABLE # ifdef VPAES_CAPABLE
if (VPAES_CAPABLE) { if (VPAES_CAPABLE) {
vpaes_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, vpaes_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksenc.ks); &octx->ksenc.ks);
vpaes_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, vpaes_set_decrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksdec.ks); &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb, if (!CRYPTO_ocb128_init(&octx->ocb,
&octx->ksenc.ks, &octx->ksdec.ks, &octx->ksenc.ks, &octx->ksdec.ks,
@ -3817,9 +3827,9 @@ static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
break; break;
} }
# endif # endif
AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, AES_set_encrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksenc.ks); &octx->ksenc.ks);
AES_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, AES_set_decrypt_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&octx->ksdec.ks); &octx->ksdec.ks);
if (!CRYPTO_ocb128_init(&octx->ocb, if (!CRYPTO_ocb128_init(&octx->ocb,
&octx->ksenc.ks, &octx->ksdec.ks, &octx->ksenc.ks, &octx->ksdec.ks,
@ -3914,7 +3924,7 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (out == NULL) { if (out == NULL) {
if (!CRYPTO_ocb128_aad(&octx->ocb, buf, AES_BLOCK_SIZE)) if (!CRYPTO_ocb128_aad(&octx->ocb, buf, AES_BLOCK_SIZE))
return -1; return -1;
} else if (EVP_CIPHER_CTX_encrypting(ctx)) { } else if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (!CRYPTO_ocb128_encrypt(&octx->ocb, buf, out, if (!CRYPTO_ocb128_encrypt(&octx->ocb, buf, out,
AES_BLOCK_SIZE)) AES_BLOCK_SIZE))
return -1; return -1;
@ -3939,7 +3949,7 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (out == NULL) { if (out == NULL) {
if (!CRYPTO_ocb128_aad(&octx->ocb, in, len - trailing_len)) if (!CRYPTO_ocb128_aad(&octx->ocb, in, len - trailing_len))
return -1; return -1;
} else if (EVP_CIPHER_CTX_encrypting(ctx)) { } else if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (!CRYPTO_ocb128_encrypt if (!CRYPTO_ocb128_encrypt
(&octx->ocb, in, out, len - trailing_len)) (&octx->ocb, in, out, len - trailing_len))
return -1; return -1;
@ -3965,7 +3975,7 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* have been provided - both for data and AAD * have been provided - both for data and AAD
*/ */
if (octx->data_buf_len > 0) { if (octx->data_buf_len > 0) {
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (!CRYPTO_ocb128_encrypt(&octx->ocb, octx->data_buf, out, if (!CRYPTO_ocb128_encrypt(&octx->ocb, octx->data_buf, out,
octx->data_buf_len)) octx->data_buf_len))
return -1; return -1;
@ -3984,7 +3994,7 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
octx->aad_buf_len = 0; octx->aad_buf_len = 0;
} }
/* If decrypting then verify */ /* If decrypting then verify */
if (!EVP_CIPHER_CTX_encrypting(ctx)) { if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (octx->taglen < 0) if (octx->taglen < 0)
return -1; return -1;
if (CRYPTO_ocb128_finish(&octx->ocb, if (CRYPTO_ocb128_finish(&octx->ocb,

10
crypto/evp/e_aes_cbc_hmac_sha1.c
View file

@ -75,11 +75,11 @@ static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
if (enc) if (enc)
ret = aesni_set_encrypt_key(inkey, ret = aesni_set_encrypt_key(inkey,
EVP_CIPHER_CTX_key_length(ctx) * 8, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&key->ks); &key->ks);
else else
ret = aesni_set_decrypt_key(inkey, ret = aesni_set_decrypt_key(inkey,
EVP_CIPHER_CTX_key_length(ctx) * 8, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&key->ks); &key->ks);
SHA1_Init(&key->head); /* handy when benchmarking */ SHA1_Init(&key->head); /* handy when benchmarking */
@ -424,7 +424,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (len % AES_BLOCK_SIZE) if (len % AES_BLOCK_SIZE)
return 0; return 0;
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (plen == NO_PAYLOAD_LENGTH) if (plen == NO_PAYLOAD_LENGTH)
plen = len; plen = len;
else if (len != else if (len !=
@ -813,7 +813,7 @@ static int aesni_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
len = p[arg - 2] << 8 | p[arg - 1]; len = p[arg - 2] << 8 | p[arg - 1];
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
key->payload_length = len; key->payload_length = len;
if ((key->aux.tls_ver = if ((key->aux.tls_ver =
p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) { p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
@ -851,7 +851,7 @@ static int aesni_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
inp_len = param->inp[11] << 8 | param->inp[12]; inp_len = param->inp[11] << 8 | param->inp[12];
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION) if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
return -1; return -1;

10
crypto/evp/e_aes_cbc_hmac_sha256.c
View file

@ -71,11 +71,11 @@ static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,
if (enc) if (enc)
ret = aesni_set_encrypt_key(inkey, ret = aesni_set_encrypt_key(inkey,
EVP_CIPHER_CTX_key_length(ctx) * 8, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&key->ks); &key->ks);
else else
ret = aesni_set_decrypt_key(inkey, ret = aesni_set_decrypt_key(inkey,
EVP_CIPHER_CTX_key_length(ctx) * 8, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&key->ks); &key->ks);
SHA256_Init(&key->head); /* handy when benchmarking */ SHA256_Init(&key->head); /* handy when benchmarking */
@ -439,7 +439,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
if (len % AES_BLOCK_SIZE) if (len % AES_BLOCK_SIZE)
return 0; return 0;
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (plen == NO_PAYLOAD_LENGTH) if (plen == NO_PAYLOAD_LENGTH)
plen = len; plen = len;
else if (len != else if (len !=
@ -794,7 +794,7 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
len = p[arg - 2] << 8 | p[arg - 1]; len = p[arg - 2] << 8 | p[arg - 1];
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
key->payload_length = len; key->payload_length = len;
if ((key->aux.tls_ver = if ((key->aux.tls_ver =
p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) { p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
@ -835,7 +835,7 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
inp_len = param->inp[11] << 8 | param->inp[12]; inp_len = param->inp[11] << 8 | param->inp[12];
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION) if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
return -1; return -1;

53
crypto/evp/e_aria.c
View file

@ -60,13 +60,15 @@ static int aria_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
int ret; int ret;
int mode = EVP_CIPHER_CTX_mode(ctx); int mode = EVP_CIPHER_CTX_get_mode(ctx);
if (enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE)) if (enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE))
ret = ossl_aria_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = ossl_aria_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
EVP_CIPHER_CTX_get_cipher_data(ctx)); EVP_CIPHER_CTX_get_cipher_data(ctx));
else else
ret = ossl_aria_set_decrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = ossl_aria_set_decrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
EVP_CIPHER_CTX_get_cipher_data(ctx)); EVP_CIPHER_CTX_get_cipher_data(ctx));
if (ret < 0) { if (ret < 0) {
ERR_raise(ERR_LIB_EVP,EVP_R_ARIA_KEY_SETUP_FAILED); ERR_raise(ERR_LIB_EVP,EVP_R_ARIA_KEY_SETUP_FAILED);
@ -171,7 +173,7 @@ const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
static int aria_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int aria_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
unsigned int num = EVP_CIPHER_CTX_num(ctx); unsigned int num = EVP_CIPHER_CTX_get_num(ctx);
EVP_ARIA_KEY *dat = EVP_C_DATA(EVP_ARIA_KEY, ctx); EVP_ARIA_KEY *dat = EVP_C_DATA(EVP_ARIA_KEY, ctx);
CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv, CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv,
@ -212,7 +214,8 @@ static int aria_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
if (!iv && !key) if (!iv && !key)
return 1; return 1;
if (key) { if (key) {
ret = ossl_aria_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = ossl_aria_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&gctx->ks.ks); &gctx->ks.ks);
CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
(block128_f) ossl_aria_encrypt); (block128_f) ossl_aria_encrypt);
@ -251,7 +254,7 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_INIT: case EVP_CTRL_INIT:
gctx->key_set = 0; gctx->key_set = 0;
gctx->iv_set = 0; gctx->iv_set = 0;
gctx->ivlen = EVP_CIPHER_iv_length(c->cipher); gctx->ivlen = EVP_CIPHER_get_iv_length(c->cipher);
gctx->iv = c->iv; gctx->iv = c->iv;
gctx->taglen = -1; gctx->taglen = -1;
gctx->iv_gen = 0; gctx->iv_gen = 0;
@ -278,14 +281,14 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 1; return 1;
case EVP_CTRL_AEAD_SET_TAG: case EVP_CTRL_AEAD_SET_TAG:
if (arg <= 0 || arg > 16 || EVP_CIPHER_CTX_encrypting(c)) if (arg <= 0 || arg > 16 || EVP_CIPHER_CTX_is_encrypting(c))
return 0; return 0;
memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg); memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg);
gctx->taglen = arg; gctx->taglen = arg;
return 1; return 1;
case EVP_CTRL_AEAD_GET_TAG: case EVP_CTRL_AEAD_GET_TAG:
if (arg <= 0 || arg > 16 || !EVP_CIPHER_CTX_encrypting(c) if (arg <= 0 || arg > 16 || !EVP_CIPHER_CTX_is_encrypting(c)
|| gctx->taglen < 0) || gctx->taglen < 0)
return 0; return 0;
memcpy(ptr, EVP_CIPHER_CTX_buf_noconst(c), arg); memcpy(ptr, EVP_CIPHER_CTX_buf_noconst(c), arg);
@ -306,7 +309,7 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 0; return 0;
if (arg) if (arg)
memcpy(gctx->iv, ptr, arg); memcpy(gctx->iv, ptr, arg);
if (EVP_CIPHER_CTX_encrypting(c) if (EVP_CIPHER_CTX_is_encrypting(c)
&& RAND_bytes(gctx->iv + arg, gctx->ivlen - arg) <= 0) && RAND_bytes(gctx->iv + arg, gctx->ivlen - arg) <= 0)
return 0; return 0;
gctx->iv_gen = 1; gctx->iv_gen = 1;
@ -329,7 +332,7 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_GCM_SET_IV_INV: case EVP_CTRL_GCM_SET_IV_INV:
if (gctx->iv_gen == 0 || gctx->key_set == 0 if (gctx->iv_gen == 0 || gctx->key_set == 0
|| EVP_CIPHER_CTX_encrypting(c)) || EVP_CIPHER_CTX_is_encrypting(c))
return 0; return 0;
memcpy(gctx->iv + gctx->ivlen - arg, ptr, arg); memcpy(gctx->iv + gctx->ivlen - arg, ptr, arg);
CRYPTO_gcm128_setiv(&gctx->gcm, gctx->iv, gctx->ivlen); CRYPTO_gcm128_setiv(&gctx->gcm, gctx->iv, gctx->ivlen);
@ -351,7 +354,7 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 0; return 0;
len -= EVP_GCM_TLS_EXPLICIT_IV_LEN; len -= EVP_GCM_TLS_EXPLICIT_IV_LEN;
/* If decrypting correct for tag too */ /* If decrypting correct for tag too */
if (!EVP_CIPHER_CTX_encrypting(c)) { if (!EVP_CIPHER_CTX_is_encrypting(c)) {
if (len < EVP_GCM_TLS_TAG_LEN) if (len < EVP_GCM_TLS_TAG_LEN)
return 0; return 0;
len -= EVP_GCM_TLS_TAG_LEN; len -= EVP_GCM_TLS_TAG_LEN;
@ -403,7 +406,7 @@ static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
* Set IV from start of buffer or generate IV and write to start of * Set IV from start of buffer or generate IV and write to start of
* buffer. * buffer.
*/ */
if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CIPHER_CTX_encrypting(ctx) ? if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CIPHER_CTX_is_encrypting(ctx) ?
EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV, EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0) EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
goto err; goto err;
@ -415,7 +418,7 @@ static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
in += EVP_GCM_TLS_EXPLICIT_IV_LEN; in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
out += EVP_GCM_TLS_EXPLICIT_IV_LEN; out += EVP_GCM_TLS_EXPLICIT_IV_LEN;
len -= EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN; len -= EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
/* Encrypt payload */ /* Encrypt payload */
if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len)) if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len))
goto err; goto err;
@ -463,7 +466,7 @@ static int aria_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (out == NULL) { if (out == NULL) {
if (CRYPTO_gcm128_aad(&gctx->gcm, in, len)) if (CRYPTO_gcm128_aad(&gctx->gcm, in, len))
return -1; return -1;
} else if (EVP_CIPHER_CTX_encrypting(ctx)) { } else if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len)) if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len))
return -1; return -1;
} else { } else {
@ -472,7 +475,7 @@ static int aria_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
return len; return len;
} }
if (!EVP_CIPHER_CTX_encrypting(ctx)) { if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (gctx->taglen < 0) if (gctx->taglen < 0)
return -1; return -1;
if (CRYPTO_gcm128_finish(&gctx->gcm, if (CRYPTO_gcm128_finish(&gctx->gcm,
@ -509,7 +512,8 @@ static int aria_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 1; return 1;
if (key) { if (key) {
ret = ossl_aria_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, ret = ossl_aria_set_encrypt_key(key,
EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&cctx->ks.ks); &cctx->ks.ks);
CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
&cctx->ks, (block128_f) ossl_aria_encrypt); &cctx->ks, (block128_f) ossl_aria_encrypt);
@ -561,7 +565,7 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 0; return 0;
len -= EVP_CCM_TLS_EXPLICIT_IV_LEN; len -= EVP_CCM_TLS_EXPLICIT_IV_LEN;
/* If decrypting correct for tag too */ /* If decrypting correct for tag too */
if (!EVP_CIPHER_CTX_encrypting(c)) { if (!EVP_CIPHER_CTX_is_encrypting(c)) {
if (len < cctx->M) if (len < cctx->M)
return 0; return 0;
len -= cctx->M; len -= cctx->M;
@ -591,7 +595,7 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
case EVP_CTRL_AEAD_SET_TAG: case EVP_CTRL_AEAD_SET_TAG:
if ((arg & 1) || arg < 4 || arg > 16) if ((arg & 1) || arg < 4 || arg > 16)
return 0; return 0;
if (EVP_CIPHER_CTX_encrypting(c) && ptr) if (EVP_CIPHER_CTX_is_encrypting(c) && ptr)
return 0; return 0;
if (ptr) { if (ptr) {
cctx->tag_set = 1; cctx->tag_set = 1;
@ -601,7 +605,7 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
return 1; return 1;
case EVP_CTRL_AEAD_GET_TAG: case EVP_CTRL_AEAD_GET_TAG:
if (!EVP_CIPHER_CTX_encrypting(c) || !cctx->tag_set) if (!EVP_CIPHER_CTX_is_encrypting(c) || !cctx->tag_set)
return 0; return 0;
if (!CRYPTO_ccm128_tag(&cctx->ccm, ptr, (size_t)arg)) if (!CRYPTO_ccm128_tag(&cctx->ccm, ptr, (size_t)arg))
return 0; return 0;
@ -637,7 +641,7 @@ static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (out != in || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->M)) if (out != in || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->M))
return -1; return -1;
/* If encrypting set explicit IV from sequence number (start of AAD) */ /* If encrypting set explicit IV from sequence number (start of AAD) */
if (EVP_CIPHER_CTX_encrypting(ctx)) if (EVP_CIPHER_CTX_is_encrypting(ctx))
memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx), memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx),
EVP_CCM_TLS_EXPLICIT_IV_LEN); EVP_CCM_TLS_EXPLICIT_IV_LEN);
/* Get rest of IV from explicit IV */ /* Get rest of IV from explicit IV */
@ -649,11 +653,12 @@ static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
len)) len))
return -1; return -1;
/* Use saved AAD */ /* Use saved AAD */
CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx), cctx->tls_aad_len); CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx),
cctx->tls_aad_len);
/* Fix buffer to point to payload */ /* Fix buffer to point to payload */
in += EVP_CCM_TLS_EXPLICIT_IV_LEN; in += EVP_CCM_TLS_EXPLICIT_IV_LEN;
out += EVP_CCM_TLS_EXPLICIT_IV_LEN; out += EVP_CCM_TLS_EXPLICIT_IV_LEN;
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len, cctx->str) if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len, cctx->str)
: CRYPTO_ccm128_encrypt(ccm, in, out, len)) : CRYPTO_ccm128_encrypt(ccm, in, out, len))
return -1; return -1;
@ -709,7 +714,7 @@ static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
/* The tag must be set before actually decrypting data */ /* The tag must be set before actually decrypting data */
if (!EVP_CIPHER_CTX_encrypting(ctx) && !cctx->tag_set) if (!EVP_CIPHER_CTX_is_encrypting(ctx) && !cctx->tag_set)
return -1; return -1;
/* If not set length yet do it */ /* If not set length yet do it */
@ -718,7 +723,7 @@ static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return -1; return -1;
cctx->len_set = 1; cctx->len_set = 1;
} }
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len, cctx->str) if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len, cctx->str)
: CRYPTO_ccm128_encrypt(ccm, in, out, len)) : CRYPTO_ccm128_encrypt(ccm, in, out, len))
return -1; return -1;

2
crypto/evp/e_bf.c
View file

@ -38,7 +38,7 @@ IMPLEMENT_BLOCK_CIPHER(bf, ks, BF, EVP_BF_KEY, NID_bf, 8, 16, 8, 64,
static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
BF_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_key_length(ctx), key); BF_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_get_key_length(ctx), key);
return 1; return 1;
} }

47
crypto/evp/e_camellia.c
View file

@ -56,8 +56,8 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
EVP_CAMELLIA_KEY *dat = EVP_CAMELLIA_KEY *dat =
(EVP_CAMELLIA_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx); (EVP_CAMELLIA_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
mode = EVP_CIPHER_CTX_mode(ctx); mode = EVP_CIPHER_CTX_get_mode(ctx);
bits = EVP_CIPHER_CTX_key_length(ctx) * 8; bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
cmll_t4_set_key(key, bits, &dat->ks); cmll_t4_set_key(key, bits, &dat->ks);
@ -196,13 +196,14 @@ static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
int ret, mode; int ret, mode;
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx); EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx);
ret = Camellia_set_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, &dat->ks); ret = Camellia_set_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
&dat->ks);
if (ret < 0) { if (ret < 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_CAMELLIA_KEY_SETUP_FAILED); ERR_raise(ERR_LIB_EVP, EVP_R_CAMELLIA_KEY_SETUP_FAILED);
return 0; return 0;
} }
mode = EVP_CIPHER_CTX_mode(ctx); mode = EVP_CIPHER_CTX_get_mode(ctx);
if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
&& !enc) { && !enc) {
dat->block = (block128_f) Camellia_decrypt; dat->block = (block128_f) Camellia_decrypt;
@ -224,8 +225,8 @@ static int camellia_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (dat->stream.cbc) if (dat->stream.cbc)
(*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv, (*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
else if (EVP_CIPHER_CTX_encrypting(ctx)) else if (EVP_CIPHER_CTX_is_encrypting(ctx))
CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv, dat->block); CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv, dat->block);
else else
CRYPTO_cbc128_decrypt(in, out, len, &dat->ks, ctx->iv, dat->block); CRYPTO_cbc128_decrypt(in, out, len, &dat->ks, ctx->iv, dat->block);
@ -236,7 +237,7 @@ static int camellia_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int camellia_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int camellia_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
size_t bl = EVP_CIPHER_CTX_block_size(ctx); size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
size_t i; size_t i;
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx); EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx);
@ -254,7 +255,7 @@ static int camellia_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx); EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx);
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_ofb128_encrypt(in, out, len, &dat->ks, ctx->iv, &num, dat->block); CRYPTO_ofb128_encrypt(in, out, len, &dat->ks, ctx->iv, &num, dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
@ -265,9 +266,9 @@ static int camellia_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx); EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx);
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_encrypt(in, out, len, &dat->ks, ctx->iv, &num, CRYPTO_cfb128_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
} }
@ -277,9 +278,9 @@ static int camellia_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx); EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx);
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks, ctx->iv, &num, CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
} }
@ -290,26 +291,31 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx); EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx);
if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) { if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks, ctx->iv, &num, CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx), dat->block); EVP_CIPHER_CTX_is_encrypting(ctx),
dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
return 1; return 1;
} }
while (len >= MAXBITCHUNK) { while (len >= MAXBITCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks, CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,
ctx->iv, &num, EVP_CIPHER_CTX_encrypting(ctx), dat->block); ctx->iv, &num,
EVP_CIPHER_CTX_is_encrypting(ctx),
dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
len -= MAXBITCHUNK; len -= MAXBITCHUNK;
out += MAXBITCHUNK; out += MAXBITCHUNK;
in += MAXBITCHUNK; in += MAXBITCHUNK;
} }
if (len) { if (len) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks, CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,
ctx->iv, &num, EVP_CIPHER_CTX_encrypting(ctx), dat->block); ctx->iv, &num,
EVP_CIPHER_CTX_is_encrypting(ctx),
dat->block);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
} }
@ -319,7 +325,7 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
int snum = EVP_CIPHER_CTX_num(ctx); int snum = EVP_CIPHER_CTX_get_num(ctx);
unsigned int num; unsigned int num;
EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx); EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY,ctx);
@ -328,7 +334,8 @@ static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
num = snum; num = snum;
if (dat->stream.ctr) if (dat->stream.ctr)
CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks, ctx->iv, CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks, ctx->iv,
EVP_CIPHER_CTX_buf_noconst(ctx), &num, EVP_CIPHER_CTX_buf_noconst(ctx),
&num,
dat->stream.ctr); dat->stream.ctr);
else else
CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv, CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv,

2
crypto/evp/e_cast.c
View file

@ -40,7 +40,7 @@ IMPLEMENT_BLOCK_CIPHER(cast5, ks, CAST, EVP_CAST_KEY,
static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
int keylen = EVP_CIPHER_CTX_key_length(ctx); int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
if (keylen <= 0) if (keylen <= 0)
return 0; return 0;

26
crypto/evp/e_des.c
View file

@ -65,7 +65,7 @@ static int des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
BLOCK_CIPHER_ecb_loop() BLOCK_CIPHER_ecb_loop()
DES_ecb_encrypt((DES_cblock *)(in + i), (DES_cblock *)(out + i), DES_ecb_encrypt((DES_cblock *)(in + i), (DES_cblock *)(out + i),
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -73,7 +73,7 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, &num); (DES_cblock *)ctx->iv, &num);
@ -83,7 +83,7 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
} }
if (inl) { if (inl) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ofb64_encrypt(in, out, (long)inl, DES_ofb64_encrypt(in, out, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, &num); (DES_cblock *)ctx->iv, &num);
@ -105,7 +105,7 @@ static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK; in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
@ -114,7 +114,7 @@ static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ncbc_encrypt(in, out, (long)inl, DES_ncbc_encrypt(in, out, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -122,22 +122,22 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, &num, (DES_cblock *)ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK; in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
} }
if (inl) { if (inl) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_cfb64_encrypt(in, out, (long)inl, DES_cfb64_encrypt(in, out, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, &num, (DES_cblock *)ctx->iv, &num,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
} }
return 1; return 1;
@ -161,7 +161,7 @@ static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
DES_cfb_encrypt(c, d, 1, 1, EVP_CIPHER_CTX_get_cipher_data(ctx), DES_cfb_encrypt(c, d, 1, 1, EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
out[n / 8] = out[n / 8] =
(out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) | (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) |
((d[0] & 0x80) >> (unsigned int)(n % 8)); ((d[0] & 0x80) >> (unsigned int)(n % 8));
@ -183,7 +183,7 @@ static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK, DES_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK; in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
@ -192,7 +192,7 @@ static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_cfb_encrypt(in, out, 8, (long)inl, DES_cfb_encrypt(in, out, 8, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -217,7 +217,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
dat->stream.cbc = NULL; dat->stream.cbc = NULL;
# if defined(SPARC_DES_CAPABLE) # if defined(SPARC_DES_CAPABLE)
if (SPARC_DES_CAPABLE) { if (SPARC_DES_CAPABLE) {
int mode = EVP_CIPHER_CTX_mode(ctx); int mode = EVP_CIPHER_CTX_get_mode(ctx);
if (mode == EVP_CIPH_CBC_MODE) { if (mode == EVP_CIPH_CBC_MODE) {
des_t4_key_expand(key, &dat->ks.ks); des_t4_key_expand(key, &dat->ks.ks);

32
crypto/evp/e_des3.c
View file

@ -75,7 +75,7 @@ static int des_ede_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ecb3_encrypt((const_DES_cblock *)(in + i), DES_ecb3_encrypt((const_DES_cblock *)(in + i),
(DES_cblock *)(out + i), (DES_cblock *)(out + i),
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, EVP_CIPHER_CTX_encrypting(ctx)); &data(ctx)->ks3, EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -83,7 +83,7 @@ static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, &data(ctx)->ks3,
@ -95,7 +95,7 @@ static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
} }
if (inl) { if (inl) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_ofb64_encrypt(in, out, (long)inl, DES_ede3_ofb64_encrypt(in, out, (long)inl,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, &data(ctx)->ks3,
@ -121,7 +121,7 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK,
&dat->ks1, &dat->ks2, &dat->ks3, &dat->ks1, &dat->ks2, &dat->ks3,
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK; in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
@ -130,7 +130,7 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ede3_cbc_encrypt(in, out, (long)inl, DES_ede3_cbc_encrypt(in, out, (long)inl,
&dat->ks1, &dat->ks2, &dat->ks3, &dat->ks1, &dat->ks2, &dat->ks3,
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -138,22 +138,22 @@ static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, (DES_cblock *)ctx->iv, &data(ctx)->ks3, (DES_cblock *)ctx->iv,
&num, EVP_CIPHER_CTX_encrypting(ctx)); &num, EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK; in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
} }
if (inl) { if (inl) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_get_num(ctx);
DES_ede3_cfb64_encrypt(in, out, (long)inl, DES_ede3_cfb64_encrypt(in, out, (long)inl,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, (DES_cblock *)ctx->iv, &data(ctx)->ks3, (DES_cblock *)ctx->iv,
&num, EVP_CIPHER_CTX_encrypting(ctx)); &num, EVP_CIPHER_CTX_is_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
} }
return 1; return 1;
@ -176,7 +176,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ede3_cfb_encrypt(c, d, 1, 1, DES_ede3_cfb_encrypt(c, d, 1, 1,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, (DES_cblock *)ctx->iv, &data(ctx)->ks3, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8)))
| ((d[0] & 0x80) >> (unsigned int)(n % 8)); | ((d[0] & 0x80) >> (unsigned int)(n % 8));
} }
@ -191,7 +191,7 @@ static int des_ede3_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ede3_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK, DES_ede3_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, (DES_cblock *)ctx->iv, &data(ctx)->ks3, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK; in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
@ -200,7 +200,7 @@ static int des_ede3_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_ede3_cfb_encrypt(in, out, 8, (long)inl, DES_ede3_cfb_encrypt(in, out, 8, (long)inl,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks1, &data(ctx)->ks2,
&data(ctx)->ks3, (DES_cblock *)ctx->iv, &data(ctx)->ks3, (DES_cblock *)ctx->iv,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
@ -232,7 +232,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
dat->stream.cbc = NULL; dat->stream.cbc = NULL;
# if defined(SPARC_DES_CAPABLE) # if defined(SPARC_DES_CAPABLE)
if (SPARC_DES_CAPABLE) { if (SPARC_DES_CAPABLE) {
int mode = EVP_CIPHER_CTX_mode(ctx); int mode = EVP_CIPHER_CTX_get_mode(ctx);
if (mode == EVP_CIPH_CBC_MODE) { if (mode == EVP_CIPH_CBC_MODE) {
des_t4_key_expand(&deskey[0], &dat->ks1); des_t4_key_expand(&deskey[0], &dat->ks1);
@ -259,7 +259,7 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
dat->stream.cbc = NULL; dat->stream.cbc = NULL;
# if defined(SPARC_DES_CAPABLE) # if defined(SPARC_DES_CAPABLE)
if (SPARC_DES_CAPABLE) { if (SPARC_DES_CAPABLE) {
int mode = EVP_CIPHER_CTX_mode(ctx); int mode = EVP_CIPHER_CTX_get_mode(ctx);
if (mode == EVP_CIPH_CBC_MODE) { if (mode == EVP_CIPH_CBC_MODE) {
des_t4_key_expand(&deskey[0], &dat->ks1); des_t4_key_expand(&deskey[0], &dat->ks1);
@ -285,7 +285,7 @@ static int des3_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
switch (type) { switch (type) {
case EVP_CTRL_RAND_KEY: case EVP_CTRL_RAND_KEY:
kl = EVP_CIPHER_CTX_key_length(ctx); kl = EVP_CIPHER_CTX_get_key_length(ctx);
if (kl < 0 || RAND_priv_bytes(ptr, kl) <= 0) if (kl < 0 || RAND_priv_bytes(ptr, kl) <= 0)
return 0; return 0;
DES_set_odd_parity(deskey); DES_set_odd_parity(deskey);
@ -401,7 +401,7 @@ static int des_ede3_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 0; return 0;
} }
if (EVP_CIPHER_CTX_encrypting(ctx)) if (EVP_CIPHER_CTX_is_encrypting(ctx))
return des_ede3_wrap(ctx, out, in, inl); return des_ede3_wrap(ctx, out, in, inl);
else else
return des_ede3_unwrap(ctx, out, in, inl); return des_ede3_unwrap(ctx, out, in, inl);

4
crypto/evp/e_idea.c
View file

@ -58,9 +58,9 @@ static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
if (!enc) { if (!enc) {
if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_OFB_MODE) if (EVP_CIPHER_CTX_get_mode(ctx) == EVP_CIPH_OFB_MODE)
enc = 1; enc = 1;
else if (EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_CFB_MODE) else if (EVP_CIPHER_CTX_get_mode(ctx) == EVP_CIPH_CFB_MODE)
enc = 1; enc = 1;
} }
if (enc) if (enc)

8
crypto/evp/e_rc2.c
View file

@ -92,7 +92,7 @@ const EVP_CIPHER *EVP_rc2_40_cbc(void)
static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
RC2_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_key_length(ctx), RC2_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_get_key_length(ctx),
key, data(ctx)->key_bits); key, data(ctx)->key_bits);
return 1; return 1;
} }
@ -136,7 +136,7 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
unsigned char iv[EVP_MAX_IV_LENGTH]; unsigned char iv[EVP_MAX_IV_LENGTH];
if (type != NULL) { if (type != NULL) {
l = EVP_CIPHER_CTX_iv_length(c); l = EVP_CIPHER_CTX_get_iv_length(c);
OPENSSL_assert(l <= sizeof(iv)); OPENSSL_assert(l <= sizeof(iv));
i = ASN1_TYPE_get_int_octetstring(type, &num, iv, l); i = ASN1_TYPE_get_int_octetstring(type, &num, iv, l);
if (i != (int)l) if (i != (int)l)
@ -161,7 +161,7 @@ static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
if (type != NULL) { if (type != NULL) {
num = rc2_meth_to_magic(c); num = rc2_meth_to_magic(c);
j = EVP_CIPHER_CTX_iv_length(c); j = EVP_CIPHER_CTX_get_iv_length(c);
i = ASN1_TYPE_set_int_octetstring(type, num, c->oiv, j); i = ASN1_TYPE_set_int_octetstring(type, num, c->oiv, j);
} }
return i; return i;
@ -171,7 +171,7 @@ static int rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
{ {
switch (type) { switch (type) {
case EVP_CTRL_INIT: case EVP_CTRL_INIT:
data(c)->key_bits = EVP_CIPHER_CTX_key_length(c) * 8; data(c)->key_bits = EVP_CIPHER_CTX_get_key_length(c) * 8;
return 1; return 1;
case EVP_CTRL_GET_RC2_KEY_BITS: case EVP_CTRL_GET_RC2_KEY_BITS:

2
crypto/evp/e_rc4.c
View file

@ -79,7 +79,7 @@ static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
{ {
int keylen; int keylen;
if ((keylen = EVP_CIPHER_CTX_key_length(ctx)) <= 0) if ((keylen = EVP_CIPHER_CTX_get_key_length(ctx)) <= 0)
return 0; return 0;
RC4_set_key(&data(ctx)->ks, keylen, key); RC4_set_key(&data(ctx)->ks, keylen, key);
return 1; return 1;

6
crypto/evp/e_rc4_hmac_md5.c
View file

@ -46,7 +46,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
EVP_RC4_HMAC_MD5 *key = data(ctx); EVP_RC4_HMAC_MD5 *key = data(ctx);
const int keylen = EVP_CIPHER_CTX_key_length(ctx); const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
if (keylen <= 0) if (keylen <= 0)
return 0; return 0;
@ -88,7 +88,7 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
if (plen != NO_PAYLOAD_LENGTH && len != (plen + MD5_DIGEST_LENGTH)) if (plen != NO_PAYLOAD_LENGTH && len != (plen + MD5_DIGEST_LENGTH))
return 0; return 0;
if (EVP_CIPHER_CTX_encrypting(ctx)) { if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (plen == NO_PAYLOAD_LENGTH) if (plen == NO_PAYLOAD_LENGTH)
plen = len; plen = len;
# if defined(STITCHED_CALL) # if defined(STITCHED_CALL)
@ -228,7 +228,7 @@ static int rc4_hmac_md5_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
len = p[arg - 2] << 8 | p[arg - 1]; len = p[arg - 2] << 8 | p[arg - 1];
if (!EVP_CIPHER_CTX_encrypting(ctx)) { if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
if (len < MD5_DIGEST_LENGTH) if (len < MD5_DIGEST_LENGTH)
return -1; return -1;
len -= MD5_DIGEST_LENGTH; len -= MD5_DIGEST_LENGTH;

4
crypto/evp/e_rc5.c
View file

@ -72,11 +72,11 @@ static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
if (EVP_CIPHER_CTX_key_length(ctx) > 255) { if (EVP_CIPHER_CTX_get_key_length(ctx) > 255) {
ERR_raise(ERR_LIB_EVP, EVP_R_BAD_KEY_LENGTH); ERR_raise(ERR_LIB_EVP, EVP_R_BAD_KEY_LENGTH);
return 0; return 0;
} }
return RC5_32_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_key_length(ctx), return RC5_32_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_get_key_length(ctx),
key, data(ctx)->rounds); key, data(ctx)->rounds);
} }

2
crypto/evp/e_sm4.c
View file

@ -72,7 +72,7 @@ IMPLEMENT_BLOCK_CIPHER(sm4, ks, sm4, EVP_SM4_KEY, NID_sm4,
static int sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
{ {
unsigned int num = EVP_CIPHER_CTX_num(ctx); unsigned int num = EVP_CIPHER_CTX_get_num(ctx);
EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx); EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv, CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv,

4
crypto/evp/e_xcbc_d.c
View file

@ -76,7 +76,7 @@ static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_xcbc_encrypt(in, out, (long)EVP_MAXCHUNK, &data(ctx)->ks, DES_xcbc_encrypt(in, out, (long)EVP_MAXCHUNK, &data(ctx)->ks,
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
&data(ctx)->inw, &data(ctx)->outw, &data(ctx)->inw, &data(ctx)->outw,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
in += EVP_MAXCHUNK; in += EVP_MAXCHUNK;
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
@ -85,7 +85,7 @@ static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
DES_xcbc_encrypt(in, out, (long)inl, &data(ctx)->ks, DES_xcbc_encrypt(in, out, (long)inl, &data(ctx)->ks,
(DES_cblock *)ctx->iv, (DES_cblock *)ctx->iv,
&data(ctx)->inw, &data(ctx)->outw, &data(ctx)->inw, &data(ctx)->outw,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_is_encrypting(ctx));
return 1; return 1;
} }
#endif #endif

48
crypto/evp/evp_enc.c
View file

@ -216,10 +216,10 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
return ctx->cipher->einit(ctx->algctx, return ctx->cipher->einit(ctx->algctx,
key, key,
key == NULL ? 0 key == NULL ? 0
: EVP_CIPHER_CTX_key_length(ctx), : EVP_CIPHER_CTX_get_key_length(ctx),
iv, iv,
iv == NULL ? 0 iv == NULL ? 0
: EVP_CIPHER_CTX_iv_length(ctx), : EVP_CIPHER_CTX_get_iv_length(ctx),
params); params);
} }
@ -231,10 +231,10 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
return ctx->cipher->dinit(ctx->algctx, return ctx->cipher->dinit(ctx->algctx,
key, key,
key == NULL ? 0 key == NULL ? 0
: EVP_CIPHER_CTX_key_length(ctx), : EVP_CIPHER_CTX_get_key_length(ctx),
iv, iv,
iv == NULL ? 0 iv == NULL ? 0
: EVP_CIPHER_CTX_iv_length(ctx), : EVP_CIPHER_CTX_get_iv_length(ctx),
params); params);
/* Code below to be removed when legacy support is dropped. */ /* Code below to be removed when legacy support is dropped. */
@ -321,14 +321,14 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
|| ctx->cipher->block_size == 16); || ctx->cipher->block_size == 16);
if (!(ctx->flags & EVP_CIPHER_CTX_FLAG_WRAP_ALLOW) if (!(ctx->flags & EVP_CIPHER_CTX_FLAG_WRAP_ALLOW)
&& EVP_CIPHER_CTX_mode(ctx) == EVP_CIPH_WRAP_MODE) { && EVP_CIPHER_CTX_get_mode(ctx) == EVP_CIPH_WRAP_MODE) {
ERR_raise(ERR_LIB_EVP, EVP_R_WRAP_MODE_NOT_ALLOWED); ERR_raise(ERR_LIB_EVP, EVP_R_WRAP_MODE_NOT_ALLOWED);
return 0; return 0;
} }
if ((EVP_CIPHER_flags(EVP_CIPHER_CTX_get0_cipher(ctx)) if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
& EVP_CIPH_CUSTOM_IV) == 0) { & EVP_CIPH_CUSTOM_IV) == 0) {
switch (EVP_CIPHER_CTX_mode(ctx)) { switch (EVP_CIPHER_CTX_get_mode(ctx)) {
case EVP_CIPH_STREAM_CIPHER: case EVP_CIPH_STREAM_CIPHER:
case EVP_CIPH_ECB_MODE: case EVP_CIPH_ECB_MODE:
@ -341,19 +341,19 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
/* fall-through */ /* fall-through */
case EVP_CIPH_CBC_MODE: case EVP_CIPH_CBC_MODE:
n = EVP_CIPHER_CTX_iv_length(ctx); n = EVP_CIPHER_CTX_get_iv_length(ctx);
if (!ossl_assert(n >= 0 && n <= (int)sizeof(ctx->iv))) if (!ossl_assert(n >= 0 && n <= (int)sizeof(ctx->iv)))
return 0; return 0;
if (iv) if (iv)
memcpy(ctx->oiv, iv, EVP_CIPHER_CTX_iv_length(ctx)); memcpy(ctx->oiv, iv, EVP_CIPHER_CTX_get_iv_length(ctx));
memcpy(ctx->iv, ctx->oiv, EVP_CIPHER_CTX_iv_length(ctx)); memcpy(ctx->iv, ctx->oiv, EVP_CIPHER_CTX_get_iv_length(ctx));
break; break;
case EVP_CIPH_CTR_MODE: case EVP_CIPH_CTR_MODE:
ctx->num = 0; ctx->num = 0;
/* Don't reuse IV for CTR mode */ /* Don't reuse IV for CTR mode */
if (iv) if (iv)
memcpy(ctx->iv, iv, EVP_CIPHER_CTX_iv_length(ctx)); memcpy(ctx->iv, iv, EVP_CIPHER_CTX_get_iv_length(ctx));
break; break;
default: default:
@ -674,7 +674,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
if (ctx->cipher->prov == NULL) if (ctx->cipher->prov == NULL)
goto legacy; goto legacy;
blocksize = EVP_CIPHER_CTX_block_size(ctx); blocksize = EVP_CIPHER_CTX_get_block_size(ctx);
if (blocksize < 1 || ctx->cipher->cfinal == NULL) { if (blocksize < 1 || ctx->cipher->cfinal == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR); ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR);
@ -761,7 +761,7 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
if (ctx->cipher->prov == NULL) if (ctx->cipher->prov == NULL)
goto legacy; goto legacy;
blocksize = EVP_CIPHER_CTX_block_size(ctx); blocksize = EVP_CIPHER_CTX_get_block_size(ctx);
if (ctx->cipher->cupdate == NULL || blocksize < 1) { if (ctx->cipher->cupdate == NULL || blocksize < 1) {
ERR_raise(ERR_LIB_EVP, EVP_R_UPDATE_ERROR); ERR_raise(ERR_LIB_EVP, EVP_R_UPDATE_ERROR);
@ -896,7 +896,7 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
if (ctx->cipher->prov == NULL) if (ctx->cipher->prov == NULL)
goto legacy; goto legacy;
blocksize = EVP_CIPHER_CTX_block_size(ctx); blocksize = EVP_CIPHER_CTX_get_block_size(ctx);
if (blocksize < 1 || ctx->cipher->cfinal == NULL) { if (blocksize < 1 || ctx->cipher->cfinal == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR); ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR);
@ -976,7 +976,7 @@ int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen)
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END }; OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
size_t len = keylen; size_t len = keylen;
if (EVP_CIPHER_CTX_key_length(c) == keylen) if (EVP_CIPHER_CTX_get_key_length(c) == keylen)
return 1; return 1;
/* Check the cipher actually understands this parameter */ /* Check the cipher actually understands this parameter */
@ -998,7 +998,7 @@ int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen)
*/ */
if (c->cipher->flags & EVP_CIPH_CUSTOM_KEY_LENGTH) if (c->cipher->flags & EVP_CIPH_CUSTOM_KEY_LENGTH)
return EVP_CIPHER_CTX_ctrl(c, EVP_CTRL_SET_KEY_LENGTH, keylen, NULL); return EVP_CIPHER_CTX_ctrl(c, EVP_CTRL_SET_KEY_LENGTH, keylen, NULL);
if (EVP_CIPHER_CTX_key_length(c) == keylen) if (EVP_CIPHER_CTX_get_key_length(c) == keylen)
return 1; return 1;
if ((keylen > 0) && (c->cipher->flags & EVP_CIPH_VARIABLE_LENGTH)) { if ((keylen > 0) && (c->cipher->flags & EVP_CIPH_VARIABLE_LENGTH)) {
c->key_len = keylen; c->key_len = keylen;
@ -1257,7 +1257,7 @@ const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher)
{ {
if (cipher != NULL && cipher->gettable_params != NULL) if (cipher != NULL && cipher->gettable_params != NULL)
return cipher->gettable_params( return cipher->gettable_params(
ossl_provider_ctx(EVP_CIPHER_provider(cipher))); ossl_provider_ctx(EVP_CIPHER_get0_provider(cipher)));
return NULL; return NULL;
} }
@ -1266,7 +1266,7 @@ const OSSL_PARAM *EVP_CIPHER_settable_ctx_params(const EVP_CIPHER *cipher)
void *provctx; void *provctx;
if (cipher != NULL && cipher->settable_ctx_params != NULL) { if (cipher != NULL && cipher->settable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_CIPHER_provider(cipher)); provctx = ossl_provider_ctx(EVP_CIPHER_get0_provider(cipher));
return cipher->settable_ctx_params(NULL, provctx); return cipher->settable_ctx_params(NULL, provctx);
} }
return NULL; return NULL;
@ -1277,7 +1277,7 @@ const OSSL_PARAM *EVP_CIPHER_gettable_ctx_params(const EVP_CIPHER *cipher)
void *provctx; void *provctx;
if (cipher != NULL && cipher->gettable_ctx_params != NULL) { if (cipher != NULL && cipher->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_CIPHER_provider(cipher)); provctx = ossl_provider_ctx(EVP_CIPHER_get0_provider(cipher));
return cipher->gettable_ctx_params(NULL, provctx); return cipher->gettable_ctx_params(NULL, provctx);
} }
return NULL; return NULL;
@ -1288,7 +1288,7 @@ const OSSL_PARAM *EVP_CIPHER_CTX_settable_params(EVP_CIPHER_CTX *cctx)
void *alg; void *alg;
if (cctx != NULL && cctx->cipher->settable_ctx_params != NULL) { if (cctx != NULL && cctx->cipher->settable_ctx_params != NULL) {
alg = ossl_provider_ctx(EVP_CIPHER_provider(cctx->cipher)); alg = ossl_provider_ctx(EVP_CIPHER_get0_provider(cctx->cipher));
return cctx->cipher->settable_ctx_params(cctx->algctx, alg); return cctx->cipher->settable_ctx_params(cctx->algctx, alg);
} }
return NULL; return NULL;
@ -1299,7 +1299,7 @@ const OSSL_PARAM *EVP_CIPHER_CTX_gettable_params(EVP_CIPHER_CTX *cctx)
void *provctx; void *provctx;
if (cctx != NULL && cctx->cipher->gettable_ctx_params != NULL) { if (cctx != NULL && cctx->cipher->gettable_ctx_params != NULL) {
provctx = ossl_provider_ctx(EVP_CIPHER_provider(cctx->cipher)); provctx = ossl_provider_ctx(EVP_CIPHER_get0_provider(cctx->cipher));
return cctx->cipher->gettable_ctx_params(cctx->algctx, provctx); return cctx->cipher->gettable_ctx_params(cctx->algctx, provctx);
} }
return NULL; return NULL;
@ -1314,7 +1314,7 @@ static OSSL_LIB_CTX *EVP_CIPHER_CTX_get_libctx(EVP_CIPHER_CTX *ctx)
if (cipher == NULL) if (cipher == NULL)
return NULL; return NULL;
prov = EVP_CIPHER_provider(cipher); prov = EVP_CIPHER_get0_provider(cipher);
return ossl_provider_libctx(prov); return ossl_provider_libctx(prov);
} }
#endif #endif
@ -1331,7 +1331,7 @@ int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key)
int kl; int kl;
OSSL_LIB_CTX *libctx = EVP_CIPHER_CTX_get_libctx(ctx); OSSL_LIB_CTX *libctx = EVP_CIPHER_CTX_get_libctx(ctx);
kl = EVP_CIPHER_CTX_key_length(ctx); kl = EVP_CIPHER_CTX_get_key_length(ctx);
if (kl <= 0 || RAND_priv_bytes_ex(libctx, key, kl, 0) <= 0) if (kl <= 0 || RAND_priv_bytes_ex(libctx, key, kl, 0) <= 0)
return 0; return 0;
return 1; return 1;
@ -1442,7 +1442,7 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid)
return; return;
if (legacy_method == NULL) if (legacy_method == NULL)
return; return;
nid = EVP_CIPHER_nid(legacy_method); nid = EVP_CIPHER_get_nid(legacy_method);
if (*legacy_nid != NID_undef && *legacy_nid != nid) { if (*legacy_nid != NID_undef && *legacy_nid != nid) {
*legacy_nid = -1; *legacy_nid = -1;
return; return;

6
crypto/evp/evp_key.c
View file

@ -85,8 +85,8 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
int niv, nkey, addmd = 0; int niv, nkey, addmd = 0;
unsigned int mds = 0, i; unsigned int mds = 0, i;
int rv = 0; int rv = 0;
nkey = EVP_CIPHER_key_length(type); nkey = EVP_CIPHER_get_key_length(type);
niv = EVP_CIPHER_iv_length(type); niv = EVP_CIPHER_get_iv_length(type);
OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH); OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH);
OPENSSL_assert(niv <= EVP_MAX_IV_LENGTH); OPENSSL_assert(niv <= EVP_MAX_IV_LENGTH);
@ -146,7 +146,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
if ((nkey == 0) && (niv == 0)) if ((nkey == 0) && (niv == 0))
break; break;
} }
rv = EVP_CIPHER_key_length(type); rv = EVP_CIPHER_get_key_length(type);
err: err:
EVP_MD_CTX_free(c); EVP_MD_CTX_free(c);
OPENSSL_cleanse(md_buf, sizeof(md_buf)); OPENSSL_cleanse(md_buf, sizeof(md_buf));

90
crypto/evp/evp_lib.c
View file

@ -49,7 +49,7 @@ int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *ctx, ASN1_TYPE *type)
if (type != NULL) { if (type != NULL) {
unsigned char iv[EVP_MAX_IV_LENGTH]; unsigned char iv[EVP_MAX_IV_LENGTH];
l = EVP_CIPHER_CTX_iv_length(ctx); l = EVP_CIPHER_CTX_get_iv_length(ctx);
if (!ossl_assert(l <= sizeof(iv))) if (!ossl_assert(l <= sizeof(iv)))
return -1; return -1;
i = ASN1_TYPE_get_octetstring(type, iv, l); i = ASN1_TYPE_get_octetstring(type, iv, l);
@ -70,7 +70,7 @@ int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
if (type != NULL) { if (type != NULL) {
oiv = (unsigned char *)EVP_CIPHER_CTX_original_iv(c); oiv = (unsigned char *)EVP_CIPHER_CTX_original_iv(c);
j = EVP_CIPHER_CTX_iv_length(c); j = EVP_CIPHER_CTX_get_iv_length(c);
OPENSSL_assert(j <= sizeof(c->iv)); OPENSSL_assert(j <= sizeof(c->iv));
i = ASN1_TYPE_set_octetstring(type, oiv, j); i = ASN1_TYPE_set_octetstring(type, oiv, j);
} }
@ -101,8 +101,8 @@ int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
*/ */
if (cipher->set_asn1_parameters != NULL) { if (cipher->set_asn1_parameters != NULL) {
ret = cipher->set_asn1_parameters(c, type); ret = cipher->set_asn1_parameters(c, type);
} else if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_CUSTOM_ASN1) == 0) { } else if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_CUSTOM_ASN1) == 0) {
switch (EVP_CIPHER_mode(cipher)) { switch (EVP_CIPHER_get_mode(cipher)) {
case EVP_CIPH_WRAP_MODE: case EVP_CIPH_WRAP_MODE:
if (EVP_CIPHER_is_a(cipher, SN_id_smime_alg_CMS3DESwrap)) if (EVP_CIPHER_is_a(cipher, SN_id_smime_alg_CMS3DESwrap))
ASN1_TYPE_set(type, V_ASN1_NULL, NULL); ASN1_TYPE_set(type, V_ASN1_NULL, NULL);
@ -192,8 +192,8 @@ int evp_cipher_asn1_to_param_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
*/ */
if (cipher->get_asn1_parameters != NULL) { if (cipher->get_asn1_parameters != NULL) {
ret = cipher->get_asn1_parameters(c, type); ret = cipher->get_asn1_parameters(c, type);
} else if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_CUSTOM_ASN1) == 0) { } else if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_CUSTOM_ASN1) == 0) {
switch (EVP_CIPHER_mode(cipher)) { switch (EVP_CIPHER_get_mode(cipher)) {
case EVP_CIPH_WRAP_MODE: case EVP_CIPH_WRAP_MODE:
ret = 1; ret = 1;
break; break;
@ -273,10 +273,10 @@ int evp_cipher_set_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
#endif /* !defined(FIPS_MODULE) */ #endif /* !defined(FIPS_MODULE) */
/* Convert the various cipher NIDs and dummies to a proper OID NID */ /* Convert the various cipher NIDs and dummies to a proper OID NID */
int EVP_CIPHER_type(const EVP_CIPHER *cipher) int EVP_CIPHER_get_type(const EVP_CIPHER *cipher)
{ {
int nid; int nid;
nid = EVP_CIPHER_nid(cipher); nid = EVP_CIPHER_get_nid(cipher);
switch (nid) { switch (nid) {
@ -381,14 +381,14 @@ int evp_cipher_cache_constants(EVP_CIPHER *cipher)
return ok; return ok;
} }
int EVP_CIPHER_block_size(const EVP_CIPHER *cipher) int EVP_CIPHER_get_block_size(const EVP_CIPHER *cipher)
{ {
return cipher->block_size; return cipher->block_size;
} }
int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx) int EVP_CIPHER_CTX_get_block_size(const EVP_CIPHER_CTX *ctx)
{ {
return EVP_CIPHER_block_size(ctx->cipher); return EVP_CIPHER_get_block_size(ctx->cipher);
} }
int EVP_CIPHER_impl_ctx_size(const EVP_CIPHER *e) int EVP_CIPHER_impl_ctx_size(const EVP_CIPHER *e)
@ -409,7 +409,7 @@ int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
*/ */
int ret = -1; int ret = -1;
size_t outl = 0; size_t outl = 0;
size_t blocksize = EVP_CIPHER_CTX_block_size(ctx); size_t blocksize = EVP_CIPHER_CTX_get_block_size(ctx);
if (ctx->cipher->ccipher != NULL) if (ctx->cipher->ccipher != NULL)
ret = ctx->cipher->ccipher(ctx->algctx, out, &outl, ret = ctx->cipher->ccipher(ctx->algctx, out, &outl,
@ -458,12 +458,12 @@ EVP_CIPHER *EVP_CIPHER_CTX_get1_cipher(EVP_CIPHER_CTX *ctx)
return cipher; return cipher;
} }
int EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx) int EVP_CIPHER_CTX_is_encrypting(const EVP_CIPHER_CTX *ctx)
{ {
return ctx->encrypt; return ctx->encrypt;
} }
unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher) unsigned long EVP_CIPHER_get_flags(const EVP_CIPHER *cipher)
{ {
return cipher->flags; return cipher->flags;
} }
@ -493,14 +493,14 @@ void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data)
return old_cipher_data; return old_cipher_data;
} }
int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher) int EVP_CIPHER_get_iv_length(const EVP_CIPHER *cipher)
{ {
return cipher->iv_len; return cipher->iv_len;
} }
int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx) int EVP_CIPHER_CTX_get_iv_length(const EVP_CIPHER_CTX *ctx)
{ {
int rv, len = EVP_CIPHER_iv_length(ctx->cipher); int rv, len = EVP_CIPHER_get_iv_length(ctx->cipher);
size_t v = len; size_t v = len;
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END }; OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
@ -511,7 +511,7 @@ int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
return rv != 0 ? (int)v : -1; return rv != 0 ? (int)v : -1;
/* Code below to be removed when legacy support is dropped. */ /* Code below to be removed when legacy support is dropped. */
legacy: legacy:
if ((EVP_CIPHER_flags(ctx->cipher) & EVP_CIPH_CUSTOM_IV_LENGTH) != 0) { if ((EVP_CIPHER_get_flags(ctx->cipher) & EVP_CIPH_CUSTOM_IV_LENGTH) != 0) {
rv = EVP_CIPHER_CTX_ctrl((EVP_CIPHER_CTX *)ctx, EVP_CTRL_GET_IVLEN, rv = EVP_CIPHER_CTX_ctrl((EVP_CIPHER_CTX *)ctx, EVP_CTRL_GET_IVLEN,
0, &len); 0, &len);
return (rv == 1) ? len : -1; return (rv == 1) ? len : -1;
@ -519,7 +519,7 @@ legacy:
return len; return len;
} }
int EVP_CIPHER_CTX_tag_length(const EVP_CIPHER_CTX *ctx) int EVP_CIPHER_CTX_get_tag_length(const EVP_CIPHER_CTX *ctx)
{ {
int ret; int ret;
size_t v = 0; size_t v = 0;
@ -600,7 +600,7 @@ unsigned char *EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx)
return ctx->buf; return ctx->buf;
} }
int EVP_CIPHER_CTX_num(const EVP_CIPHER_CTX *ctx) int EVP_CIPHER_CTX_get_num(const EVP_CIPHER_CTX *ctx)
{ {
int ok; int ok;
unsigned int v = (unsigned int)ctx->num; unsigned int v = (unsigned int)ctx->num;
@ -626,12 +626,12 @@ int EVP_CIPHER_CTX_set_num(EVP_CIPHER_CTX *ctx, int num)
return ok != 0; return ok != 0;
} }
int EVP_CIPHER_key_length(const EVP_CIPHER *cipher) int EVP_CIPHER_get_key_length(const EVP_CIPHER *cipher)
{ {
return cipher->key_len; return cipher->key_len;
} }
int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx) int EVP_CIPHER_CTX_get_key_length(const EVP_CIPHER_CTX *ctx)
{ {
int ok; int ok;
size_t v = ctx->key_len; size_t v = ctx->key_len;
@ -643,12 +643,12 @@ int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
return ok != 0 ? (int)v : EVP_CTRL_RET_UNSUPPORTED; return ok != 0 ? (int)v : EVP_CTRL_RET_UNSUPPORTED;
} }
int EVP_CIPHER_nid(const EVP_CIPHER *cipher) int EVP_CIPHER_get_nid(const EVP_CIPHER *cipher)
{ {
return cipher->nid; return cipher->nid;
} }
int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx) int EVP_CIPHER_CTX_get_nid(const EVP_CIPHER_CTX *ctx)
{ {
return ctx->cipher->nid; return ctx->cipher->nid;
} }
@ -657,31 +657,31 @@ int EVP_CIPHER_is_a(const EVP_CIPHER *cipher, const char *name)
{ {
if (cipher->prov != NULL) if (cipher->prov != NULL)
return evp_is_a(cipher->prov, cipher->name_id, NULL, name); return evp_is_a(cipher->prov, cipher->name_id, NULL, name);
return evp_is_a(NULL, 0, EVP_CIPHER_name(cipher), name); return evp_is_a(NULL, 0, EVP_CIPHER_get0_name(cipher), name);
} }
int EVP_CIPHER_number(const EVP_CIPHER *cipher) int EVP_CIPHER_get_number(const EVP_CIPHER *cipher)
{ {
return cipher->name_id; return cipher->name_id;
} }
const char *EVP_CIPHER_name(const EVP_CIPHER *cipher) const char *EVP_CIPHER_get0_name(const EVP_CIPHER *cipher)
{ {
if (cipher->type_name != NULL) if (cipher->type_name != NULL)
return cipher->type_name; return cipher->type_name;
#ifndef FIPS_MODULE #ifndef FIPS_MODULE
return OBJ_nid2sn(EVP_CIPHER_nid(cipher)); return OBJ_nid2sn(EVP_CIPHER_get_nid(cipher));
#else #else
return NULL; return NULL;
#endif #endif
} }
const char *EVP_CIPHER_description(const EVP_CIPHER *cipher) const char *EVP_CIPHER_get0_description(const EVP_CIPHER *cipher)
{ {
if (cipher->description != NULL) if (cipher->description != NULL)
return cipher->description; return cipher->description;
#ifndef FIPS_MODULE #ifndef FIPS_MODULE
return OBJ_nid2ln(EVP_CIPHER_nid(cipher)); return OBJ_nid2ln(EVP_CIPHER_get_nid(cipher));
#else #else
return NULL; return NULL;
#endif #endif
@ -697,29 +697,29 @@ int EVP_CIPHER_names_do_all(const EVP_CIPHER *cipher,
return 1; return 1;
} }
const OSSL_PROVIDER *EVP_CIPHER_provider(const EVP_CIPHER *cipher) const OSSL_PROVIDER *EVP_CIPHER_get0_provider(const EVP_CIPHER *cipher)
{ {
return cipher->prov; return cipher->prov;
} }
int EVP_CIPHER_mode(const EVP_CIPHER *cipher) int EVP_CIPHER_get_mode(const EVP_CIPHER *cipher)
{ {
return EVP_CIPHER_flags(cipher) & EVP_CIPH_MODE; return EVP_CIPHER_get_flags(cipher) & EVP_CIPH_MODE;
} }
int EVP_MD_is_a(const EVP_MD *md, const char *name) int EVP_MD_is_a(const EVP_MD *md, const char *name)
{ {
if (md->prov != NULL) if (md->prov != NULL)
return evp_is_a(md->prov, md->name_id, NULL, name); return evp_is_a(md->prov, md->name_id, NULL, name);
return evp_is_a(NULL, 0, EVP_MD_name(md), name); return evp_is_a(NULL, 0, EVP_MD_get0_name(md), name);
} }
int EVP_MD_number(const EVP_MD *md) int EVP_MD_get_number(const EVP_MD *md)
{ {
return md->name_id; return md->name_id;
} }
const char *EVP_MD_description(const EVP_MD *md) const char *EVP_MD_get0_description(const EVP_MD *md)
{ {
if (md->description != NULL) if (md->description != NULL)
return md->description; return md->description;
@ -730,7 +730,7 @@ const char *EVP_MD_description(const EVP_MD *md)
#endif #endif
} }
const char *EVP_MD_name(const EVP_MD *md) const char *EVP_MD_get0_name(const EVP_MD *md)
{ {
if (md == NULL) if (md == NULL)
return NULL; return NULL;
@ -753,22 +753,22 @@ int EVP_MD_names_do_all(const EVP_MD *md,
return 1; return 1;
} }
const OSSL_PROVIDER *EVP_MD_provider(const EVP_MD *md) const OSSL_PROVIDER *EVP_MD_get0_provider(const EVP_MD *md)
{ {
return md->prov; return md->prov;
} }
int EVP_MD_type(const EVP_MD *md) int EVP_MD_get_type(const EVP_MD *md)
{ {
return md->type; return md->type;
} }
int EVP_MD_pkey_type(const EVP_MD *md) int EVP_MD_get_pkey_type(const EVP_MD *md)
{ {
return md->pkey_type; return md->pkey_type;
} }
int EVP_MD_block_size(const EVP_MD *md) int EVP_MD_get_block_size(const EVP_MD *md)
{ {
if (md == NULL) { if (md == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_MESSAGE_DIGEST_IS_NULL); ERR_raise(ERR_LIB_EVP, EVP_R_MESSAGE_DIGEST_IS_NULL);
@ -777,7 +777,7 @@ int EVP_MD_block_size(const EVP_MD *md)
return md->block_size; return md->block_size;
} }
int EVP_MD_size(const EVP_MD *md) int EVP_MD_get_size(const EVP_MD *md)
{ {
if (md == NULL) { if (md == NULL) {
ERR_raise(ERR_LIB_EVP, EVP_R_MESSAGE_DIGEST_IS_NULL); ERR_raise(ERR_LIB_EVP, EVP_R_MESSAGE_DIGEST_IS_NULL);
@ -786,7 +786,7 @@ int EVP_MD_size(const EVP_MD *md)
return md->md_size; return md->md_size;
} }
unsigned long EVP_MD_flags(const EVP_MD *md) unsigned long EVP_MD_get_flags(const EVP_MD *md)
{ {
return md->flags; return md->flags;
} }
@ -999,7 +999,7 @@ EVP_MD *EVP_MD_CTX_get1_md(EVP_MD_CTX *ctx)
return md; return md;
} }
EVP_PKEY_CTX *EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx) EVP_PKEY_CTX *EVP_MD_CTX_get_pkey_ctx(const EVP_MD_CTX *ctx)
{ {
return ctx->pctx; return ctx->pctx;
} }
@ -1025,7 +1025,7 @@ void EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx)
} }
#endif /* !defined(FIPS_MODULE) */ #endif /* !defined(FIPS_MODULE) */
void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx) void *EVP_MD_CTX_get0_md_data(const EVP_MD_CTX *ctx)
{ {
return ctx->md_data; return ctx->md_data;
} }

2
crypto/evp/evp_local.h
View file

@ -325,7 +325,7 @@ OSSL_PARAM *evp_pkey_to_param(EVP_PKEY *pkey, size_t *sz);
#define M_check_autoarg(ctx, arg, arglen, err) \ #define M_check_autoarg(ctx, arg, arglen, err) \
if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) { \ if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) { \
size_t pksize = (size_t)EVP_PKEY_size(ctx->pkey); \ size_t pksize = (size_t)EVP_PKEY_get_size(ctx->pkey); \
\ \
if (pksize == 0) { \ if (pksize == 0) { \
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY); /*ckerr_ignore*/ \ ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY); /*ckerr_ignore*/ \

4
crypto/evp/evp_pbe.c
View file

@ -226,11 +226,11 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
int cipher_nid, md_nid; int cipher_nid, md_nid;
if (cipher) if (cipher)
cipher_nid = EVP_CIPHER_nid(cipher); cipher_nid = EVP_CIPHER_get_nid(cipher);
else else
cipher_nid = -1; cipher_nid = -1;
if (md) if (md)
md_nid = EVP_MD_type(md); md_nid = EVP_MD_get_type(md);
else else
md_nid = -1; md_nid = -1;

2
crypto/evp/evp_pkey.c
View file

@ -225,7 +225,7 @@ const char *EVP_PKEY_get0_type_name(const EVP_PKEY *key)
const char *name = NULL; const char *name = NULL;
if (key->keymgmt != NULL) if (key->keymgmt != NULL)
return EVP_KEYMGMT_name(key->keymgmt); return EVP_KEYMGMT_get0_name(key->keymgmt);
/* Otherwise fallback to legacy */ /* Otherwise fallback to legacy */
ameth = EVP_PKEY_get0_asn1(key); ameth = EVP_PKEY_get0_asn1(key);

24
crypto/evp/evp_rand.c
View file

@ -293,17 +293,17 @@ void EVP_RAND_free(EVP_RAND *rand)
evp_rand_free(rand); evp_rand_free(rand);
} }
int EVP_RAND_number(const EVP_RAND *rand) int EVP_RAND_get_number(const EVP_RAND *rand)
{ {
return rand->name_id; return rand->name_id;
} }
const char *EVP_RAND_name(const EVP_RAND *rand) const char *EVP_RAND_get0_name(const EVP_RAND *rand)
{ {
return rand->type_name; return rand->type_name;
} }
const char *EVP_RAND_description(const EVP_RAND *rand) const char *EVP_RAND_get0_description(const EVP_RAND *rand)
{ {
return rand->description; return rand->description;
} }
@ -313,7 +313,7 @@ int EVP_RAND_is_a(const EVP_RAND *rand, const char *name)
return evp_is_a(rand->prov, rand->name_id, NULL, name); return evp_is_a(rand->prov, rand->name_id, NULL, name);
} }
const OSSL_PROVIDER *EVP_RAND_provider(const EVP_RAND *rand) const OSSL_PROVIDER *EVP_RAND_get0_provider(const EVP_RAND *rand)
{ {
return rand->prov; return rand->prov;
} }
@ -395,7 +395,7 @@ void EVP_RAND_CTX_free(EVP_RAND_CTX *ctx)
EVP_RAND_CTX_free(parent); EVP_RAND_CTX_free(parent);
} }
EVP_RAND *EVP_RAND_CTX_rand(EVP_RAND_CTX *ctx) EVP_RAND *EVP_RAND_CTX_get0_rand(EVP_RAND_CTX *ctx)
{ {
return ctx->meth; return ctx->meth;
} }
@ -440,7 +440,7 @@ const OSSL_PARAM *EVP_RAND_gettable_params(const EVP_RAND *rand)
{ {
if (rand->gettable_params == NULL) if (rand->gettable_params == NULL)
return NULL; return NULL;
return rand->gettable_params(ossl_provider_ctx(EVP_RAND_provider(rand))); return rand->gettable_params(ossl_provider_ctx(EVP_RAND_get0_provider(rand)));
} }
const OSSL_PARAM *EVP_RAND_gettable_ctx_params(const EVP_RAND *rand) const OSSL_PARAM *EVP_RAND_gettable_ctx_params(const EVP_RAND *rand)
@ -449,7 +449,7 @@ const OSSL_PARAM *EVP_RAND_gettable_ctx_params(const EVP_RAND *rand)
if (rand->gettable_ctx_params == NULL) if (rand->gettable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_RAND_provider(rand)); provctx = ossl_provider_ctx(EVP_RAND_get0_provider(rand));
return rand->gettable_ctx_params(NULL, provctx); return rand->gettable_ctx_params(NULL, provctx);
} }
@ -459,7 +459,7 @@ const OSSL_PARAM *EVP_RAND_settable_ctx_params(const EVP_RAND *rand)
if (rand->settable_ctx_params == NULL) if (rand->settable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_RAND_provider(rand)); provctx = ossl_provider_ctx(EVP_RAND_get0_provider(rand));
return rand->settable_ctx_params(NULL, provctx); return rand->settable_ctx_params(NULL, provctx);
} }
@ -469,7 +469,7 @@ const OSSL_PARAM *EVP_RAND_CTX_gettable_params(EVP_RAND_CTX *ctx)
if (ctx->meth->gettable_ctx_params == NULL) if (ctx->meth->gettable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_RAND_provider(ctx->meth)); provctx = ossl_provider_ctx(EVP_RAND_get0_provider(ctx->meth));
return ctx->meth->gettable_ctx_params(ctx->algctx, provctx); return ctx->meth->gettable_ctx_params(ctx->algctx, provctx);
} }
@ -479,7 +479,7 @@ const OSSL_PARAM *EVP_RAND_CTX_settable_params(EVP_RAND_CTX *ctx)
if (ctx->meth->settable_ctx_params == NULL) if (ctx->meth->settable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_RAND_provider(ctx->meth)); provctx = ossl_provider_ctx(EVP_RAND_get0_provider(ctx->meth));
return ctx->meth->settable_ctx_params(ctx->algctx, provctx); return ctx->meth->settable_ctx_params(ctx->algctx, provctx);
} }
@ -622,7 +622,7 @@ static unsigned int evp_rand_strength_locked(EVP_RAND_CTX *ctx)
return strength; return strength;
} }
unsigned int EVP_RAND_strength(EVP_RAND_CTX *ctx) unsigned int EVP_RAND_get_strength(EVP_RAND_CTX *ctx)
{ {
unsigned int res; unsigned int res;
@ -656,7 +656,7 @@ int EVP_RAND_nonce(EVP_RAND_CTX *ctx, unsigned char *out, size_t outlen)
return res; return res;
} }
int EVP_RAND_state(EVP_RAND_CTX *ctx) int EVP_RAND_get_state(EVP_RAND_CTX *ctx)
{ {
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END }; OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
int state; int state;

16
crypto/evp/exchange.c
View file

@ -166,7 +166,7 @@ int EVP_KEYEXCH_up_ref(EVP_KEYEXCH *exchange)
return 1; return 1;
} }
OSSL_PROVIDER *EVP_KEYEXCH_provider(const EVP_KEYEXCH *exchange) OSSL_PROVIDER *EVP_KEYEXCH_get0_provider(const EVP_KEYEXCH *exchange)
{ {
return exchange->prov; return exchange->prov;
} }
@ -264,8 +264,8 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
exchange = EVP_KEYEXCH_fetch(ctx->libctx, supported_exch, ctx->propquery); exchange = EVP_KEYEXCH_fetch(ctx->libctx, supported_exch, ctx->propquery);
if (exchange == NULL if (exchange == NULL
|| (EVP_KEYMGMT_provider(ctx->keymgmt) || (EVP_KEYMGMT_get0_provider(ctx->keymgmt)
!= EVP_KEYEXCH_provider(exchange))) { != EVP_KEYEXCH_get0_provider(exchange))) {
/* /*
* We don't need to free ctx->keymgmt here, as it's not necessarily * We don't need to free ctx->keymgmt here, as it's not necessarily
* tied to this operation. It will be freed by EVP_PKEY_CTX_free(). * tied to this operation. It will be freed by EVP_PKEY_CTX_free().
@ -464,17 +464,17 @@ int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen)
return ctx->pmeth->derive(ctx, key, pkeylen); return ctx->pmeth->derive(ctx, key, pkeylen);
} }
int EVP_KEYEXCH_number(const EVP_KEYEXCH *keyexch) int EVP_KEYEXCH_get_number(const EVP_KEYEXCH *keyexch)
{ {
return keyexch->name_id; return keyexch->name_id;
} }
const char *EVP_KEYEXCH_name(const EVP_KEYEXCH *keyexch) const char *EVP_KEYEXCH_get0_name(const EVP_KEYEXCH *keyexch)
{ {
return keyexch->type_name; return keyexch->type_name;
} }
const char *EVP_KEYEXCH_description(const EVP_KEYEXCH *keyexch) const char *EVP_KEYEXCH_get0_description(const EVP_KEYEXCH *keyexch)
{ {
return keyexch->description; return keyexch->description;
} }
@ -511,7 +511,7 @@ const OSSL_PARAM *EVP_KEYEXCH_gettable_ctx_params(const EVP_KEYEXCH *keyexch)
if (keyexch == NULL || keyexch->gettable_ctx_params == NULL) if (keyexch == NULL || keyexch->gettable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_KEYEXCH_provider(keyexch)); provctx = ossl_provider_ctx(EVP_KEYEXCH_get0_provider(keyexch));
return keyexch->gettable_ctx_params(NULL, provctx); return keyexch->gettable_ctx_params(NULL, provctx);
} }
@ -521,6 +521,6 @@ const OSSL_PARAM *EVP_KEYEXCH_settable_ctx_params(const EVP_KEYEXCH *keyexch)
if (keyexch == NULL || keyexch->settable_ctx_params == NULL) if (keyexch == NULL || keyexch->settable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_KEYEXCH_provider(keyexch)); provctx = ossl_provider_ctx(EVP_KEYEXCH_get0_provider(keyexch));
return keyexch->settable_ctx_params(NULL, provctx); return keyexch->settable_ctx_params(NULL, provctx);
} }

8
crypto/evp/kdf_lib.c
View file

@ -83,17 +83,17 @@ EVP_KDF_CTX *EVP_KDF_CTX_dup(const EVP_KDF_CTX *src)
return dst; return dst;
} }
int EVP_KDF_number(const EVP_KDF *kdf) int EVP_KDF_get_number(const EVP_KDF *kdf)
{ {
return kdf->name_id; return kdf->name_id;
} }
const char *EVP_KDF_name(const EVP_KDF *kdf) const char *EVP_KDF_get0_name(const EVP_KDF *kdf)
{ {
return kdf->type_name; return kdf->type_name;
} }
const char *EVP_KDF_description(const EVP_KDF *kdf) const char *EVP_KDF_get0_description(const EVP_KDF *kdf)
{ {
return kdf->description; return kdf->description;
} }
@ -103,7 +103,7 @@ int EVP_KDF_is_a(const EVP_KDF *kdf, const char *name)
return evp_is_a(kdf->prov, kdf->name_id, NULL, name); return evp_is_a(kdf->prov, kdf->name_id, NULL, name);
} }
const OSSL_PROVIDER *EVP_KDF_provider(const EVP_KDF *kdf) const OSSL_PROVIDER *EVP_KDF_get0_provider(const EVP_KDF *kdf)
{ {
return kdf->prov; return kdf->prov;
} }

10
crypto/evp/kdf_meth.c
View file

@ -179,7 +179,7 @@ const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf)
{ {
if (kdf->gettable_params == NULL) if (kdf->gettable_params == NULL)
return NULL; return NULL;
return kdf->gettable_params(ossl_provider_ctx(EVP_KDF_provider(kdf))); return kdf->gettable_params(ossl_provider_ctx(EVP_KDF_get0_provider(kdf)));
} }
const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf) const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf)
@ -188,7 +188,7 @@ const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf)
if (kdf->gettable_ctx_params == NULL) if (kdf->gettable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_KDF_provider(kdf)); alg = ossl_provider_ctx(EVP_KDF_get0_provider(kdf));
return kdf->gettable_ctx_params(NULL, alg); return kdf->gettable_ctx_params(NULL, alg);
} }
@ -198,7 +198,7 @@ const OSSL_PARAM *EVP_KDF_settable_ctx_params(const EVP_KDF *kdf)
if (kdf->settable_ctx_params == NULL) if (kdf->settable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_KDF_provider(kdf)); alg = ossl_provider_ctx(EVP_KDF_get0_provider(kdf));
return kdf->settable_ctx_params(NULL, alg); return kdf->settable_ctx_params(NULL, alg);
} }
@ -208,7 +208,7 @@ const OSSL_PARAM *EVP_KDF_CTX_gettable_params(EVP_KDF_CTX *ctx)
if (ctx->meth->gettable_ctx_params == NULL) if (ctx->meth->gettable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_KDF_provider(ctx->meth)); alg = ossl_provider_ctx(EVP_KDF_get0_provider(ctx->meth));
return ctx->meth->gettable_ctx_params(ctx->algctx, alg); return ctx->meth->gettable_ctx_params(ctx->algctx, alg);
} }
@ -218,7 +218,7 @@ const OSSL_PARAM *EVP_KDF_CTX_settable_params(EVP_KDF_CTX *ctx)
if (ctx->meth->settable_ctx_params == NULL) if (ctx->meth->settable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_KDF_provider(ctx->meth)); alg = ossl_provider_ctx(EVP_KDF_get0_provider(ctx->meth));
return ctx->meth->settable_ctx_params(ctx->algctx, alg); return ctx->meth->settable_ctx_params(ctx->algctx, alg);
} }

14
crypto/evp/kem.c
View file

@ -60,7 +60,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
kem = EVP_KEM_fetch(ctx->libctx, supported_kem, ctx->propquery); kem = EVP_KEM_fetch(ctx->libctx, supported_kem, ctx->propquery);
if (kem == NULL if (kem == NULL
|| (EVP_KEYMGMT_provider(ctx->keymgmt) != EVP_KEM_provider(kem))) { || (EVP_KEYMGMT_get0_provider(ctx->keymgmt) != EVP_KEM_get0_provider(kem))) {
ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE); ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
ret = -2; ret = -2;
goto err; goto err;
@ -324,7 +324,7 @@ int EVP_KEM_up_ref(EVP_KEM *kem)
return 1; return 1;
} }
OSSL_PROVIDER *EVP_KEM_provider(const EVP_KEM *kem) OSSL_PROVIDER *EVP_KEM_get0_provider(const EVP_KEM *kem)
{ {
return kem->prov; return kem->prov;
} }
@ -343,17 +343,17 @@ int EVP_KEM_is_a(const EVP_KEM *kem, const char *name)
return evp_is_a(kem->prov, kem->name_id, NULL, name); return evp_is_a(kem->prov, kem->name_id, NULL, name);
} }
int EVP_KEM_number(const EVP_KEM *kem) int EVP_KEM_get_number(const EVP_KEM *kem)
{ {
return kem->name_id; return kem->name_id;
} }
const char *EVP_KEM_name(const EVP_KEM *kem) const char *EVP_KEM_get0_name(const EVP_KEM *kem)
{ {
return kem->type_name; return kem->type_name;
} }
const char *EVP_KEM_description(const EVP_KEM *kem) const char *EVP_KEM_get0_description(const EVP_KEM *kem)
{ {
return kem->description; return kem->description;
} }
@ -384,7 +384,7 @@ const OSSL_PARAM *EVP_KEM_gettable_ctx_params(const EVP_KEM *kem)
if (kem == NULL || kem->gettable_ctx_params == NULL) if (kem == NULL || kem->gettable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_KEM_provider(kem)); provctx = ossl_provider_ctx(EVP_KEM_get0_provider(kem));
return kem->gettable_ctx_params(NULL, provctx); return kem->gettable_ctx_params(NULL, provctx);
} }
@ -395,6 +395,6 @@ const OSSL_PARAM *EVP_KEM_settable_ctx_params(const EVP_KEM *kem)
if (kem == NULL || kem->settable_ctx_params == NULL) if (kem == NULL || kem->settable_ctx_params == NULL)
return NULL; return NULL;
provctx = ossl_provider_ctx(EVP_KEM_provider(kem)); provctx = ossl_provider_ctx(EVP_KEM_get0_provider(kem));
return kem->settable_ctx_params(NULL, provctx); return kem->settable_ctx_params(NULL, provctx);
} }

4
crypto/evp/keymgmt_lib.c
View file

@ -22,7 +22,7 @@
*/ */
static int match_type(const EVP_KEYMGMT *keymgmt1, const EVP_KEYMGMT *keymgmt2) static int match_type(const EVP_KEYMGMT *keymgmt1, const EVP_KEYMGMT *keymgmt2)
{ {
const char *name2 = EVP_KEYMGMT_name(keymgmt2); const char *name2 = EVP_KEYMGMT_get0_name(keymgmt2);
return EVP_KEYMGMT_is_a(keymgmt1, name2); return EVP_KEYMGMT_is_a(keymgmt1, name2);
} }
@ -278,7 +278,7 @@ void evp_keymgmt_util_cache_keyinfo(EVP_PKEY *pk)
/* /*
* Cache information about the provider "origin" key. * Cache information about the provider "origin" key.
* *
* This services functions like EVP_PKEY_size, EVP_PKEY_bits, etc * This services functions like EVP_PKEY_get_size, EVP_PKEY_get_bits, etc
*/ */
if (pk->keydata != NULL) { if (pk->keydata != NULL) {
int bits = 0; int bits = 0;

18
crypto/evp/keymgmt_meth.c
View file

@ -246,22 +246,22 @@ void EVP_KEYMGMT_free(EVP_KEYMGMT *keymgmt)
OPENSSL_free(keymgmt); OPENSSL_free(keymgmt);
} }
const OSSL_PROVIDER *EVP_KEYMGMT_provider(const EVP_KEYMGMT *keymgmt) const OSSL_PROVIDER *EVP_KEYMGMT_get0_provider(const EVP_KEYMGMT *keymgmt)
{ {
return keymgmt->prov; return keymgmt->prov;
} }
int EVP_KEYMGMT_number(const EVP_KEYMGMT *keymgmt) int EVP_KEYMGMT_get_number(const EVP_KEYMGMT *keymgmt)
{ {
return keymgmt->name_id; return keymgmt->name_id;
} }
const char *EVP_KEYMGMT_description(const EVP_KEYMGMT *keymgmt) const char *EVP_KEYMGMT_get0_description(const EVP_KEYMGMT *keymgmt)
{ {
return keymgmt->description; return keymgmt->description;
} }
const char *EVP_KEYMGMT_name(const EVP_KEYMGMT *keymgmt) const char *EVP_KEYMGMT_get0_name(const EVP_KEYMGMT *keymgmt)
{ {
return keymgmt->type_name; return keymgmt->type_name;
} }
@ -296,7 +296,7 @@ int EVP_KEYMGMT_names_do_all(const EVP_KEYMGMT *keymgmt,
*/ */
void *evp_keymgmt_newdata(const EVP_KEYMGMT *keymgmt) void *evp_keymgmt_newdata(const EVP_KEYMGMT *keymgmt)
{ {
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt)); void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
/* /*
* 'new' is currently mandatory on its own, but when new * 'new' is currently mandatory on its own, but when new
@ -317,7 +317,7 @@ void evp_keymgmt_freedata(const EVP_KEYMGMT *keymgmt, void *keydata)
void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection, void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection,
const OSSL_PARAM params[]) const OSSL_PARAM params[])
{ {
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt)); void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
if (keymgmt->gen_init == NULL) if (keymgmt->gen_init == NULL)
return NULL; return NULL;
@ -348,7 +348,7 @@ int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx,
const OSSL_PARAM *EVP_KEYMGMT_gen_settable_params(const EVP_KEYMGMT *keymgmt) const OSSL_PARAM *EVP_KEYMGMT_gen_settable_params(const EVP_KEYMGMT *keymgmt)
{ {
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt)); void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
if (keymgmt->gen_settable_params == NULL) if (keymgmt->gen_settable_params == NULL)
return NULL; return NULL;
@ -387,7 +387,7 @@ int evp_keymgmt_get_params(const EVP_KEYMGMT *keymgmt, void *keydata,
const OSSL_PARAM *EVP_KEYMGMT_gettable_params(const EVP_KEYMGMT *keymgmt) const OSSL_PARAM *EVP_KEYMGMT_gettable_params(const EVP_KEYMGMT *keymgmt)
{ {
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt)); void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
if (keymgmt->gettable_params == NULL) if (keymgmt->gettable_params == NULL)
return NULL; return NULL;
@ -404,7 +404,7 @@ int evp_keymgmt_set_params(const EVP_KEYMGMT *keymgmt, void *keydata,
const OSSL_PARAM *EVP_KEYMGMT_settable_params(const EVP_KEYMGMT *keymgmt) const OSSL_PARAM *EVP_KEYMGMT_settable_params(const EVP_KEYMGMT *keymgmt)
{ {
void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt)); void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
if (keymgmt->settable_params == NULL) if (keymgmt->settable_params == NULL)
return NULL; return NULL;

2
crypto/evp/legacy_md5_sha1.c
View file

@ -21,7 +21,7 @@
IMPLEMENT_LEGACY_EVP_MD_METH_LC(md5_sha1_int, ossl_md5_sha1) IMPLEMENT_LEGACY_EVP_MD_METH_LC(md5_sha1_int, ossl_md5_sha1)
static int md5_sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int mslen, void *ms) static int md5_sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int mslen, void *ms)
{ {
return ossl_md5_sha1_ctrl(EVP_MD_CTX_md_data(ctx), cmd, mslen, ms); return ossl_md5_sha1_ctrl(EVP_MD_CTX_get0_md_data(ctx), cmd, mslen, ms);
} }
static const EVP_MD md5_sha1_md = { static const EVP_MD md5_sha1_md = {

12
crypto/evp/legacy_meth.h
View file

@ -10,29 +10,29 @@
#define IMPLEMENT_LEGACY_EVP_MD_METH(nm, fn) \ #define IMPLEMENT_LEGACY_EVP_MD_METH(nm, fn) \
static int nm##_init(EVP_MD_CTX *ctx) \ static int nm##_init(EVP_MD_CTX *ctx) \
{ \ { \
return fn##_Init(EVP_MD_CTX_md_data(ctx)); \ return fn##_Init(EVP_MD_CTX_get0_md_data(ctx)); \
} \ } \
static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \ static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
{ \ { \
return fn##_Update(EVP_MD_CTX_md_data(ctx), data, count); \ return fn##_Update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
} \ } \
static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \ static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
{ \ { \
return fn##_Final(md, EVP_MD_CTX_md_data(ctx)); \ return fn##_Final(md, EVP_MD_CTX_get0_md_data(ctx)); \
} }
#define IMPLEMENT_LEGACY_EVP_MD_METH_LC(nm, fn) \ #define IMPLEMENT_LEGACY_EVP_MD_METH_LC(nm, fn) \
static int nm##_init(EVP_MD_CTX *ctx) \ static int nm##_init(EVP_MD_CTX *ctx) \
{ \ { \
return fn##_init(EVP_MD_CTX_md_data(ctx)); \ return fn##_init(EVP_MD_CTX_get0_md_data(ctx)); \
} \ } \
static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \ static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
{ \ { \
return fn##_update(EVP_MD_CTX_md_data(ctx), data, count); \ return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
} \ } \
static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \ static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
{ \ { \
return fn##_final(md, EVP_MD_CTX_md_data(ctx)); \ return fn##_final(md, EVP_MD_CTX_get0_md_data(ctx)); \
} }

10
crypto/evp/legacy_sha.c
View file

@ -29,20 +29,20 @@
#define IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(nm, fn, tag) \ #define IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(nm, fn, tag) \
static int nm##_init(EVP_MD_CTX *ctx) \ static int nm##_init(EVP_MD_CTX *ctx) \
{ \ { \
return fn##_init(EVP_MD_CTX_md_data(ctx), tag, ctx->digest->md_size * 8); \ return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
} \ } \
static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \ static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
{ \ { \
return fn##_update(EVP_MD_CTX_md_data(ctx), data, count); \ return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
} \ } \
static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \ static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
{ \ { \
return fn##_final(md, EVP_MD_CTX_md_data(ctx)); \ return fn##_final(md, EVP_MD_CTX_get0_md_data(ctx)); \
} }
#define IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(nm, fn, tag) \ #define IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(nm, fn, tag) \
static int nm##_init(EVP_MD_CTX *ctx) \ static int nm##_init(EVP_MD_CTX *ctx) \
{ \ { \
return fn##_init(EVP_MD_CTX_md_data(ctx), tag, ctx->digest->md_size * 8); \ return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
} \ } \
#define sha512_224_Init sha512_224_init #define sha512_224_Init sha512_224_init
@ -65,7 +65,7 @@ IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(shake, ossl_sha3, '\x1f')
static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2) static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
{ {
return ossl_sha1_ctrl(ctx != NULL ? EVP_MD_CTX_md_data(ctx) : NULL, return ossl_sha1_ctrl(ctx != NULL ? EVP_MD_CTX_get0_md_data(ctx) : NULL,
cmd, p1, p2); cmd, p1, p2);
} }

8
crypto/evp/m_sigver.c
View file

@ -122,8 +122,8 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
locpctx->propquery); locpctx->propquery);
if (signature == NULL if (signature == NULL
|| (EVP_KEYMGMT_provider(locpctx->keymgmt) || (EVP_KEYMGMT_get0_provider(locpctx->keymgmt)
!= EVP_SIGNATURE_provider(signature))) { != EVP_SIGNATURE_get0_provider(signature))) {
/* /*
* We don't need to free ctx->keymgmt here, as it's not necessarily * We don't need to free ctx->keymgmt here, as it's not necessarily
* tied to this operation. It will be freed by EVP_PKEY_CTX_free(). * tied to this operation. It will be freed by EVP_PKEY_CTX_free().
@ -156,7 +156,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
if (type != NULL) { if (type != NULL) {
ctx->reqdigest = type; ctx->reqdigest = type;
if (mdname == NULL) if (mdname == NULL)
mdname = canon_mdname(EVP_MD_name(type)); mdname = canon_mdname(EVP_MD_get0_name(type));
} else { } else {
if (mdname == NULL) { if (mdname == NULL) {
if (evp_keymgmt_util_get_deflt_digest_name(tmp_keymgmt, provkey, if (evp_keymgmt_util_get_deflt_digest_name(tmp_keymgmt, provkey,
@ -475,7 +475,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
if (pctx->pmeth->signctx(pctx, sigret, siglen, ctx) <= 0) if (pctx->pmeth->signctx(pctx, sigret, siglen, ctx) <= 0)
return 0; return 0;
} else { } else {
int s = EVP_MD_size(ctx->digest); int s = EVP_MD_get_size(ctx->digest);
if (s < 0 || EVP_PKEY_sign(pctx, sigret, siglen, NULL, s) <= 0) if (s < 0 || EVP_PKEY_sign(pctx, sigret, siglen, NULL, s) <= 0)
return 0; return 0;

8
crypto/evp/mac_lib.c
View file

@ -77,7 +77,7 @@ EVP_MAC_CTX *EVP_MAC_CTX_dup(const EVP_MAC_CTX *src)
return dst; return dst;
} }
EVP_MAC *EVP_MAC_CTX_mac(EVP_MAC_CTX *ctx) EVP_MAC *EVP_MAC_CTX_get0_mac(EVP_MAC_CTX *ctx)
{ {
return ctx->meth; return ctx->meth;
} }
@ -203,17 +203,17 @@ int EVP_MAC_CTX_set_params(EVP_MAC_CTX *ctx, const OSSL_PARAM params[])
return 1; return 1;
} }
int EVP_MAC_number(const EVP_MAC *mac) int EVP_MAC_get_number(const EVP_MAC *mac)
{ {
return mac->name_id; return mac->name_id;
} }
const char *EVP_MAC_name(const EVP_MAC *mac) const char *EVP_MAC_get0_name(const EVP_MAC *mac)
{ {
return mac->type_name; return mac->type_name;
} }
const char *EVP_MAC_description(const EVP_MAC *mac) const char *EVP_MAC_get0_description(const EVP_MAC *mac)
{ {
return mac->description; return mac->description;
} }

12
crypto/evp/mac_meth.c
View file

@ -175,7 +175,7 @@ void EVP_MAC_free(EVP_MAC *mac)
evp_mac_free(mac); evp_mac_free(mac);
} }
const OSSL_PROVIDER *EVP_MAC_provider(const EVP_MAC *mac) const OSSL_PROVIDER *EVP_MAC_get0_provider(const EVP_MAC *mac)
{ {
return mac->prov; return mac->prov;
} }
@ -184,7 +184,7 @@ const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac)
{ {
if (mac->gettable_params == NULL) if (mac->gettable_params == NULL)
return NULL; return NULL;
return mac->gettable_params(ossl_provider_ctx(EVP_MAC_provider(mac))); return mac->gettable_params(ossl_provider_ctx(EVP_MAC_get0_provider(mac)));
} }
const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac) const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac)
@ -193,7 +193,7 @@ const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac)
if (mac->gettable_ctx_params == NULL) if (mac->gettable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_MAC_provider(mac)); alg = ossl_provider_ctx(EVP_MAC_get0_provider(mac));
return mac->gettable_ctx_params(NULL, alg); return mac->gettable_ctx_params(NULL, alg);
} }
@ -203,7 +203,7 @@ const OSSL_PARAM *EVP_MAC_settable_ctx_params(const EVP_MAC *mac)
if (mac->settable_ctx_params == NULL) if (mac->settable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_MAC_provider(mac)); alg = ossl_provider_ctx(EVP_MAC_get0_provider(mac));
return mac->settable_ctx_params(NULL, alg); return mac->settable_ctx_params(NULL, alg);
} }
@ -213,7 +213,7 @@ const OSSL_PARAM *EVP_MAC_CTX_gettable_params(EVP_MAC_CTX *ctx)
if (ctx->meth->gettable_ctx_params == NULL) if (ctx->meth->gettable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_MAC_provider(ctx->meth)); alg = ossl_provider_ctx(EVP_MAC_get0_provider(ctx->meth));
return ctx->meth->gettable_ctx_params(ctx->algctx, alg); return ctx->meth->gettable_ctx_params(ctx->algctx, alg);
} }
@ -223,7 +223,7 @@ const OSSL_PARAM *EVP_MAC_CTX_settable_params(EVP_MAC_CTX *ctx)
if (ctx->meth->settable_ctx_params == NULL) if (ctx->meth->settable_ctx_params == NULL)
return NULL; return NULL;
alg = ossl_provider_ctx(EVP_MAC_provider(ctx->meth)); alg = ossl_provider_ctx(EVP_MAC_get0_provider(ctx->meth));
return ctx->meth->settable_ctx_params(ctx->algctx, alg); return ctx->meth->settable_ctx_params(ctx->algctx, alg);
} }

6
crypto/evp/p5_crpt.c
View file

@ -54,12 +54,12 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
return 0; return 0;
} }
ivl = EVP_CIPHER_iv_length(cipher); ivl = EVP_CIPHER_get_iv_length(cipher);
if (ivl < 0 || ivl > 16) { if (ivl < 0 || ivl > 16) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_IV_LENGTH); ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_IV_LENGTH);
goto err; goto err;
} }
kl = EVP_CIPHER_key_length(cipher); kl = EVP_CIPHER_get_key_length(cipher);
if (kl < 0 || kl > (int)sizeof(md_tmp)) { if (kl < 0 || kl > (int)sizeof(md_tmp)) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH); ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
goto err; goto err;
@ -77,7 +77,7 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
else if (passlen == -1) else if (passlen == -1)
passlen = strlen(pass); passlen = strlen(pass);
mdsize = EVP_MD_size(md); mdsize = EVP_MD_get_size(md);
if (mdsize < 0) if (mdsize < 0)
goto err; goto err;

6
crypto/evp/p5_crpt2.c
View file

@ -28,7 +28,7 @@ int ossl_pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen,
int rv = 1, mode = 1; int rv = 1, mode = 1;
EVP_KDF *kdf; EVP_KDF *kdf;
EVP_KDF_CTX *kctx; EVP_KDF_CTX *kctx;
const char *mdname = EVP_MD_name(digest); const char *mdname = EVP_MD_get0_name(digest);
OSSL_PARAM params[6], *p = params; OSSL_PARAM params[6], *p = params;
/* Keep documented behaviour. */ /* Keep documented behaviour. */
@ -193,7 +193,7 @@ int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
ERR_raise(ERR_LIB_EVP, EVP_R_NO_CIPHER_SET); ERR_raise(ERR_LIB_EVP, EVP_R_NO_CIPHER_SET);
goto err; goto err;
} }
keylen = EVP_CIPHER_CTX_key_length(ctx); keylen = EVP_CIPHER_CTX_get_key_length(ctx);
OPENSSL_assert(keylen <= sizeof(key)); OPENSSL_assert(keylen <= sizeof(key));
/* Decode parameter */ /* Decode parameter */
@ -205,7 +205,7 @@ int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
goto err; goto err;
} }
t = EVP_CIPHER_CTX_key_length(ctx); t = EVP_CIPHER_CTX_get_key_length(ctx);
if (t < 0) { if (t < 0) {
ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH); ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
goto err; goto err;

Some files were not shown because too many files have changed in this diff Show more