summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authorjsing <>2017-01-23 05:13:02 +0000
committerjsing <>2017-01-23 05:13:02 +0000
commitf38881420fba9a207cd725b6a35181faeecf26b9 (patch)
tree50ca3784f76b348ba017005a955c6a288b176b57 /src/lib/libssl/ssl_cert.c
parentc35f51566045be89c49b0a47e153fdb27ec20f8e (diff)
downloadopenbsd-f38881420fba9a207cd725b6a35181faeecf26b9.tar.gz
openbsd-f38881420fba9a207cd725b6a35181faeecf26b9.tar.bz2
openbsd-f38881420fba9a207cd725b6a35181faeecf26b9.zip
Move most of the fields in SSL_CTX to internal - the ones that remain are
known to be in use. ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r--src/lib/libssl/ssl_cert.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 13591aec9c..496fcf85bc 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_cert.c,v 1.56 2017/01/23 04:55:27 beck Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.57 2017/01/23 05:13:02 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -492,13 +492,13 @@ SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list)
492void 492void
493SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list) 493SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list)
494{ 494{
495 set_client_CA_list(&(ctx->client_CA), name_list); 495 set_client_CA_list(&(ctx->internal->client_CA), name_list);
496} 496}
497 497
498STACK_OF(X509_NAME) * 498STACK_OF(X509_NAME) *
499SSL_CTX_get_client_CA_list(const SSL_CTX *ctx) 499SSL_CTX_get_client_CA_list(const SSL_CTX *ctx)
500{ 500{
501 return (ctx->client_CA); 501 return (ctx->internal->client_CA);
502} 502}
503 503
504STACK_OF(X509_NAME) * 504STACK_OF(X509_NAME) *
@@ -515,7 +515,7 @@ SSL_get_client_CA_list(const SSL *s)
515 if (s->client_CA != NULL) 515 if (s->client_CA != NULL)
516 return (s->client_CA); 516 return (s->client_CA);
517 else 517 else
518 return (s->ctx->client_CA); 518 return (s->ctx->internal->client_CA);
519 } 519 }
520} 520}
521 521
@@ -548,7 +548,7 @@ SSL_add_client_CA(SSL *ssl, X509 *x)
548int 548int
549SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) 549SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x)
550{ 550{
551 return (add_client_CA(&(ctx->client_CA), x)); 551 return (add_client_CA(&(ctx->internal->client_CA), x));
552} 552}
553 553
554static int 554static int