upd: openssl to 1.1.0

[cassiopeia.git] / lib / openssl / doc / crypto / PKCS12_create.pod

diff --git a/lib/openssl/doc/crypto/PKCS12_create.pod b/lib/openssl/doc/crypto/PKCS12_create.pod
index de7cab2bdffc57b05373d6da68ced3207b2ca754..0a43b96c318fee4b456c653423d3aff27c87a83c 100644 (file)
--- a/lib/openssl/doc/crypto/PKCS12_create.pod
+++ b/lib/openssl/doc/crypto/PKCS12_create.pod
@@ -8,15 +8,16 @@ PKCS12_create - create a PKCS#12 structure
 
  #include <openssl/pkcs12.h>
 
 
  #include <openssl/pkcs12.h>
 

- PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, STACK_OF(X509) *ca,
-                               int nid_key, int nid_cert, int iter, int mac_iter, int keytype);
+ PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey,
+                       X509 *cert, STACK_OF(X509) *ca,
+                       int nid_key, int nid_cert, int iter, int mac_iter, int keytype);

 
 =head1 DESCRIPTION
 
 PKCS12_create() creates a PKCS#12 structure.
 
 B<pass> is the passphrase to use. B<name> is the B<friendlyName> to use for
 
 =head1 DESCRIPTION
 
 PKCS12_create() creates a PKCS#12 structure.
 
 B<pass> is the passphrase to use. B<name> is the B<friendlyName> to use for

-the supplied certifictate and key. B<pkey> is the private key to include in
+the supplied certificate and key. B<pkey> is the private key to include in

 the structure and B<cert> its corresponding certificates. B<ca>, if not B<NULL>
 is an optional set of certificates to also include in the structure.
 
 the structure and B<cert> its corresponding certificates. B<ca>, if not B<NULL>
 is an optional set of certificates to also include in the structure.
 


@@ -46,30 +47,30 @@ export grade software which could use signing only keys of arbitrary size but
 had restrictions on the permissible sizes of keys which could be used for
 encryption.
 
 had restrictions on the permissible sizes of keys which could be used for
 encryption.
 

-=head1 NEW FUNCTIONALITY IN OPENSSL 0.9.8
-
-Some additional functionality was added to PKCS12_create() in OpenSSL
-0.9.8. These extensions are detailed below.
-

 If a certificate contains an B<alias> or B<keyid> then this will be
 used for the corresponding B<friendlyName> or B<localKeyID> in the
 PKCS12 structure.
 
 Either B<pkey>, B<cert> or both can be B<NULL> to indicate that no key or
 If a certificate contains an B<alias> or B<keyid> then this will be
 used for the corresponding B<friendlyName> or B<localKeyID> in the
 PKCS12 structure.
 
 Either B<pkey>, B<cert> or both can be B<NULL> to indicate that no key or

-certficate is required. In previous versions both had to be present or
+certificate is required. In previous versions both had to be present or

 a fatal error is returned.
 
 B<nid_key> or B<nid_cert> can be set to -1 indicating that no encryption
 a fatal error is returned.
 
 B<nid_key> or B<nid_cert> can be set to -1 indicating that no encryption

-should be used. 
+should be used.

 
 B<mac_iter> can be set to -1 and the MAC will then be omitted entirely.
 
 =head1 SEE ALSO
 
 
 B<mac_iter> can be set to -1 and the MAC will then be omitted entirely.
 
 =head1 SEE ALSO
 

-L<d2i_PKCS12(3)|d2i_PKCS12(3)>
+L<d2i_PKCS12(3)>
+
+=head1 COPYRIGHT

 
 

-=head1 HISTORY
+Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.

 
 

-PKCS12_create was added in OpenSSL 0.9.3
+Licensed under the OpenSSL license (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>.

 
 =cut
 
 =cut