From b1a3030e3705f497a69ab72be433bdbe85affe6a Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 10 Apr 2017 17:11:01 -0400 Subject: [PATCH] Newlines! Reviewed-by: Matt Caswell Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3149) --- crypto/ct/ct_x509v3.c | 4 ++++ test/ct_test.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/crypto/ct/ct_x509v3.c b/crypto/ct/ct_x509v3.c index a6c7331b80..ec186d1f5b 100644 --- a/crypto/ct/ct_x509v3.c +++ b/crypto/ct/ct_x509v3.c @@ -34,8 +34,10 @@ static int set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source) { if (s != NULL) { int i; + for (i = 0; i < sk_SCT_num(s); i++) { int res = SCT_set_source(sk_SCT_value(s, i), source); + if (res != 1) { return 0; } @@ -49,6 +51,7 @@ static STACK_OF(SCT) *x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a, long len) { STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len); + if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) { SCT_LIST_free(s); *a = NULL; @@ -62,6 +65,7 @@ static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a, long len) { STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len); + if (set_sct_list_source(s, SCT_SOURCE_OCSP_STAPLED_RESPONSE) != 1) { SCT_LIST_free(s); *a = NULL; diff --git a/test/ct_test.c b/test/ct_test.c index 6b36a43469..67c8457032 100644 --- a/test/ct_test.c +++ b/test/ct_test.c @@ -265,6 +265,8 @@ static int execute_cert_test(CT_TEST_FIXTURE fixture) int i; X509_EXTENSION *sct_extension = NULL; + cert = load_pem_cert(fixture.certs_dir, fixture.certificate_file); + if (!TEST_ptr(cert = load_pem_cert(fixture.certs_dir, fixture.certificate_file))) goto end; -- GitLab