diff options
author | Robert Sloan <varomodt@google.com> | 2017-03-13 08:03:59 -0700 |
---|---|---|
committer | Robert Sloan <varomodt@google.com> | 2017-03-13 08:04:08 -0700 |
commit | 1c9db5392e4ec0845f9a934061677636f5400d14 (patch) | |
tree | 72f78bdf659aa12daca5389c5d9bbd96e4278ff9 /src/crypto/x509v3 | |
parent | 7d422bcfd9ada9af993f3f332e789ff2d4928c3e (diff) | |
download | boringssl-1c9db5392e4ec0845f9a934061677636f5400d14.tar.gz |
external/boringssl: Sync to 2070f8ad9151dc8f3a73bffaa146b5e6937a583f.android-n-mr2-preview-2
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/8ebeabf0e2e01b331e56d0a491c12539baa55d3d..2070f8ad9151dc8f3a73bffaa146b5e6937a583f
Test: BoringSSL CTS Presubmits
Change-Id: Ia779c6476e45c44e426e09afeca65b2192e783ae
Diffstat (limited to 'src/crypto/x509v3')
-rw-r--r-- | src/crypto/x509v3/v3_pci.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/crypto/x509v3/v3_pci.c b/src/crypto/x509v3/v3_pci.c index 68dca5e7..4352abee 100644 --- a/src/crypto/x509v3/v3_pci.c +++ b/src/crypto/x509v3/v3_pci.c @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include <stdio.h> #include <string.h> #include <openssl/conf.h> @@ -153,38 +152,6 @@ static int process_pci_value(CONF_VALUE *val, goto err; } OPENSSL_free(tmp_data2); - } else if (strncmp(val->value, "file:", 5) == 0) { - unsigned char buf[2048]; - int n; - BIO *b = BIO_new_file(val->value + 5, "r"); - if (!b) { - OPENSSL_PUT_ERROR(X509V3, ERR_R_BIO_LIB); - X509V3_conf_err(val); - goto err; - } - while ((n = BIO_read(b, buf, sizeof(buf))) > 0 - || (n == 0 && BIO_should_retry(b))) { - if (!n) - continue; - - tmp_data = OPENSSL_realloc((*policy)->data, - (*policy)->length + n + 1); - - if (!tmp_data) - break; - - (*policy)->data = tmp_data; - OPENSSL_memcpy(&(*policy)->data[(*policy)->length], buf, n); - (*policy)->length += n; - (*policy)->data[(*policy)->length] = '\0'; - } - BIO_free_all(b); - - if (n < 0) { - OPENSSL_PUT_ERROR(X509V3, ERR_R_BIO_LIB); - X509V3_conf_err(val); - goto err; - } } else if (strncmp(val->value, "text:", 5) == 0) { val_len = strlen(val->value + 5); tmp_data = OPENSSL_realloc((*policy)->data, |