Fixed merge nonsense
authorAlex Gaynor <alex.gaynor@gmail.com>
Thu, 20 Apr 2017 22:47:53 +0000 (18:47 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 22 May 2017 12:03:22 +0000 (08:03 -0400)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3149)

test/ct_test.c

index 67c8457..6b36a43 100644 (file)
@@ -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;