summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2021-02-14 20:25:42 +0100
committerDmitry Belyavskiy <beldmit@gmail.com>2021-02-17 17:13:32 +0100
commitb51bed05c2ab54a1933b5c18862e68cd4540278c (patch)
tree03634b37b4c1b5e23ccb4333bd63b7bec6f983c0 /doc
parentd44a8a16c8a2851af7f70575ff3dd23cc06f30e1 (diff)
apps/cmp.c: Improve initialization of ext_ctx structure w.r.t. CSR
Also improve doc how the -reqexts option affects the CSR given with the -csr option. Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/14181)
Diffstat (limited to 'doc')
-rw-r--r--doc/man1/openssl-cmp.pod.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in
index 3f2b742a36..9800de6465 100644
--- a/doc/man1/openssl-cmp.pod.in
+++ b/doc/man1/openssl-cmp.pod.in
@@ -298,6 +298,8 @@ validity period starts from the current time (as seen by the host).
=item B<-reqexts> I<name>
Name of section in OpenSSL config file defining certificate request extensions.
+If the B<-csr> option is present, these extensions augment the extensions
+contained the given PKCS#10 CSR, overriding any extensions with same OIDs.
=item B<-sans> I<spec>