diff options
author | Richard Levitte <levitte@openssl.org> | 2019-07-18 09:19:43 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-07-19 20:16:30 +0200 |
commit | 3cb45a55853db05d5af1b564a55491a22f592305 (patch) | |
tree | 8f4ae8a1f17d5082432b49c716b6ab0016d1ef59 /doc | |
parent | f6800e37b762563e79115ebdb233c0c07afc23e5 (diff) |
doc: fix some links
Some links are aged and need an adjustment.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9407)
Diffstat (limited to 'doc')
-rw-r--r-- | doc/man3/EVP_KDF_CTX.pod | 2 | ||||
-rw-r--r-- | doc/man3/EVP_MD_fetch.pod | 2 | ||||
-rw-r--r-- | doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod | 7 | ||||
-rw-r--r-- | doc/man3/OSSL_PARAM.pod | 2 | ||||
-rw-r--r-- | doc/man3/OSSL_trace_set_channel.pod | 2 | ||||
-rw-r--r-- | doc/man7/x509.pod | 1 |
6 files changed, 10 insertions, 6 deletions
diff --git a/doc/man3/EVP_KDF_CTX.pod b/doc/man3/EVP_KDF_CTX.pod index e65becf462..1ae79bc1bd 100644 --- a/doc/man3/EVP_KDF_CTX.pod +++ b/doc/man3/EVP_KDF_CTX.pod @@ -278,7 +278,7 @@ L<EVP_KDF_HKDF(7)> L<EVP_KDF_SS(7)> L<EVP_KDF_SSHKDF(7)> L<EVP_KDF_X963(7)> -L<EVP_KDF_X942KDF(7)> +L<EVP_KDF_X942(7)> =head1 HISTORY diff --git a/doc/man3/EVP_MD_fetch.pod b/doc/man3/EVP_MD_fetch.pod index 11390d0e94..98e4c84e86 100644 --- a/doc/man3/EVP_MD_fetch.pod +++ b/doc/man3/EVP_MD_fetch.pod @@ -69,7 +69,7 @@ the default provider unless the default search criteria have been changed and/or different providers have been loaded. Implicit fetching can also occur with functions such as -L<EVP_PKEY_CTX_derive_init_ex(3)> where a NULL algorithm parameter is supplied. +L<EVP_PKEY_derive_init_ex(3)> where a NULL algorithm parameter is supplied. In this case an algorithm implementation is implicitly fetched using default search criteria and an algorithm name that is consistent with the type of EVP_PKEY being used. diff --git a/doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod b/doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod index e9ca351544..dfde4ff8bc 100644 --- a/doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod +++ b/doc/man3/EVP_PKEY_CTX_set_scrypt_N.pod @@ -29,7 +29,7 @@ EVP_PKEY_CTX_set_scrypt_maxmem_bytes These functions are used to set up the necessary data to use the scrypt KDF. -For more information on scrypt, see L<scrypt(7)>. +For more information on scrypt, see L<EVP_KDF_SCRYPT(7)>. EVP_PKEY_CTX_set1_scrypt_salt() sets the B<saltlen> bytes long salt value. @@ -54,6 +54,9 @@ respectively. =head1 NOTES +There is a newer generic API for KDFs, L<EVP_KDF(3)>, which is +preferred over the EVP_PKEY method. + The scrypt KDF also uses EVP_PKEY_CTX_set1_pbe_pass() as well as the value from the string controls "pass" and "hexpass". See L<EVP_PKEY_CTX_set1_pbe_pass(3)>. @@ -69,7 +72,7 @@ supported by the public key algorithm. =head1 SEE ALSO -L<scrypt(7)>, +L<EVP_KDF(3)> L<EVP_PKEY_CTX_new(3)>, L<EVP_PKEY_CTX_ctrl_str(3)>, L<EVP_PKEY_derive(3)> diff --git a/doc/man3/OSSL_PARAM.pod b/doc/man3/OSSL_PARAM.pod index fbe37b4b13..0f6358cf7b 100644 --- a/doc/man3/OSSL_PARAM.pod +++ b/doc/man3/OSSL_PARAM.pod @@ -285,7 +285,7 @@ could fill in the parameters like this: =head1 SEE ALSO -L<openssl-core.h(7)>, L<OSSL_PARAM_get_int32_t(3)> +L<openssl-core.h(7)>, L<OSSL_PARAM_get_int(3)> =head1 HISTORY diff --git a/doc/man3/OSSL_trace_set_channel.pod b/doc/man3/OSSL_trace_set_channel.pod index 9c03218a21..6a88fe7f24 100644 --- a/doc/man3/OSSL_trace_set_channel.pod +++ b/doc/man3/OSSL_trace_set_channel.pod @@ -1,5 +1,7 @@ =pod +=for comment foreign manuals: atexit(3) + =head1 NAME OSSL_trace_set_channel, OSSL_trace_set_prefix, OSSL_trace_set_suffix, diff --git a/doc/man7/x509.pod b/doc/man7/x509.pod index 2d4edaa285..095203c912 100644 --- a/doc/man7/x509.pod +++ b/doc/man7/x509.pod @@ -58,7 +58,6 @@ L<d2i_X509_CRL(3)>, L<d2i_X509_NAME(3)>, L<d2i_X509_REQ(3)>, L<d2i_X509_SIG(3)>, -L<X509v3(3)>, L<crypto(7)> =head1 COPYRIGHT |