diff options
| author | Rob Percival <robpercival@google.com> | 2016-03-10 23:10:02 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-11 09:05:46 -0500 |
| commit | b536958205350bb3ce98e02ce4a06b4b2506ba65 (patch) | |
| tree | 608ed5fcf29d8dd3d25cfcebce01573d4fa118eb | |
| parent | ad87a3dc2ca3bfd4642cf2fdc524535916a85c2c (diff) | |
Surround ctx_set_ctlog_list_file() with #ifndef OPENSSL_NO_CT
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | apps/apps.c | 4 | ||||
| -rw-r--r-- | apps/apps.h | 4 | ||||
| -rw-r--r-- | apps/s_client.c | 2 | ||||
| -rw-r--r-- | test/ssltest.c | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/apps/apps.c b/apps/apps.c index 9bbb39e139..c76e3e345d 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -235,6 +235,8 @@ int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile, return SSL_CTX_load_verify_locations(ctx, CAfile, CApath); } +#ifndef OPENSSL_NO_CT + int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path) { if (path == NULL) { @@ -244,6 +246,8 @@ int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path) return SSL_CTX_set_ctlog_list_file(ctx, path); } +#endif + int dump_cert_text(BIO *out, X509 *x) { char *p; diff --git a/apps/apps.h b/apps/apps.h index 2f0b475a52..3d146b10d8 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -491,6 +491,8 @@ __owur int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath, int noCAfile, int noCApath); +#ifndef OPENSSL_NO_CT + /* * Sets the file to load the Certificate Transparency log list from. * If path is NULL, loads from the default file path. @@ -498,6 +500,8 @@ __owur int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile, */ __owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path); +#endif + # ifdef OPENSSL_NO_ENGINE # define setup_engine(engine, debug) NULL # else diff --git a/apps/s_client.c b/apps/s_client.c index 9c3e6aedd5..20ede4b188 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2569,8 +2569,8 @@ static void print_stuff(BIO *bio, SSL *s, int full) unsigned char *exportedkeymat; #ifndef OPENSSL_NO_CT const STACK_OF(SCT) *scts; -#endif const SSL_CTX *ctx = SSL_get_SSL_CTX(s); +#endif if (full) { int got_a_chain = 0; diff --git a/test/ssltest.c b/test/ssltest.c index c3faad77ea..9460da57e7 100644 --- a/test/ssltest.c +++ b/test/ssltest.c @@ -1615,11 +1615,13 @@ int main(int argc, char *argv[]) /* goto end; */ } +#ifndef OPENSSL_NO_CT if (!SSL_CTX_set_default_ctlog_list_file(s_ctx) || !SSL_CTX_set_default_ctlog_list_file(s_ctx2) || !SSL_CTX_set_default_ctlog_list_file(c_ctx)) { ERR_print_errors(bio_err); } +#endif if (client_auth) { printf("client authentication\n"); |