diff options
author | jsing <> | 2020-10-14 16:57:33 +0000 |
---|---|---|
committer | jsing <> | 2020-10-14 16:57:33 +0000 |
commit | e60f5a8fe5ed7844d5dc6f1c9dbcf86fce1ae298 (patch) | |
tree | 78cf866b36bb0fdd2fbaafb054ed0c36fcef0747 /src/lib/libssl/s3_lib.c | |
parent | a94866305ad306011ef3cb3dade3f2c6c1c5dec0 (diff) | |
download | openbsd-e60f5a8fe5ed7844d5dc6f1c9dbcf86fce1ae298.tar.gz openbsd-e60f5a8fe5ed7844d5dc6f1c9dbcf86fce1ae298.tar.bz2 openbsd-e60f5a8fe5ed7844d5dc6f1c9dbcf86fce1ae298.zip |
Replace SSL_IS_DTLS with SSL_is_dtls().
Garbage collect the now unused SSL_IS_DTLS macro.
ok tb@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.200 2020/10/11 12:45:51 guenther Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.201 2020/10/14 16:57:33 jsing 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 | * |
@@ -1447,7 +1447,7 @@ ssl3_pending(const SSL *s) | |||
1447 | int | 1447 | int |
1448 | ssl3_handshake_msg_hdr_len(SSL *s) | 1448 | ssl3_handshake_msg_hdr_len(SSL *s) |
1449 | { | 1449 | { |
1450 | return (SSL_IS_DTLS(s) ? DTLS1_HM_HEADER_LENGTH : | 1450 | return (SSL_is_dtls(s) ? DTLS1_HM_HEADER_LENGTH : |
1451 | SSL3_HM_HEADER_LENGTH); | 1451 | SSL3_HM_HEADER_LENGTH); |
1452 | } | 1452 | } |
1453 | 1453 | ||
@@ -1460,7 +1460,7 @@ ssl3_handshake_msg_start(SSL *s, CBB *handshake, CBB *body, uint8_t msg_type) | |||
1460 | goto err; | 1460 | goto err; |
1461 | if (!CBB_add_u8(handshake, msg_type)) | 1461 | if (!CBB_add_u8(handshake, msg_type)) |
1462 | goto err; | 1462 | goto err; |
1463 | if (SSL_IS_DTLS(s)) { | 1463 | if (SSL_is_dtls(s)) { |
1464 | unsigned char *data; | 1464 | unsigned char *data; |
1465 | 1465 | ||
1466 | if (!CBB_add_space(handshake, &data, DTLS1_HM_HEADER_LENGTH - | 1466 | if (!CBB_add_space(handshake, &data, DTLS1_HM_HEADER_LENGTH - |
@@ -1497,7 +1497,7 @@ ssl3_handshake_msg_finish(SSL *s, CBB *handshake) | |||
1497 | s->internal->init_num = (int)outlen; | 1497 | s->internal->init_num = (int)outlen; |
1498 | s->internal->init_off = 0; | 1498 | s->internal->init_off = 0; |
1499 | 1499 | ||
1500 | if (SSL_IS_DTLS(s)) { | 1500 | if (SSL_is_dtls(s)) { |
1501 | unsigned long len; | 1501 | unsigned long len; |
1502 | uint8_t msg_type; | 1502 | uint8_t msg_type; |
1503 | CBS cbs; | 1503 | CBS cbs; |
@@ -1529,7 +1529,7 @@ ssl3_handshake_write(SSL *s) | |||
1529 | int | 1529 | int |
1530 | ssl3_record_write(SSL *s, int type) | 1530 | ssl3_record_write(SSL *s, int type) |
1531 | { | 1531 | { |
1532 | if (SSL_IS_DTLS(s)) | 1532 | if (SSL_is_dtls(s)) |
1533 | return dtls1_do_write(s, type); | 1533 | return dtls1_do_write(s, type); |
1534 | 1534 | ||
1535 | return ssl3_do_write(s, type); | 1535 | return ssl3_do_write(s, type); |