summaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2021-02-16 17:51:56 -0500
committerRichard Levitte <levitte@openssl.org>2021-04-18 10:03:07 +0200
commitf6c95e46c03025b2694241e1ad785d8bd3ac083b (patch)
tree5dcfc46ad06713bc6b581f6bed3ce3e26b0c5970 /engines
parent543e740b95e303790f8fe6ec59458b4ecdcfb56c (diff)
downloadopenssl-new-f6c95e46c03025b2694241e1ad785d8bd3ac083b.tar.gz
Add "origin" field to EVP_CIPHER, EVP_MD
Add a "where did this EVP_{CIPHER,MD} come from" flag: global, via fetch, or via EVP_{CIPHER,MD}_meth_new. Update EVP_{CIPHER,MD}_free to handle all three origins. The flag is deliberately right before some function pointers, so that compile-time failures (int/pointer) will occur, as opposed to taking a bit in the existing "flags" field. The "global variable" flag is non-zero, so the default case of using OPENSSL_zalloc (for provider ciphers), will do the right thing. Ref-counting is a no-op for Make up_ref no-op for global MD and CIPHER objects Deprecate EVP_MD_CTX_md(). Added EVP_MD_CTX_get0_md() (same semantics as the deprecated function) and EVP_MD_CTX_get1_md(). Likewise, deprecate EVP_CIPHER_CTX_cipher() in favor of EVP_CIPHER_CTX_get0_cipher(), and add EVP_CIPHER_CTX_get1_CIPHER(). Refactor EVP_MD_free() and EVP_MD_meth_free() to call new common evp_md_free_int() function. Refactor EVP_CIPHER_free() and EVP_CIPHER_meth_free() to call new common evp_cipher_free_int() function. Also change some flags tests to explicit test == or != zero. E.g., if (flags & x) --> if ((flags & x) != 0) if (!(flags & x)) --> if ((flags & x) == 0) Only done for those lines where "get0_cipher" calls were made. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14193)
Diffstat (limited to 'engines')
-rw-r--r--engines/e_afalg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/e_afalg.c b/engines/e_afalg.c
index ac85f523d4..db73873911 100644
--- a/engines/e_afalg.c
+++ b/engines/e_afalg.c
@@ -553,7 +553,7 @@ static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 0;
}
- if (EVP_CIPHER_CTX_cipher(ctx) == NULL) {
+ if (EVP_CIPHER_CTX_get0_cipher(ctx) == NULL) {
ALG_WARN("%s(%d): Cipher object NULL\n", __FILE__, __LINE__);
return 0;
}