提交 b5369582 编写于 作者: R Rob Percival 提交者: Rich Salz

Surround ctx_set_ctlog_list_file() with #ifndef OPENSSL_NO_CT

Reviewed-by: NEmilia Käsper <emilia@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 ad87a3dc
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册