summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authorbeck <>2017-01-23 06:45:30 +0000
committerbeck <>2017-01-23 06:45:30 +0000
commitfedd988b9f44e5e0ccf1a340f14354f32800d524 (patch)
treedfb700c2a3d1498e8069f1fab4c6691ef0f3fef1 /src/lib/libssl/ssl_cert.c
parent3b1c7c5973d7e6aca42940bd4e07900c35d585f5 (diff)
downloadopenbsd-fedd988b9f44e5e0ccf1a340f14354f32800d524.tar.gz
openbsd-fedd988b9f44e5e0ccf1a340f14354f32800d524.tar.bz2
openbsd-fedd988b9f44e5e0ccf1a340f14354f32800d524.zip
Move a large part of ssl_st into internal, so we can see what squeals.
ok jsing@
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r--src/lib/libssl/ssl_cert.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 496fcf85bc..c23e789bf8 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.57 2017/01/23 05:13:02 jsing Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.58 2017/01/23 06:45:30 beck 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 *
@@ -486,7 +486,7 @@ SSL_dup_CA_list(STACK_OF(X509_NAME) *sk)
486void 486void
487SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list) 487SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list)
488{ 488{
489 set_client_CA_list(&(s->client_CA), name_list); 489 set_client_CA_list(&(s->internal->client_CA), name_list);
490} 490}
491 491
492void 492void
@@ -504,7 +504,7 @@ SSL_CTX_get_client_CA_list(const SSL_CTX *ctx)
504STACK_OF(X509_NAME) * 504STACK_OF(X509_NAME) *
505SSL_get_client_CA_list(const SSL *s) 505SSL_get_client_CA_list(const SSL *s)
506{ 506{
507 if (s->type == SSL_ST_CONNECT) { 507 if (s->internal->type == SSL_ST_CONNECT) {
508 /* We are in the client. */ 508 /* We are in the client. */
509 if (((s->version >> 8) == SSL3_VERSION_MAJOR) && 509 if (((s->version >> 8) == SSL3_VERSION_MAJOR) &&
510 (s->s3 != NULL)) 510 (s->s3 != NULL))
@@ -512,8 +512,8 @@ SSL_get_client_CA_list(const SSL *s)
512 else 512 else
513 return (NULL); 513 return (NULL);
514 } else { 514 } else {
515 if (s->client_CA != NULL) 515 if (s->internal->client_CA != NULL)
516 return (s->client_CA); 516 return (s->internal->client_CA);
517 else 517 else
518 return (s->ctx->internal->client_CA); 518 return (s->ctx->internal->client_CA);
519 } 519 }
@@ -542,7 +542,7 @@ add_client_CA(STACK_OF(X509_NAME) **sk, X509 *x)
542int 542int
543SSL_add_client_CA(SSL *ssl, X509 *x) 543SSL_add_client_CA(SSL *ssl, X509 *x)
544{ 544{
545 return (add_client_CA(&(ssl->client_CA), x)); 545 return (add_client_CA(&(ssl->internal->client_CA), x));
546} 546}
547 547
548int 548int