diff options
| author | jsing <> | 2017-01-23 05:13:02 +0000 |
|---|---|---|
| committer | jsing <> | 2017-01-23 05:13:02 +0000 |
| commit | 4630d5542486d6e54b467c2ff4c949c001f4c5f6 (patch) | |
| tree | 50ca3784f76b348ba017005a955c6a288b176b57 /src/lib/libssl/ssl_cert.c | |
| parent | 98459d42c7a847e84cc12f2d7df5e16e0f44839c (diff) | |
| download | openbsd-4630d5542486d6e54b467c2ff4c949c001f4c5f6.tar.gz openbsd-4630d5542486d6e54b467c2ff4c949c001f4c5f6.tar.bz2 openbsd-4630d5542486d6e54b467c2ff4c949c001f4c5f6.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.c | 10 |
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) | |||
| 492 | void | 492 | void |
| 493 | SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list) | 493 | SSL_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 | ||
| 498 | STACK_OF(X509_NAME) * | 498 | STACK_OF(X509_NAME) * |
| 499 | SSL_CTX_get_client_CA_list(const SSL_CTX *ctx) | 499 | SSL_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 | ||
| 504 | STACK_OF(X509_NAME) * | 504 | STACK_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) | |||
| 548 | int | 548 | int |
| 549 | SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) | 549 | SSL_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 | ||
| 554 | static int | 554 | static int |
