summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-02-27 13:04:41 -0800
committerAdam Langley <agl@google.com>2015-02-27 13:04:41 -0800
commit13a2c994a655cbabc53ccaae76c83d6ece01e183 (patch)
tree72221e6482fb0d327fdcfa9eff0d66d1cb79c39a /src/include
parent46ba7161f20f8b1e6729384a98e1b9973ed3c908 (diff)
downloadexternal_boringssl-13a2c994a655cbabc53ccaae76c83d6ece01e183.zip
external_boringssl-13a2c994a655cbabc53ccaae76c83d6ece01e183.tar.gz
external_boringssl-13a2c994a655cbabc53ccaae76c83d6ece01e183.tar.bz2
Add support for reading PKCS#7 data from PEM files.
(This is a backport of upstream BoringSSL's 4e581b5378d7ef435c9abe39ad5c2a334bd7b6e9.) Change-Id: If799791f28cd37ce810c0065939cf1942771c7f7
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. */