From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 20 Apr 2017 22:47:53 +0000 (-0400)
Subject: Fixed merge nonsense
X-Git-Tag: OpenSSL_1_1_1-pre1~1463
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2b10cb5c0e21bce283f4c73477d97f6bd8b4a7ec;p=oweals%2Fopenssl.git

Fixed merge nonsense

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3149)
---

diff --git a/test/ct_test.c b/test/ct_test.c
index 67c8457032..6b36a43469 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -265,8 +265,6 @@ 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;