public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix preprocessor indentation.

Browse source 
Rework main() to be in the style of the other conditional tests.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3711)
This commit is contained in:
Pauli 2017-06-19 11:35:25 +10:00 • committed by Rich Salz
parent 729ef85611
commit 9b579777c5
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
test/ct_test.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
* *
* Licensed under the OpenSSL license (the "License"). You may not use * Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy * this file except in compliance with the License. You can obtain a copy
@ -22,7 +22,7 @@
#ifndef OPENSSL_NO_CT #ifndef OPENSSL_NO_CT
/* Used when declaring buffers to read text files into */ /* Used when declaring buffers to read text files into */
#define CT_TEST_MAX_FILE_SIZE 8096 # define CT_TEST_MAX_FILE_SIZE 8096
static char *certs_dir = NULL; static char *certs_dir = NULL;
static char *ct_dir = NULL; static char *ct_dir = NULL;
@ -87,11 +87,11 @@ static void tear_down(CT_TEST_FIXTURE fixture)
static char *mk_file_path(const char *dir, const char *file) static char *mk_file_path(const char *dir, const char *file)
{ {
#ifndef OPENSSL_SYS_VMS # ifndef OPENSSL_SYS_VMS
const char *sep = "/"; const char *sep = "/";
#else # else
const char *sep = ""; const char *sep = "";
#endif # endif
size_t len = strlen(dir) + strlen(sep) + strlen(file) + 1; size_t len = strlen(dir) + strlen(sep) + strlen(file) + 1;
char *full_file = OPENSSL_zalloc(len); char *full_file = OPENSSL_zalloc(len);
@ -341,8 +341,8 @@ end:
return success; return success;
} }
#define SETUP_CT_TEST_FIXTURE() SETUP_TEST_FIXTURE(CT_TEST_FIXTURE, set_up) # define SETUP_CT_TEST_FIXTURE() SETUP_TEST_FIXTURE(CT_TEST_FIXTURE, set_up)
#define EXECUTE_CT_TEST() EXECUTE_TEST(execute_cert_test, tear_down) # define EXECUTE_CT_TEST() EXECUTE_TEST(execute_cert_test, tear_down)
static int test_no_scts_in_certificate(void) static int test_no_scts_in_certificate(void)
{ {
@ -499,9 +499,11 @@ static int test_ctlog_from_base64(void)
return 0; return 0;
return 1; return 1;
} }
#endif
int test_main(int argc, char *argv[]) int test_main(int argc, char *argv[])
{ {
#ifndef OPENSSL_NO_CT
if ((ct_dir = getenv("CT_DIR")) == NULL) if ((ct_dir = getenv("CT_DIR")) == NULL)
ct_dir = "ct"; ct_dir = "ct";
if ((certs_dir = getenv("CERTS_DIR")) == NULL) if ((certs_dir = getenv("CERTS_DIR")) == NULL)
@ -519,11 +521,8 @@ int test_main(int argc, char *argv[])
ADD_TEST(test_ctlog_from_base64); ADD_TEST(test_ctlog_from_base64);
return run_tests(argv[0]); return run_tests(argv[0]);
}
#else #else
int test_main(int argc, char *argv[])
{
printf("No CT support\n"); printf("No CT support\n");
return 0; return EXIT_SUCCESS;
}
#endif #endif
}