diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-04-20 18:47:53 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-05-22 08:03:22 -0400 |
| commit | 2b10cb5c0e21bce283f4c73477d97f6bd8b4a7ec (patch) | |
| tree | 16f83a8f0836a4d1fd3edfb49a1b87f6afe768b7 /test/ct_test.c | |
| parent | b1a3030e3705f497a69ab72be433bdbe85affe6a (diff) | |
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)
Diffstat (limited to 'test/ct_test.c')
| -rw-r--r-- | test/ct_test.c | 2 |
1 files changed, 0 insertions, 2 deletions
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; |