From: Pauli <paul.dale@oracle.com>
Date: Sat, 7 Sep 2019 00:47:37 +0000 (+1000)
Subject: Add 'engine' param to KDFs
X-Git-Tag: openssl-3.0.0-alpha1~1442
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c69561de00a032f85ec92d30c1e0bfa761b81dfd;p=oweals%2Fopenssl.git

Add 'engine' param to KDFs

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9770)
---

diff --git a/doc/man3/EVP_KDF.pod b/doc/man3/EVP_KDF.pod
index fc09d5fad8..2069e7f0ee 100644
--- a/doc/man3/EVP_KDF.pod
+++ b/doc/man3/EVP_KDF.pod
@@ -166,18 +166,22 @@ The default value, if any, is implementation dependent.
 
 =item B<OSSL_KDF_PARAM_PROPERTIES> ("properties") <UTF8 string>
 
-Some KDF implementations use other cryptographic algorithms, this parameter
-sets what property query will be used to fetch the implementation.
-
 =item B<OSSL_KDF_PARAM_MAC> ("mac") <UTF8 string>
 
-Some KDF implementations use a MAC as an underlying computation
-algorithm, this parameter sets what the MAC algorithm should be.
-
 =item B<OSSL_KDF_PARAM_DIGEST> ("digest") <UTF8 string>
 
-For MAC implementations that use a message digest as an underlying computation
-algorithm, this parameter sets what the digest algorithm should be.
+=item B<OSSL_MAC_PARAM_ENGINE> ("engine") <utf8string>
+
+For KDF implementations that use an underlying computation MAC or
+digest, these parameters set what the algorithm should be, and the
+engine that implements the algorithm or the properties to fetch it
+by if needed.
+
+The value is always the name of the intended engine, algorithm,
+or the properties.
+
+Note that not all algorithms may support all possible underlying
+implementations.
 
 =item B<OSSL_KDF_PARAM_KEY> ("key") <octet string>