From 502ca43fc8fb7e017e74a2e4646419988a6c363a Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Mon, 28 Sep 2015 18:52:28 -0400 Subject: [PATCH] Fix up pkcs8.h. Somehow we ended up with duplicate 'Deprecated functions' sections. PKCS12_get_key_and_certs ended up in one of them was probably an oversight. Change-Id: Ia6d6a44132cb2730ee1f92a6bbcfa8ce168e7d08 Reviewed-on: https://boringssl-review.googlesource.com/6020 Reviewed-by: Adam Langley --- include/openssl/pkcs8.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/include/openssl/pkcs8.h b/include/openssl/pkcs8.h index bb6b03c8..a9b1a71e 100644 --- a/include/openssl/pkcs8.h +++ b/include/openssl/pkcs8.h @@ -106,6 +106,14 @@ OPENSSL_EXPORT PKCS8_PRIV_KEY_INFO *PKCS8_decrypt_pbe(X509_SIG *pkcs8, const uint8_t *pass_raw, size_t pass_raw_len); +/* PKCS12_get_key_and_certs parses a PKCS#12 structure from |in|, authenticates + * and decrypts it using |password|, sets |*out_key| to the included private + * key and appends the included certificates to |out_certs|. It returns one on + * success and zero on error. The caller takes ownership of the outputs. */ +OPENSSL_EXPORT int PKCS12_get_key_and_certs(EVP_PKEY **out_key, + STACK_OF(X509) *out_certs, + CBS *in, const char *password); + /* Deprecated functions. */ @@ -127,17 +135,6 @@ OPENSSL_EXPORT PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *pkcs8, const char *pass, int pass_len); -/* PKCS12_get_key_and_certs parses a PKCS#12 structure from |in|, authenticates - * and decrypts it using |password|, sets |*out_key| to the included private - * key and appends the included certificates to |out_certs|. It returns one on - * success and zero on error. The caller takes ownership of the outputs. */ -OPENSSL_EXPORT int PKCS12_get_key_and_certs(EVP_PKEY **out_key, - STACK_OF(X509) *out_certs, - CBS *in, const char *password); - - -/* Deprecated functions. */ - /* PKCS12_PBE_add does nothing. It exists for compatibility with OpenSSL. */ OPENSSL_EXPORT void PKCS12_PBE_add(void);