summaryrefslogtreecommitdiffstats
path: root/doc/man7
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2021-08-02 21:44:06 +1000
committerPauli <pauli@openssl.org>2021-08-05 15:44:00 +1000
commit9ff407a1dcb7580317e863634c020ac6589da897 (patch)
treea1e6e0abb53510017e1ea34940447ecd8156593f /doc/man7
parent94eb3cdd34bf391f50a59bbfcc6cb83138a77261 (diff)
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)
Diffstat (limited to 'doc/man7')
-rw-r--r--doc/man7/EVP_KDF-HKDF.pod3
-rw-r--r--doc/man7/provider-kdf.pod15
2 files changed, 17 insertions, 1 deletions
diff --git a/doc/man7/EVP_KDF-HKDF.pod b/doc/man7/EVP_KDF-HKDF.pod
index b20fb7b613..ffe1c5ae04 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 034f82a262..3fbce625ff 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.