Clean up KDF documentation in section 7.

The EVP_KDF_ctrl function doesn't exist anymore and have been replaced by
EVP_KDF_CTX_set_params.

The EVP_KDF_new_id function doesn't exist either and EVP_KDF_new should be
used instead.

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

diff --git a/doc/man7/EVP_KDF-HKDF.pod b/doc/man7/EVP_KDF-HKDF.pod
index fb675b2d45d961f6418cbf328562e1e2bde48f54..476821ea9dbdf63ccdb5aeda783922cac05e8689 100644 (file)
--- a/doc/man7/EVP_KDF-HKDF.pod
+++ b/doc/man7/EVP_KDF-HKDF.pod
@@ -135,16 +135,16 @@ RFC 5869
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
 L<EVP_KDF-size(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF-CTX(3)/PARAMETERS>
 
 =head1 COPYRIGHT
 
-Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy

diff --git a/doc/man7/EVP_KDF-PBKDF2.pod b/doc/man7/EVP_KDF-PBKDF2.pod
index 311e0a3769889cdd6c9f1cbbf2634a1034dea82f..df9d354e793190c708901805573552ecb1aa36ae 100644 (file)
--- a/doc/man7/EVP_KDF-PBKDF2.pod
+++ b/doc/man7/EVP_KDF-PBKDF2.pod
@@ -82,9 +82,9 @@ SP800-132
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF-CTX(3)/PARAMETERS>
 

diff --git a/doc/man7/EVP_KDF-SCRYPT.pod b/doc/man7/EVP_KDF-SCRYPT.pod
index dff8e15f39711da3aa13831de9eb0ee216c85caa..9878b46528baa396e96c7ce96970db39c798134a 100644 (file)
--- a/doc/man7/EVP_KDF-SCRYPT.pod
+++ b/doc/man7/EVP_KDF-SCRYPT.pod
@@ -124,15 +124,15 @@ RFC 7914
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF-CTX(3)/PARAMETERS>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy

diff --git a/doc/man7/EVP_KDF-SS.pod b/doc/man7/EVP_KDF-SS.pod
index be45d9e3c7781b143f9f8c2baacdf2e521c6f133..894a030758698d94e9ad9c02274b53f390d2668c 100644 (file)
--- a/doc/man7/EVP_KDF-SS.pod
+++ b/doc/man7/EVP_KDF-SS.pod
@@ -173,9 +173,9 @@ NIST SP800-56Cr1.
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-size(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF(3)/PARAMETERS>

diff --git a/doc/man7/EVP_KDF-SSHKDF.pod b/doc/man7/EVP_KDF-SSHKDF.pod
index cd05abe9dd061a92b690093b6bcbbbd44d047775..437151dd7a2d80cd2d01d72ab07f0e05a588e4b2 100644 (file)
--- a/doc/man7/EVP_KDF-SSHKDF.pod
+++ b/doc/man7/EVP_KDF-SSHKDF.pod
@@ -139,16 +139,16 @@ RFC 4253
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-size(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF(3)/PARAMETERS>
 
 =head1 COPYRIGHT
 
-Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy

diff --git a/doc/man7/EVP_KDF-TLS1_PRF.pod b/doc/man7/EVP_KDF-TLS1_PRF.pod
index 2adcf9f0aae00f5577f3881c0d9fe5fd49981205..c7a097746dd62430ae452bf19a6db84215b4b4be 100644 (file)
--- a/doc/man7/EVP_KDF-TLS1_PRF.pod
+++ b/doc/man7/EVP_KDF-TLS1_PRF.pod
@@ -95,9 +95,9 @@ RFC 2246, RFC 5246 and NIST SP 800-135 r1
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF-CTX(3)/PARAMETERS>
 

diff --git a/doc/man7/EVP_KDF-X942.pod b/doc/man7/EVP_KDF-X942.pod
index 83478f1be9a03a5601d9348c4e5a650258cc2fb1..8054f84acf984d6b4116b725585b63c38be36ee7 100644 (file)
--- a/doc/man7/EVP_KDF-X942.pod
+++ b/doc/man7/EVP_KDF-X942.pod
@@ -99,9 +99,9 @@ RFC 2631
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-size(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF(3)/PARAMETERS>

diff --git a/doc/man7/EVP_KDF-X963.pod b/doc/man7/EVP_KDF-X963.pod
index 0986525846064f88de03e94879ce220b123e289d..2115e83a601efcb3bb1b21f344e450ba8140961d 100644 (file)
--- a/doc/man7/EVP_KDF-X963.pod
+++ b/doc/man7/EVP_KDF-X963.pod
@@ -88,9 +88,9 @@ value "label":
 =head1 SEE ALSO
 
 L<EVP_KDF>,
-L<EVP_KDF-CTX_new_id(3)>,
+L<EVP_KDF-CTX_new(3)>,
 L<EVP_KDF-CTX_free(3)>,
-L<EVP_KDF-ctrl(3)>,
+L<EVP_KDF-CTX_set_params(3)>,
 L<EVP_KDF-size(3)>,
 L<EVP_KDF-derive(3)>,
 L<EVP_KDF-CTX(3)/PARAMETERS>