summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
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.h
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.h')
-rw-r--r--src/lib/libssl/ssl.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 48cb6256df..4ad73af722 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.249 2025/10/24 11:36:08 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.250 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 *
@@ -369,15 +369,6 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len,
369/* Allow initial connection to servers that don't support RI */ 369/* Allow initial connection to servers that don't support RI */
370#define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L 370#define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L
371 371
372/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
373 * in OpenSSL 0.9.6d. Usually (depending on the application protocol)
374 * the workaround is not needed.
375 * Unfortunately some broken SSL/TLS implementations cannot handle it
376 * at all, which is why it was previously included in SSL_OP_ALL.
377 * Now it's not.
378 */
379#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L
380
381/* DTLS options */ 372/* DTLS options */
382#define SSL_OP_NO_QUERY_MTU 0x00001000L 373#define SSL_OP_NO_QUERY_MTU 0x00001000L
383/* Turn on Cookie Exchange (on relevant for servers) */ 374/* Turn on Cookie Exchange (on relevant for servers) */
@@ -439,6 +430,7 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len,
439#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 430#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0
440#define SSL_OP_TLS_D5_BUG 0x0 431#define SSL_OP_TLS_D5_BUG 0x0
441#define SSL_OP_TLS_ROLLBACK_BUG 0x0 432#define SSL_OP_TLS_ROLLBACK_BUG 0x0
433#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x0
442 434
443/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success 435/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
444 * when just a single record has been written): */ 436 * when just a single record has been written): */