summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-02-27 21:10:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-27 21:10:32 +0000
commit0931866b30ca9c7b7694ff219d1a1868e4db8231 (patch)
treee425333211def8776ad3fd78465699213022238a /src/include
parentc897c7e9b822ebe6bc75a0d152bd01d9828d24ee (diff)
parent13a2c994a655cbabc53ccaae76c83d6ece01e183 (diff)
downloadexternal_boringssl-0931866b30ca9c7b7694ff219d1a1868e4db8231.zip
external_boringssl-0931866b30ca9c7b7694ff219d1a1868e4db8231.tar.gz
external_boringssl-0931866b30ca9c7b7694ff219d1a1868e4db8231.tar.bz2
Merge "Add support for reading PKCS#7 data from PEM files."
Diffstat (limited to 'src/include')
-rw-r--r--src/include/openssl/x509.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/include/openssl/x509.h b/src/include/openssl/x509.h
index 987c353..2a79887 100644
--- a/src/include/openssl/x509.h
+++ b/src/include/openssl/x509.h
@@ -1178,6 +1178,17 @@ OPENSSL_EXPORT int PKCS7_get_CRLs(STACK_OF(X509_CRL) *out_crls, CBS *cbs);
* |crls| to |out|. It returns one on success and zero on error. */
OPENSSL_EXPORT int PKCS7_bundle_CRLs(CBB *out, const STACK_OF(X509_CRL) *crls);
+/* PKCS7_get_PEM_certificates reads a PEM-encoded, PKCS#7, SignedData structure
+ * from |pem_bio| and appends the included certificates to |out_certs|. It
+ * returns one on success and zero on error. */
+OPENSSL_EXPORT int PKCS7_get_PEM_certificates(STACK_OF(X509) *out_certs,
+ BIO *pem_bio);
+
+/* PKCS7_get_PEM_CRLs reads a PEM-encoded, PKCS#7, SignedData structure from
+ * |pem_bio| and appends the included CRLs to |out_crls|. It returns one on
+ * success and zero on error. */
+OPENSSL_EXPORT int PKCS7_get_PEM_CRLs(STACK_OF(X509_CRL) *out_crls,
+ BIO *pem_bio);
/* EVP_PK values indicate the algorithm of the public key in a certificate. */