aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssl/doc/man3/PKCS12_parse.pod
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssl/doc/man3/PKCS12_parse.pod')
-rw-r--r--crypto/openssl/doc/man3/PKCS12_parse.pod16
1 files changed, 10 insertions, 6 deletions
diff --git a/crypto/openssl/doc/man3/PKCS12_parse.pod b/crypto/openssl/doc/man3/PKCS12_parse.pod
index 208644c019bf..f16600147b3f 100644
--- a/crypto/openssl/doc/man3/PKCS12_parse.pod
+++ b/crypto/openssl/doc/man3/PKCS12_parse.pod
@@ -21,10 +21,14 @@ certificate to B<*cert> and any additional certificates to B<*ca>.
=head1 NOTES
-The parameters B<pkey> and B<cert> cannot be B<NULL>. B<ca> can be <NULL> in
-which case additional certificates will be discarded. B<*ca> can also be a
-valid STACK in which case additional certificates are appended to B<*ca>. If
-B<*ca> is B<NULL> a new STACK will be allocated.
+Each of the parameters B<pkey>, B<cert>, and B<ca> can be NULL in which case
+the private key, the corresponding certificate, or the additional certificates,
+respectively, will be discarded.
+If any of B<pkey> and B<cert> is non-NULL the variable it points to is
+initialized.
+If B<ca> is non-NULL and B<*ca> is NULL a new STACK will be allocated.
+If B<ca> is non-NULL and B<*ca> is a valid STACK
+then additional certificates are appended in the given order to B<*ca>.
The B<friendlyName> and B<localKeyID> attributes (if present) on each
certificate will be stored in the B<alias> and B<keyid> attributes of the
@@ -63,9 +67,9 @@ L<passphrase-encoding(7)>
=head1 COPYRIGHT
-Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.
-Licensed under the OpenSSL license (the "License"). You may not use
+Licensed under the Apache License 2.0 (the "License"). You may not use
this file except in compliance with the License. You can obtain a copy
in the file LICENSE in the source distribution or at
L<https://www.openssl.org/source/license.html>.