diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2019-05-16 11:43:41 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2019-05-16 11:43:41 +1000 |
commit | 8bbeaaa4fc12f8b00fbea4dc649ef74b59f73b17 (patch) | |
tree | bf043355836767d39f96bd2a67b9bc3b7798dd9d /doc/man3/EVP_KDF_CTX.pod | |
parent | 0211740fcc47a954be19cceb65fb57a6f7deb797 (diff) |
Added X963KDF API
X963 KDF is used for CMS ec keyagree Recipient Info.
The X963 KDF that is used by CMS EC Key Agreement has been moved
into a EVP_KDF object. This KDF is almost identical to the the SSKDF
hash variant, so it has been implemented inside the SSKDF code with
its own method table.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8902)
Diffstat (limited to 'doc/man3/EVP_KDF_CTX.pod')
-rw-r--r-- | doc/man3/EVP_KDF_CTX.pod | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/man3/EVP_KDF_CTX.pod b/doc/man3/EVP_KDF_CTX.pod index 2bdefc668a..342807fa14 100644 --- a/doc/man3/EVP_KDF_CTX.pod +++ b/doc/man3/EVP_KDF_CTX.pod @@ -277,6 +277,7 @@ L<EVP_KDF_PBKDF2(7)> L<EVP_KDF_HKDF(7)> L<EVP_KDF_SS(7)> L<EVP_KDF_SSHKDF(7)> +L<EVP_KDF_X963(7)> =head1 HISTORY |