From 40526dfd92817fd1fdd8e4adc9065c02c7807818 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 16 Sep 2019 08:59:10 +1000 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/9905) --- doc/man7/EVP_KDF-HKDF.pod | 6 +++--- doc/man7/EVP_KDF-PBKDF2.pod | 4 ++-- doc/man7/EVP_KDF-SCRYPT.pod | 6 +++--- doc/man7/EVP_KDF-SS.pod | 4 ++-- doc/man7/EVP_KDF-SSHKDF.pod | 6 +++--- doc/man7/EVP_KDF-TLS1_PRF.pod | 4 ++-- doc/man7/EVP_KDF-X942.pod | 4 ++-- doc/man7/EVP_KDF-X963.pod | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/man7/EVP_KDF-HKDF.pod b/doc/man7/EVP_KDF-HKDF.pod index fb675b2d45..476821ea9d 100644 --- a/doc/man7/EVP_KDF-HKDF.pod +++ b/doc/man7/EVP_KDF-HKDF.pod @@ -135,16 +135,16 @@ RFC 5869 =head1 SEE ALSO L, -L, +L, L, -L, L, +L, L, L =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 311e0a3769..df9d354e79 100644 --- a/doc/man7/EVP_KDF-PBKDF2.pod +++ b/doc/man7/EVP_KDF-PBKDF2.pod @@ -82,9 +82,9 @@ SP800-132 =head1 SEE ALSO L, -L, +L, L, -L, +L, L, L diff --git a/doc/man7/EVP_KDF-SCRYPT.pod b/doc/man7/EVP_KDF-SCRYPT.pod index dff8e15f39..9878b46528 100644 --- a/doc/man7/EVP_KDF-SCRYPT.pod +++ b/doc/man7/EVP_KDF-SCRYPT.pod @@ -124,15 +124,15 @@ RFC 7914 =head1 SEE ALSO L, -L, +L, L, -L, +L, L, L =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 be45d9e3c7..894a030758 100644 --- 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, -L, +L, L, -L, +L, L, L, L diff --git a/doc/man7/EVP_KDF-SSHKDF.pod b/doc/man7/EVP_KDF-SSHKDF.pod index cd05abe9dd..437151dd7a 100644 --- a/doc/man7/EVP_KDF-SSHKDF.pod +++ b/doc/man7/EVP_KDF-SSHKDF.pod @@ -139,16 +139,16 @@ RFC 4253 =head1 SEE ALSO L, -L, +L, L, -L, +L, L, L, L =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 2adcf9f0aa..c7a097746d 100644 --- 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, -L, +L, L, -L, +L, L, L diff --git a/doc/man7/EVP_KDF-X942.pod b/doc/man7/EVP_KDF-X942.pod index 83478f1be9..8054f84acf 100644 --- a/doc/man7/EVP_KDF-X942.pod +++ b/doc/man7/EVP_KDF-X942.pod @@ -99,9 +99,9 @@ RFC 2631 =head1 SEE ALSO L, -L, +L, L, -L, +L, L, L, L diff --git a/doc/man7/EVP_KDF-X963.pod b/doc/man7/EVP_KDF-X963.pod index 0986525846..2115e83a60 100644 --- a/doc/man7/EVP_KDF-X963.pod +++ b/doc/man7/EVP_KDF-X963.pod @@ -88,9 +88,9 @@ value "label": =head1 SEE ALSO L, -L, +L, L, -L, +L, L, L, L -- 2.25.1