diff options
| author | tb <> | 2022-06-29 21:17:22 +0000 |
|---|---|---|
| committer | tb <> | 2022-06-29 21:17:22 +0000 |
| commit | 1659fcae3b1f56c481417ed6a56599849902a269 (patch) | |
| tree | 714bc05e273fcf4d1fec0ddfff0bd9cf80adb8b4 /src/lib/libssl/s3_lib.c | |
| parent | 7df4733047181bc904cd562512408a05140865f4 (diff) | |
| download | openbsd-1659fcae3b1f56c481417ed6a56599849902a269.tar.gz openbsd-1659fcae3b1f56c481417ed6a56599849902a269.tar.bz2 openbsd-1659fcae3b1f56c481417ed6a56599849902a269.zip | |
ssl_cert_set{0,1}_chain() take ssl/ctx
ok beck jsing
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 12eb9f4af4..abc72565fa 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s3_lib.c,v 1.231 2022/06/29 17:39:20 beck Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.232 2022/06/29 21:17:22 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 | * |
| @@ -1867,13 +1867,13 @@ _SSL_set_tlsext_status_ocsp_resp(SSL *s, unsigned char *resp, int resp_len) | |||
| 1867 | int | 1867 | int |
| 1868 | SSL_set0_chain(SSL *ssl, STACK_OF(X509) *chain) | 1868 | SSL_set0_chain(SSL *ssl, STACK_OF(X509) *chain) |
| 1869 | { | 1869 | { |
| 1870 | return ssl_cert_set0_chain(ssl->cert, chain); | 1870 | return ssl_cert_set0_chain(NULL, ssl, chain); |
| 1871 | } | 1871 | } |
| 1872 | 1872 | ||
| 1873 | int | 1873 | int |
| 1874 | SSL_set1_chain(SSL *ssl, STACK_OF(X509) *chain) | 1874 | SSL_set1_chain(SSL *ssl, STACK_OF(X509) *chain) |
| 1875 | { | 1875 | { |
| 1876 | return ssl_cert_set1_chain(ssl->cert, chain); | 1876 | return ssl_cert_set1_chain(NULL, ssl, chain); |
| 1877 | } | 1877 | } |
| 1878 | 1878 | ||
| 1879 | int | 1879 | int |
| @@ -1902,7 +1902,7 @@ SSL_get0_chain_certs(const SSL *ssl, STACK_OF(X509) **out_chain) | |||
| 1902 | int | 1902 | int |
| 1903 | SSL_clear_chain_certs(SSL *ssl) | 1903 | SSL_clear_chain_certs(SSL *ssl) |
| 1904 | { | 1904 | { |
| 1905 | return ssl_cert_set0_chain(ssl->cert, NULL); | 1905 | return ssl_cert_set0_chain(NULL, ssl, NULL); |
| 1906 | } | 1906 | } |
| 1907 | 1907 | ||
| 1908 | int | 1908 | int |
| @@ -2255,13 +2255,13 @@ _SSL_CTX_set_tlsext_status_arg(SSL_CTX *ctx, void *arg) | |||
| 2255 | int | 2255 | int |
| 2256 | SSL_CTX_set0_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) | 2256 | SSL_CTX_set0_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) |
| 2257 | { | 2257 | { |
| 2258 | return ssl_cert_set0_chain(ctx->internal->cert, chain); | 2258 | return ssl_cert_set0_chain(ctx, NULL, chain); |
| 2259 | } | 2259 | } |
| 2260 | 2260 | ||
| 2261 | int | 2261 | int |
| 2262 | SSL_CTX_set1_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) | 2262 | SSL_CTX_set1_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) |
| 2263 | { | 2263 | { |
| 2264 | return ssl_cert_set1_chain(ctx->internal->cert, chain); | 2264 | return ssl_cert_set1_chain(ctx, NULL, chain); |
| 2265 | } | 2265 | } |
| 2266 | 2266 | ||
| 2267 | int | 2267 | int |
| @@ -2290,7 +2290,7 @@ SSL_CTX_get0_chain_certs(const SSL_CTX *ctx, STACK_OF(X509) **out_chain) | |||
| 2290 | int | 2290 | int |
| 2291 | SSL_CTX_clear_chain_certs(SSL_CTX *ctx) | 2291 | SSL_CTX_clear_chain_certs(SSL_CTX *ctx) |
| 2292 | { | 2292 | { |
| 2293 | return ssl_cert_set0_chain(ctx->internal->cert, NULL); | 2293 | return ssl_cert_set0_chain(ctx, NULL, NULL); |
| 2294 | } | 2294 | } |
| 2295 | 2295 | ||
| 2296 | static int | 2296 | static int |
