summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2022-06-07 17:35:49 +0000
committertb <>2022-06-07 17:35:49 +0000
commit3463ce4d0467efc2d4ee3aa9a081439579917085 (patch)
tree597507054c7c84b506b3e168a0af0f283d8f99d3 /src/lib
parent8214b143dc02a8f5d559d0bfb7dc0c56acd7ab98 (diff)
downloadopenbsd-3463ce4d0467efc2d4ee3aa9a081439579917085.tar.gz
openbsd-3463ce4d0467efc2d4ee3aa9a081439579917085.tar.bz2
openbsd-3463ce4d0467efc2d4ee3aa9a081439579917085.zip
Another small readability tweak: compare explicitly against 0 and NULL,
respectively ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/ssl_clnt.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 6f93b55ddc..281865aaea 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.143 2022/06/07 17:14:17 tb Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.144 2022/06/07 17:35:49 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 *
@@ -652,9 +652,8 @@ ssl3_send_client_hello(SSL *s)
652 } 652 }
653 s->version = max_version; 653 s->version = max_version;
654 654
655 if (sess == NULL || 655 if (sess == NULL || sess->ssl_version != s->version ||
656 sess->ssl_version != s->version || 656 (sess->session_id_length == 0 && sess->tlsext_tick == NULL) ||
657 (!sess->session_id_length && !sess->tlsext_tick) ||
658 sess->not_resumable) { 657 sess->not_resumable) {
659 if (!ssl_get_new_session(s, 0)) 658 if (!ssl_get_new_session(s, 0))
660 goto err; 659 goto err;