diff options
-rw-r--r-- | src/lib/libssl/bs_cbb.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/ssl_versions.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/tls13_legacy.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libssl/bs_cbb.c b/src/lib/libssl/bs_cbb.c index e734dd68fc..62e98cb476 100644 --- a/src/lib/libssl/bs_cbb.c +++ b/src/lib/libssl/bs_cbb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bs_cbb.c,v 1.23 2020/09/16 05:52:04 jsing Exp $ */ | 1 | /* $OpenBSD: bs_cbb.c,v 1.24 2021/01/04 19:19:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014, Google Inc. | 3 | * Copyright (c) 2014, Google Inc. |
4 | * | 4 | * |
@@ -277,7 +277,7 @@ CBB_discard_child(CBB *cbb) | |||
277 | return; | 277 | return; |
278 | 278 | ||
279 | cbb->base->len = cbb->offset; | 279 | cbb->base->len = cbb->offset; |
280 | 280 | ||
281 | cbb->child->base = NULL; | 281 | cbb->child->base = NULL; |
282 | cbb->child = NULL; | 282 | cbb->child = NULL; |
283 | cbb->pending_len_len = 0; | 283 | cbb->pending_len_len = 0; |
diff --git a/src/lib/libssl/ssl_versions.c b/src/lib/libssl/ssl_versions.c index 99f538b937..c5de9d0cde 100644 --- a/src/lib/libssl/ssl_versions.c +++ b/src/lib/libssl/ssl_versions.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_versions.c,v 1.7 2020/10/14 16:57:33 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.8 2021/01/04 19:19:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -53,7 +53,7 @@ ssl_version_set_min(const SSL_METHOD *meth, uint16_t ver, uint16_t max_ver, | |||
53 | return 0; | 53 | return 0; |
54 | 54 | ||
55 | *out_ver = min_version; | 55 | *out_ver = min_version; |
56 | 56 | ||
57 | return 1; | 57 | return 1; |
58 | } | 58 | } |
59 | 59 | ||
@@ -76,7 +76,7 @@ ssl_version_set_max(const SSL_METHOD *meth, uint16_t ver, uint16_t min_ver, | |||
76 | return 0; | 76 | return 0; |
77 | 77 | ||
78 | *out_ver = max_version; | 78 | *out_ver = max_version; |
79 | 79 | ||
80 | return 1; | 80 | return 1; |
81 | } | 81 | } |
82 | 82 | ||
diff --git a/src/lib/libssl/tls13_legacy.c b/src/lib/libssl/tls13_legacy.c index 81a317d4a5..8aa806aa45 100644 --- a/src/lib/libssl/tls13_legacy.c +++ b/src/lib/libssl/tls13_legacy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_legacy.c,v 1.19 2020/11/03 17:41:39 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_legacy.c,v 1.20 2021/01/04 19:19:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -216,7 +216,7 @@ tls13_legacy_read_bytes(SSL *ssl, int type, unsigned char *buf, int len, int pee | |||
216 | return -1; | 216 | return -1; |
217 | } | 217 | } |
218 | if (len < 0) { | 218 | if (len < 0) { |
219 | SSLerror(ssl, SSL_R_BAD_LENGTH); | 219 | SSLerror(ssl, SSL_R_BAD_LENGTH); |
220 | return -1; | 220 | return -1; |
221 | } | 221 | } |
222 | 222 | ||
@@ -247,7 +247,7 @@ tls13_legacy_write_bytes(SSL *ssl, int type, const void *vbuf, int len) | |||
247 | return -1; | 247 | return -1; |
248 | } | 248 | } |
249 | if (len < 0) { | 249 | if (len < 0) { |
250 | SSLerror(ssl, SSL_R_BAD_LENGTH); | 250 | SSLerror(ssl, SSL_R_BAD_LENGTH); |
251 | return -1; | 251 | return -1; |
252 | } | 252 | } |
253 | 253 | ||
@@ -261,12 +261,12 @@ tls13_legacy_write_bytes(SSL *ssl, int type, const void *vbuf, int len) | |||
261 | } | 261 | } |
262 | 262 | ||
263 | /* | 263 | /* |
264 | * In the non-SSL_MODE_ENABLE_PARTIAL_WRITE case we have to loop until | 264 | * In the non-SSL_MODE_ENABLE_PARTIAL_WRITE case we have to loop until |
265 | * we have written out all of the requested data. | 265 | * we have written out all of the requested data. |
266 | */ | 266 | */ |
267 | sent = S3I(ssl)->wnum; | 267 | sent = S3I(ssl)->wnum; |
268 | if (len < sent) { | 268 | if (len < sent) { |
269 | SSLerror(ssl, SSL_R_BAD_LENGTH); | 269 | SSLerror(ssl, SSL_R_BAD_LENGTH); |
270 | return -1; | 270 | return -1; |
271 | } | 271 | } |
272 | n = len - sent; | 272 | n = len - sent; |