diff options
| author | Pauli <paul.dale@oracle.com> | 2020-02-13 11:00:57 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-07-22 20:19:01 +1000 |
| commit | 41bbba537598522daaf8369778de6d1225a4998e (patch) | |
| tree | cf4eb63dab871fc339eb4ca325fd30b0019752ca /crypto/cms | |
| parent | 77ae4f6ff7af7d099206a1fc229be7a3ea0e0596 (diff) | |
EVP: deprecate the EVP_X_meth_ functions.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11082)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_kari.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index a2149ce002..30d38b5fd6 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -7,6 +7,12 @@ * https://www.openssl.org/source/license.html */ +/* + * Low level key APIs (DH etc) are deprecated for public use, but still ok for + * internal use. + */ +#include "internal/deprecated.h" + #include "internal/cryptlib.h" #include <openssl/asn1t.h> #include <openssl/pem.h> @@ -429,6 +435,7 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari, return 0; keylen = EVP_CIPHER_key_length(cipher); if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_GET_WRAP_CIPHER) != 0) { + /* TODO: make this not get a method we can call directly */ ret = EVP_CIPHER_meth_get_ctrl(cipher)(NULL, EVP_CTRL_GET_WRAP_CIPHER, 0, &kekcipher); if (ret <= 0) |