diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index ce68981493..630724e670 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.331 2025/03/12 14:03:55 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.333 2025/06/09 10:14:38 tb 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 | * |
@@ -1298,7 +1298,7 @@ SSL_shutdown(SSL *s) | |||
1298 | return (-1); | 1298 | return (-1); |
1299 | } | 1299 | } |
1300 | 1300 | ||
1301 | if (s != NULL && !SSL_in_init(s)) | 1301 | if (!SSL_in_init(s)) |
1302 | return (s->method->ssl_shutdown(s)); | 1302 | return (s->method->ssl_shutdown(s)); |
1303 | 1303 | ||
1304 | return (1); | 1304 | return (1); |
@@ -3008,8 +3008,9 @@ SSL_dup(SSL *s) | |||
3008 | 3008 | ||
3009 | /* Dup the client_CA list */ | 3009 | /* Dup the client_CA list */ |
3010 | if (s->client_CA != NULL) { | 3010 | if (s->client_CA != NULL) { |
3011 | if ((sk = sk_X509_NAME_dup(s->client_CA)) == NULL) goto err; | 3011 | if ((sk = sk_X509_NAME_dup(s->client_CA)) == NULL) |
3012 | ret->client_CA = sk; | 3012 | goto err; |
3013 | ret->client_CA = sk; | ||
3013 | for (i = 0; i < sk_X509_NAME_num(sk); i++) { | 3014 | for (i = 0; i < sk_X509_NAME_num(sk); i++) { |
3014 | xn = sk_X509_NAME_value(sk, i); | 3015 | xn = sk_X509_NAME_value(sk, i); |
3015 | if (sk_X509_NAME_set(sk, i, | 3016 | if (sk_X509_NAME_set(sk, i, |