From d01f579537c8999cab6b1bf97cfb2760827ceeae Mon Sep 17 00:00:00 2001 From: jsing <> Date: Wed, 14 Oct 2020 16:44:15 +0000 Subject: Mark DTLS methods as DTLS. Rather than inferring DTLS from the method version, add a field that marks a method as specifically being DTLS. Have SSL_IS_DTLS condition on this rather than on version. ok tb@ --- src/lib/libssl/ssl_locl.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/libssl/ssl_locl.h') diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index f2e1cb97f8..12838bf294 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.304 2020/10/11 12:45:52 guenther Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.305 2020/10/14 16:44:15 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -315,7 +315,7 @@ __BEGIN_HIDDEN_DECLS /* Check if an SSL structure is using DTLS. */ #define SSL_IS_DTLS(s) \ - (s->method->internal->version == DTLS1_VERSION) + (s->method->internal->dtls) /* See if we use signature algorithms extension. */ #define SSL_USE_SIGALGS(s) \ @@ -362,6 +362,7 @@ __BEGIN_HIDDEN_DECLS #define NAMED_CURVE_TYPE 3 typedef struct ssl_method_internal_st { + int dtls; int version; uint16_t min_version; -- cgit v1.2.3-55-g6feb