diff options
author | tb <> | 2024-08-03 04:50:27 +0000 |
---|---|---|
committer | tb <> | 2024-08-03 04:50:27 +0000 |
commit | 795f6cc947a840bd8785ed0cad261a251e7f3ee6 (patch) | |
tree | ab072a8587850bb026552dec2888fdf2051ad344 /src/lib/libssl/ssl.h | |
parent | 8f247dc49d0a8e1e624ddd39b58455f90c3f00f5 (diff) | |
download | openbsd-795f6cc947a840bd8785ed0cad261a251e7f3ee6.tar.gz openbsd-795f6cc947a840bd8785ed0cad261a251e7f3ee6.tar.bz2 openbsd-795f6cc947a840bd8785ed0cad261a251e7f3ee6.zip |
Prepare to provide SSL_CTX_set1_cert_store()
SSL_CTX_set_cert_store() should have been called SSL_CTX_set0_cert_store()
since it takes ownership of the store argument. Apparently a few people ran
into the issue of not bumping the refcount themselves, leading to use after
frees about 10 years ago. This is a quite rarely used API and there are no
misuses in the ports tree, but since someone did the work of writing a diff,
we can still add it.
Needless to say that SSL_CTX_get_cert_store() obviously has the exact same
issue and nobody seems to have thought of adding a get0 or get1 version to
match...
Fixes https://github.com/libressl/openbsd/issues/71
From Kenjiro Nakayama
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index d8846a4851..7f9db94066 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.239 2024/07/14 15:39:36 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.240 2024/08/03 04:50:27 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 | * |
@@ -1107,6 +1107,9 @@ long SSL_CTX_set_timeout(SSL_CTX *ctx, long t); | |||
1107 | long SSL_CTX_get_timeout(const SSL_CTX *ctx); | 1107 | long SSL_CTX_get_timeout(const SSL_CTX *ctx); |
1108 | X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *); | 1108 | X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *); |
1109 | void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *); | 1109 | void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *); |
1110 | #if defined(LIBRESSL_INTERNAL) || defined(LIBRESSL_NEXT_API) | ||
1111 | void SSL_CTX_set1_cert_store(SSL_CTX *ctx, X509_STORE *store); | ||
1112 | #endif | ||
1110 | X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx); | 1113 | X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx); |
1111 | EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx); | 1114 | EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx); |
1112 | int SSL_want(const SSL *s); | 1115 | int SSL_want(const SSL *s); |