]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Move OSSL_OP_KDF into its rightful place amongst the other OSSL_OP_ definitions
authorPauli <paul.dale@oracle.com>
Tue, 3 Sep 2019 04:30:53 +0000 (14:30 +1000)
committerPauli <paul.dale@oracle.com>
Fri, 6 Sep 2019 09:27:57 +0000 (19:27 +1000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9662)

include/openssl/core_numbers.h

index 4fd91b465c379da8e52e524586dd033f18adf72b..521cd8c8006f3b037c87fafb156a9daa6ef1adff 100644 (file)
@@ -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