generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Surround ctx_set_ctlog_list_file() with #ifndef OPENSSL_NO_CT

Browse Source 
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Rob Percival
2016-03-10 23:10:02 +00:00
committed by Rich Salz
parent ad87a3dc2c
commit b536958205
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/apps.c
View File

@@ -235,6 +235,8 @@ int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile,
return SSL_CTX_load_verify_locations(ctx, CAfile, CApath); 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) int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path)
{ {
if (path == NULL) { 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); return SSL_CTX_set_ctlog_list_file(ctx, path);
} }
#endif
int dump_cert_text(BIO *out, X509 *x) int dump_cert_text(BIO *out, X509 *x)
{ {
char *p; char *p;

4
apps/apps.h
View File

@@ -491,6 +491,8 @@ __owur int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile,
const char *CApath, int noCAfile, const char *CApath, int noCAfile,
int noCApath); int noCApath);
#ifndef OPENSSL_NO_CT
/* /*
* Sets the file to load the Certificate Transparency log list from. * Sets the file to load the Certificate Transparency log list from.
* If path is NULL, loads from the default file path. * 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); __owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
#endif
# ifdef OPENSSL_NO_ENGINE # ifdef OPENSSL_NO_ENGINE
# define setup_engine(engine, debug) NULL # define setup_engine(engine, debug) NULL
# else # else

2
apps/s_client.c
View File

@@ -2569,8 +2569,8 @@ static void print_stuff(BIO *bio, SSL *s, int full)
unsigned char *exportedkeymat; unsigned char *exportedkeymat;
#ifndef OPENSSL_NO_CT #ifndef OPENSSL_NO_CT
const STACK_OF(SCT) *scts; const STACK_OF(SCT) *scts;
#endif
const SSL_CTX *ctx = SSL_get_SSL_CTX(s); const SSL_CTX *ctx = SSL_get_SSL_CTX(s);
#endif
if (full) { if (full) {
int got_a_chain = 0; int got_a_chain = 0;

2
test/ssltest.c
View File

@@ -1615,11 +1615,13 @@ int main(int argc, char *argv[])
/* goto end; */ /* goto end; */
} }
#ifndef OPENSSL_NO_CT
if (!SSL_CTX_set_default_ctlog_list_file(s_ctx) || 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(s_ctx2) ||
!SSL_CTX_set_default_ctlog_list_file(c_ctx)) { !SSL_CTX_set_default_ctlog_list_file(c_ctx)) {
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
} }
#endif
if (client_auth) { if (client_auth) {
printf("client authentication\n"); printf("client authentication\n");