summaryrefslogtreecommitdiff
path: root/src/include/openssl/pkcs8.h
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2019-08-08 14:53:19 +0000
committerPete Bentley <prb@google.com>2019-08-08 14:53:19 +0000
commit228bd6249d17f351ea66508b3ec3112ed1cbdf30 (patch)
treeb178584cd6074879284532ebf5f91db100ff119c /src/include/openssl/pkcs8.h
parentf8d8b73da16aa9f2fdda401a46b4f86a83016712 (diff)
downloadboringssl-228bd6249d17f351ea66508b3ec3112ed1cbdf30.tar.gz
Revert "external/boringssl: Sync to 81080a729af568f7b5fde92b9170cc17065027c9."
This reverts commit f8d8b73da16aa9f2fdda401a46b4f86a83016712. Reason for revert: Breaks buildsdk_tools_cross_win Change-Id: I3bac24f78d165dfa7f89b878cc2277281fd8f1ab
Diffstat (limited to 'src/include/openssl/pkcs8.h')
-rw-r--r--src/include/openssl/pkcs8.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/include/openssl/pkcs8.h b/src/include/openssl/pkcs8.h
index 385b9950..ee48f194 100644
--- a/src/include/openssl/pkcs8.h
+++ b/src/include/openssl/pkcs8.h
@@ -168,18 +168,12 @@ OPENSSL_EXPORT int i2d_PKCS12_fp(FILE *fp, const PKCS12 *p12);
// PKCS12_parse calls |PKCS12_get_key_and_certs| on the ASN.1 data stored in
// |p12|. The |out_pkey| and |out_cert| arguments must not be NULL and, on
-// successful exit, the private key and matching certificate will be stored in
+// successful exit, the private key and first certificate will be stored in
// them. The |out_ca_certs| argument may be NULL but, if not, then any extra
// certificates will be appended to |*out_ca_certs|. If |*out_ca_certs| is NULL
// then it will be set to a freshly allocated stack containing the extra certs.
//
-// Note if |p12| does not contain a private key, both |*out_pkey| and
-// |*out_cert| will be set to NULL and all certificates will be returned via
-// |*out_ca_certs|.
-//
// It returns one on success and zero on error.
-//
-// Use |PKCS12_get_key_and_certs| instead.
OPENSSL_EXPORT int PKCS12_parse(const PKCS12 *p12, const char *password,
EVP_PKEY **out_pkey, X509 **out_cert,
STACK_OF(X509) **out_ca_certs);