From a8ca496ddb532d7f7dc356fd2b026697388d2384 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 13 Apr 2018 10:14:40 +0200 Subject: Split the scrypt and RSA-PSS into man3 and man7 pages The scrypt and RSA-PSS documents were a mixture of section 3 and section 7 material. With pre-1.1.1 OpenSSL, this is understandable, since we had a different directory layout. With 1.1.1, we've moved to the typical man-page directory layout, and the documents need to be updated accordingly. Also, the scrypt document contained a description of EVP_PKEY_CTX_set1_pbe_pass(), which is a generic function rather than an scrypt specific function, and therefore should be documented separately. Fixes #5802 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/5942) --- util/private.num | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'util/private.num') diff --git a/util/private.num b/util/private.num index 706da8041e..8a461acd41 100644 --- a/util/private.num +++ b/util/private.num @@ -187,6 +187,8 @@ EVP_PKEY_CTX_get_signature_md define EVP_PKEY_CTX_hkdf_mode define EVP_PKEY_CTX_set1_hkdf_key define EVP_PKEY_CTX_set1_hkdf_salt define +EVP_PKEY_CTX_set1_pbe_pass define +EVP_PKEY_CTX_set1_scrypt_salt define EVP_PKEY_CTX_set1_tls1_prf_secret define EVP_PKEY_CTX_set_dh_paramgen_generator define EVP_PKEY_CTX_set_dh_paramgen_prime_len define @@ -199,7 +201,14 @@ EVP_PKEY_CTX_set_hkdf_md define EVP_PKEY_CTX_set_mac_key define EVP_PKEY_CTX_set_rsa_keygen_pubexp define EVP_PKEY_CTX_set_rsa_padding define +EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md define +EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen define +EVP_PKEY_CTX_set_rsa_pss_keygen_md define EVP_PKEY_CTX_set_rsa_pss_saltlen define +EVP_PKEY_CTX_set_scrypt_N define +EVP_PKEY_CTX_set_scrypt_r define +EVP_PKEY_CTX_set_scrypt_maxmem_bytes define +EVP_PKEY_CTX_set_scrypt_p define EVP_PKEY_CTX_set_signature_md define EVP_PKEY_CTX_set_tls1_prf_md define EVP_PKEY_assign_DH define -- cgit v1.2.3