Add "origin" field to EVP_CIPHER, EVP_MD
authorRich Salz <rsalz@akamai.com>
Tue, 16 Feb 2021 22:51:56 +0000 (17:51 -0500)
committerRichard Levitte <levitte@openssl.org>
Sun, 18 Apr 2021 08:03:07 +0000 (10:03 +0200)
commitf6c95e46c03025b2694241e1ad785d8bd3ac083b
tree5dcfc46ad06713bc6b581f6bed3ce3e26b0c5970
parent543e740b95e303790f8fe6ec59458b4ecdcfb56c
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)
57 files changed:
apps/dgst.c
crypto/asn1/a_sign.c
crypto/asn1/p5_scrypt.c
crypto/cmac/cmac.c
crypto/cms/cms_env.c
crypto/cms/cms_kari.c
crypto/cms/cms_lib.c
crypto/cms/cms_sd.c
crypto/evp/bio_md.c
crypto/evp/bio_ok.c
crypto/evp/cmeth_lib.c
crypto/evp/digest.c
crypto/evp/e_aes.c
crypto/evp/e_aes_cbc_hmac_sha1.c
crypto/evp/e_aes_cbc_hmac_sha256.c
crypto/evp/e_aria.c
crypto/evp/e_camellia.c
crypto/evp/e_chacha20_poly1305.c
crypto/evp/e_des3.c
crypto/evp/e_null.c
crypto/evp/e_rc2.c
crypto/evp/e_rc4.c
crypto/evp/e_rc4_hmac_md5.c
crypto/evp/e_sm4.c
crypto/evp/e_xcbc_d.c
crypto/evp/evp_enc.c
crypto/evp/evp_lib.c
crypto/evp/evp_local.h
crypto/evp/legacy_blake2.c
crypto/evp/legacy_md2.c
crypto/evp/legacy_md4.c
crypto/evp/legacy_md5.c
crypto/evp/legacy_md5_sha1.c
crypto/evp/legacy_mdc2.c
crypto/evp/legacy_ripemd.c
crypto/evp/legacy_sha.c
crypto/evp/legacy_wp.c
crypto/evp/m_null.c
crypto/evp/m_sigver.c
crypto/evp/p5_crpt2.c
crypto/evp/p_sign.c
crypto/evp/p_verify.c
crypto/pkcs12/p12_decr.c
crypto/pkcs7/pk7_doit.c
crypto/sm3/legacy_sm3.c
doc/man3/EVP_DigestInit.pod
doc/man3/EVP_EncryptInit.pod
engines/e_afalg.c
include/crypto/evp.h
include/openssl/evp.h
ssl/record/rec_layer_d1.c
ssl/record/rec_layer_s3.c
ssl/record/ssl3_record.c
ssl/statem/statem_dtls.c
test/evp_extra_test.c
test/evp_fetch_prov_test.c
util/libcrypto.num