From: Pauli <pauli@openssl.org>
Date: Mon, 2 Aug 2021 11:44:06 +0000 (+1000)
Subject: doc: add links to new KDF
X-Git-Tag: openssl-3.0.0~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ff407a1dcb7580317e863634c020ac6589da897;p=thirdparty%2Fopenssl.git

doc: add links to new KDF

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/16203)
---

diff --git a/doc/man7/EVP_KDF-HKDF.pod b/doc/man7/EVP_KDF-HKDF.pod
index b20fb7b6131..ffe1c5ae043 100644
--- a/doc/man7/EVP_KDF-HKDF.pod
+++ b/doc/man7/EVP_KDF-HKDF.pod
@@ -137,7 +137,8 @@ L<EVP_KDF_CTX_free(3)>,
 L<EVP_KDF_CTX_get_kdf_size(3)>,
 L<EVP_KDF_CTX_set_params(3)>,
 L<EVP_KDF_derive(3)>,
-L<EVP_KDF(3)/PARAMETERS>
+L<EVP_KDF(3)/PARAMETERS>,
+L<EVP_KDF-TLS13_KDF(7)>
 
 =head1 COPYRIGHT
 
diff --git a/doc/man7/provider-kdf.pod b/doc/man7/provider-kdf.pod
index 034f82a262a..3fbce625ff2 100644
--- a/doc/man7/provider-kdf.pod
+++ b/doc/man7/provider-kdf.pod
@@ -239,6 +239,21 @@ Sets the scrypt work factor parameter p in the associated KDF ctx.
 
 Sets the scrypt work factor parameter maxmem in the associated KDF ctx.
 
+=item "prefix" (B<OSSL_KDF_PARAM_PREFIX>) <octet string>
+
+Sets the prefix string using by the TLS 1.3 version of HKDF in the
+associated KDF ctx.
+
+=item "label" (B<OSSL_KDF_PARAM_LABEL>) <octet string>
+
+Sets the label string using by the TLS 1.3 version of HKDF in the
+associated KDF ctx.
+
+=item "data" (B<OSSL_KDF_PARAM_DATA>) <octet string>
+
+Sets the context string using by the TLS 1.3 version of HKDF in the
+associated KDF ctx.
+
 =item "info" (B<OSSL_KDF_PARAM_INFO>) <octet string>
 
 Sets the optional shared info in the associated KDF ctx.