From 8ffcb0167d4ed2b22d2f40362b1686eb7a98f30a Mon Sep 17 00:00:00 2001 From: jsing <> Date: Wed, 14 Oct 2020 16:57:33 +0000 Subject: Replace SSL_IS_DTLS with SSL_is_dtls(). Garbage collect the now unused SSL_IS_DTLS macro. ok tb@ --- src/lib/libssl/s3_lib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/lib/libssl/s3_lib.c') diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 3bd7d65522..0d10fdfe63 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.200 2020/10/11 12:45:51 guenther Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.201 2020/10/14 16:57:33 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1447,7 +1447,7 @@ ssl3_pending(const SSL *s) int ssl3_handshake_msg_hdr_len(SSL *s) { - return (SSL_IS_DTLS(s) ? DTLS1_HM_HEADER_LENGTH : + return (SSL_is_dtls(s) ? DTLS1_HM_HEADER_LENGTH : SSL3_HM_HEADER_LENGTH); } @@ -1460,7 +1460,7 @@ ssl3_handshake_msg_start(SSL *s, CBB *handshake, CBB *body, uint8_t msg_type) goto err; if (!CBB_add_u8(handshake, msg_type)) goto err; - if (SSL_IS_DTLS(s)) { + if (SSL_is_dtls(s)) { unsigned char *data; if (!CBB_add_space(handshake, &data, DTLS1_HM_HEADER_LENGTH - @@ -1497,7 +1497,7 @@ ssl3_handshake_msg_finish(SSL *s, CBB *handshake) s->internal->init_num = (int)outlen; s->internal->init_off = 0; - if (SSL_IS_DTLS(s)) { + if (SSL_is_dtls(s)) { unsigned long len; uint8_t msg_type; CBS cbs; @@ -1529,7 +1529,7 @@ ssl3_handshake_write(SSL *s) int ssl3_record_write(SSL *s, int type) { - if (SSL_IS_DTLS(s)) + if (SSL_is_dtls(s)) return dtls1_do_write(s, type); return ssl3_do_write(s, type); -- cgit v1.2.3-55-g6feb