The branch master has been updated via fee0af0863dff8d13b09cd59af0afbd7e4ae2d57 (commit) from 47b784a41b729d5df9ad47c99355db2f2026a709 (commit)
- Log ----------------------------------------------------------------- commit fee0af0863dff8d13b09cd59af0afbd7e4ae2d57 Author: Richard Levitte <levi...@openssl.org> Date: Mon Jan 18 10:09:58 2021 +0100 DOCS: Fix the last few remaining pass phrase options references There were a few lingering older style references to the pass phrase options section, now streamlined with all the others. Fixes #13883 Reviewed-by: Tomas Mraz <to...@openssl.org> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13885) ----------------------------------------------------------------------- Summary of changes: doc/man1/openssl-cmp.pod.in | 20 ++++++++++---------- doc/man1/openssl-pkcs12.pod.in | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in index 0993186158..7841d2b0f3 100644 --- a/doc/man1/openssl-cmp.pod.in +++ b/doc/man1/openssl-cmp.pod.in @@ -256,8 +256,8 @@ if any, or else the current client key, if given. Pass phrase source for the key given with the B<-newkey> option. If not given here, the password will be prompted for if needed. -For more information about the format of B<arg> see the -B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>. +For more information about the format of B<arg> see +L<openssl-passphrase-options(1)>. =item B<-subject> I<name> @@ -606,8 +606,8 @@ and (as far as needed) for verifying PBM-based protection of incoming messages. PBM stands for Password-Based Message Authentication Code. This takes precedence over the B<-cert> and B<-key> options. -For more information about the format of B<arg> see the -B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>. +For more information about the format of B<arg> see +L<openssl-passphrase-options(1)>. =item B<-cert> I<filename> @@ -655,8 +655,8 @@ Pass phrase source for the private key given with the B<-key> option. Also used for B<-cert> and B<-oldcert> in case it is an encrypted PKCS#12 file. If not given here, the password will be prompted for if needed. -For more information about the format of B<arg> see the -B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>. +For more information about the format of B<arg> see +L<openssl-passphrase-options(1)>. =item B<-digest> I<name> @@ -713,8 +713,8 @@ B<-srv_trusted>, B<-srv_untrusted>, B<-rsp_extracerts>, B<-rsp_capubs>, B<-tls_extra>, and B<-tls_trusted> options. If not given here, the password will be prompted for if needed. -For more information about the format of B<arg> see the -B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>. +For more information about the format of B<arg> see +L<openssl-passphrase-options(1)>. {- $OpenSSL::safe::opt_engine_item -} @@ -759,8 +759,8 @@ Pass phrase source for client's private TLS key B<tls_key>. Also used for B<-tls_cert> in case it is an encrypted PKCS#12 file. If not given here, the password will be prompted for if needed. -For more information about the format of B<arg> see the -B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>. +For more information about the format of B<arg> see +L<openssl-passphrase-options(1)>. =item B<-tls_extra> I<filenames> diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in index c0e0fdfca9..fdb78ae139 100644 --- a/doc/man1/openssl-pkcs12.pod.in +++ b/doc/man1/openssl-pkcs12.pod.in @@ -98,7 +98,7 @@ Print out a usage message. The password source for the input, and for encrypting any private keys that are output. For more information about the format of B<arg> -see L<openssl-passphrase-options(1)/Pass Phrase Options>. +see L<openssl-passphrase-options(1)>. =item B<-passout> I<arg> @@ -257,8 +257,8 @@ if the B<-export> option is given. The password source for certificate input such as B<-certfile> and B<-untrusted>. -For more information about the format of B<arg> -see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>. +For more information about the format of B<arg> see +L<openssl-passphrase-options(1)>. =item B<-chain>