From: Pauli Date: Tue, 3 Sep 2019 04:30:53 +0000 (+1000) Subject: Move OSSL_OP_KDF into its rightful place amongst the other OSSL_OP_ definitions X-Git-Tag: openssl-3.0.0-alpha1~1457 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad1700c706517704e0ba2204ed317a365099cbef;p=thirdparty%2Fopenssl.git Move OSSL_OP_KDF into its rightful place amongst the other OSSL_OP_ definitions Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9662) --- diff --git a/include/openssl/core_numbers.h b/include/openssl/core_numbers.h index 4fd91b465c..521cd8c800 100644 --- a/include/openssl/core_numbers.h +++ b/include/openssl/core_numbers.h @@ -153,6 +153,7 @@ OSSL_CORE_MAKE_FUNC(const OSSL_ITEM *,provider_get_reason_strings, # define OSSL_OP_DIGEST 1 # define OSSL_OP_CIPHER 2 /* Symmetric Ciphers */ # define OSSL_OP_MAC 3 +# define OSSL_OP_KDF 4 # define OSSL_OP_KEYMGMT 10 # define OSSL_OP_KEYEXCH 11 /* Highest known operation number */ @@ -282,7 +283,6 @@ OSSL_CORE_MAKE_FUNC(int, OP_mac_set_ctx_params, (void *mctx, const OSSL_PARAM params[])) /* KDFs and PRFs */ -# define OSSL_OP_KDF 4 # define OSSL_FUNC_KDF_NEWCTX 1 # define OSSL_FUNC_KDF_DUPCTX 2