summaryrefslogtreecommitdiffstats
path: root/util/private.num
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-04-13 10:14:40 +0200
committerRichard Levitte <levitte@openssl.org>2018-04-13 11:55:13 +0200
commita8ca496ddb532d7f7dc356fd2b026697388d2384 (patch)
treeddd8f9c79caff1edb0f868550e648271082560ae /util/private.num
parent76fd7a1d61924ba5ee45224454cc3754b672efbf (diff)
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 <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5942)
Diffstat (limited to 'util/private.num')
-rw-r--r--util/private.num9
1 files changed, 9 insertions, 0 deletions
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