diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-08-19 13:27:31 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-08-19 13:27:31 +1000 |
| commit | 7fe32ef68855d727c55186bda99b3e2500afa2c2 (patch) | |
| tree | 9b838b944a6878e5301a6134bbb411d217933fb2 /util | |
| parent | c51a8af8cca755ceefba64b3cbd0bdb91c74d77c (diff) | |
Fix no-cms build errors.
Fixes #12640
The X942-KDF is now indepedent of the CMS code (since it no longer uses CMS_SharedInfo_encode).
Any code related to EVP_PKEY_DH_KDF_X9_42 needs to not be wrapped by !defined(OPENSSL_NO_CMS).
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12642)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 838d1e686d..b38670b1ab 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -2939,7 +2939,7 @@ TS_RESP_CTX_set_status_info 3001 3_0_0 EXIST::FUNCTION:TS BIO_f_nbio_test 3002 3_0_0 EXIST::FUNCTION: SEED_ofb128_encrypt 3003 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SEED d2i_RSAPrivateKey_bio 3004 3_0_0 EXIST::FUNCTION:RSA -DH_KDF_X9_42 3005 3_0_0 EXIST::FUNCTION:CMS,DEPRECATEDIN_3_0,DH +DH_KDF_X9_42 3005 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH EVP_PKEY_meth_set_signctx 3006 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 X509_CRL_get_version 3007 3_0_0 EXIST::FUNCTION: EVP_PKEY_meth_get0_info 3008 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 |