doc: add links to new KDF
authorPauli <pauli@openssl.org>
Mon, 2 Aug 2021 11:44:06 +0000 (21:44 +1000)
committerPauli <pauli@openssl.org>
Thu, 5 Aug 2021 05:44:00 +0000 (15:44 +1000)
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)

doc/man7/EVP_KDF-HKDF.pod
doc/man7/provider-kdf.pod

index b20fb7b61315864b8f44aef824f613d23190a7ef..ffe1c5ae043dfaf3eb31b6297a1bfd74194935c7 100644 (file)
@@ -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
 
index 034f82a262a53a2115b4478d25638135be704010..3fbce625ff253b090174a86529c9b9d912c40f64 100644 (file)
@@ -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.