summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_both.c
diff options
context:
space:
mode:
authorjsing <>2026-04-03 13:11:00 +0000
committerjsing <>2026-04-03 13:11:00 +0000
commit9726691a1e7289634e04b2e44da815e69091af49 (patch)
tree805aedf5aaf65053ffd794a52bcf2d954e65af4d /src/lib/libssl/ssl_both.c
parent42d1ecbb4220b6260fa2da63402ec3f5cbad849a (diff)
downloadopenbsd-9726691a1e7289634e04b2e44da815e69091af49.tar.gz
openbsd-9726691a1e7289634e04b2e44da815e69091af49.tar.bz2
openbsd-9726691a1e7289634e04b2e44da815e69091af49.zip
Remove workaround for SSL 3.0/TLS 1.0 CBC vulnerability.
We no longer support TLSv1.0 and definitely do not support SSLv3 - remove the empty fragments workaround for the CBC vulnerability in these protocols. ok kenjiro@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_both.c')
-rw-r--r--src/lib/libssl/ssl_both.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c
index 5a704233c9..90f497553b 100644
--- a/src/lib/libssl/ssl_both.c
+++ b/src/lib/libssl/ssl_both.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_both.c,v 1.48 2026/04/03 07:17:36 jsing Exp $ */ 1/* $OpenBSD: ssl_both.c,v 1.49 2026/04/03 13:11:00 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 *
@@ -513,7 +513,6 @@ ssl3_setup_read_buffer(SSL *s)
513int 513int
514ssl3_setup_write_buffer(SSL *s) 514ssl3_setup_write_buffer(SSL *s)
515{ 515{
516 unsigned char *p;
517 size_t len, align, headerlen; 516 size_t len, align, headerlen;
518 517
519 if (SSL_is_dtls(s)) 518 if (SSL_is_dtls(s))
@@ -526,13 +525,9 @@ ssl3_setup_write_buffer(SSL *s)
526 if (s->s3->wbuf.buf == NULL) { 525 if (s->s3->wbuf.buf == NULL) {
527 len = s->max_send_fragment + 526 len = s->max_send_fragment +
528 SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD + headerlen + align; 527 SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD + headerlen + align;
529 if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))
530 len += headerlen + align +
531 SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD;
532 528
533 if ((p = calloc(1, len)) == NULL) 529 if ((s->s3->wbuf.buf = calloc(1, len)) == NULL)
534 goto err; 530 goto err;
535 s->s3->wbuf.buf = p;
536 s->s3->wbuf.len = len; 531 s->s3->wbuf.len = len;
537 } 532 }
538 533