diff options
author | tb <> | 2023-09-19 01:22:31 +0000 |
---|---|---|
committer | tb <> | 2023-09-19 01:22:31 +0000 |
commit | 6b95b6b6902a1621638a431b4e1944a9b154e3de (patch) | |
tree | 13a655a01894e78ded13f506573d5d4187faefde /src | |
parent | 254deaaade830ec006cac688d236c1bac25ca8c4 (diff) | |
download | openbsd-6b95b6b6902a1621638a431b4e1944a9b154e3de.tar.gz openbsd-6b95b6b6902a1621638a431b4e1944a9b154e3de.tar.bz2 openbsd-6b95b6b6902a1621638a431b4e1944a9b154e3de.zip |
More 0/NULL confusions in SSL_CTX_new()
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 8f1add981c..0ac393f73c 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.313 2023/09/19 01:19:45 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.314 2023/09/19 01:22:31 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 | * |
@@ -292,7 +292,7 @@ SSL_new(SSL_CTX *ctx) | |||
292 | 292 | ||
293 | CRYPTO_add(&ctx->references, 1, CRYPTO_LOCK_SSL_CTX); | 293 | CRYPTO_add(&ctx->references, 1, CRYPTO_LOCK_SSL_CTX); |
294 | s->ctx = ctx; | 294 | s->ctx = ctx; |
295 | s->tlsext_debug_cb = 0; | 295 | s->tlsext_debug_cb = NULL; |
296 | s->tlsext_debug_arg = NULL; | 296 | s->tlsext_debug_arg = NULL; |
297 | s->tlsext_ticket_expected = 0; | 297 | s->tlsext_ticket_expected = 0; |
298 | s->tlsext_status_type = -1; | 298 | s->tlsext_status_type = -1; |
@@ -2093,10 +2093,10 @@ SSL_CTX_new(const SSL_METHOD *meth) | |||
2093 | /* We take the system default */ | 2093 | /* We take the system default */ |
2094 | ret->session_timeout = ssl_get_default_timeout(); | 2094 | ret->session_timeout = ssl_get_default_timeout(); |
2095 | 2095 | ||
2096 | ret->new_session_cb = 0; | 2096 | ret->new_session_cb = NULL; |
2097 | ret->remove_session_cb = 0; | 2097 | ret->remove_session_cb = NULL; |
2098 | ret->get_session_cb = 0; | 2098 | ret->get_session_cb = NULL; |
2099 | ret->generate_session_id = 0; | 2099 | ret->generate_session_id = NULL; |
2100 | 2100 | ||
2101 | memset((char *)&ret->stats, 0, sizeof(ret->stats)); | 2101 | memset((char *)&ret->stats, 0, sizeof(ret->stats)); |
2102 | 2102 | ||
@@ -2105,12 +2105,12 @@ SSL_CTX_new(const SSL_METHOD *meth) | |||
2105 | 2105 | ||
2106 | ret->info_callback = NULL; | 2106 | ret->info_callback = NULL; |
2107 | 2107 | ||
2108 | ret->app_verify_callback = 0; | 2108 | ret->app_verify_callback = NULL; |
2109 | ret->app_verify_arg = NULL; | 2109 | ret->app_verify_arg = NULL; |
2110 | 2110 | ||
2111 | ret->max_cert_list = SSL_MAX_CERT_LIST_DEFAULT; | 2111 | ret->max_cert_list = SSL_MAX_CERT_LIST_DEFAULT; |
2112 | ret->read_ahead = 0; | 2112 | ret->read_ahead = 0; |
2113 | ret->msg_callback = 0; | 2113 | ret->msg_callback = NULL; |
2114 | ret->msg_callback_arg = NULL; | 2114 | ret->msg_callback_arg = NULL; |
2115 | ret->verify_mode = SSL_VERIFY_NONE; | 2115 | ret->verify_mode = SSL_VERIFY_NONE; |
2116 | ret->sid_ctx_length = 0; | 2116 | ret->sid_ctx_length = 0; |