diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 78a6787d43..143dd8a003 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.154 2018/03/20 15:28:12 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.155 2018/04/11 17:47:36 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 | * |
@@ -507,11 +507,6 @@ struct ssl_session_st { | |||
507 | /* Set on servers to choose the cipher according to the server's | 507 | /* Set on servers to choose the cipher according to the server's |
508 | * preferences */ | 508 | * preferences */ |
509 | #define SSL_OP_CIPHER_SERVER_PREFERENCE 0x00400000L | 509 | #define SSL_OP_CIPHER_SERVER_PREFERENCE 0x00400000L |
510 | /* If set, a server will allow a client to issue a SSLv3.0 version number | ||
511 | * as latest version supported in the premaster secret, even when TLSv1.0 | ||
512 | * (version 3.1) was announced in the client hello. Normally this is | ||
513 | * forbidden to prevent version rollback attacks. */ | ||
514 | #define SSL_OP_TLS_ROLLBACK_BUG 0x00800000L | ||
515 | 510 | ||
516 | #define SSL_OP_NO_TLSv1 0x04000000L | 511 | #define SSL_OP_NO_TLSv1 0x04000000L |
517 | #define SSL_OP_NO_TLSv1_2 0x08000000L | 512 | #define SSL_OP_NO_TLSv1_2 0x08000000L |
@@ -545,6 +540,7 @@ struct ssl_session_st { | |||
545 | #define SSL_OP_TLSEXT_PADDING 0x0 | 540 | #define SSL_OP_TLSEXT_PADDING 0x0 |
546 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 | 541 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 |
547 | #define SSL_OP_TLS_D5_BUG 0x0 | 542 | #define SSL_OP_TLS_D5_BUG 0x0 |
543 | #define SSL_OP_TLS_ROLLBACK_BUG 0x0 | ||
548 | 544 | ||
549 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success | 545 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success |
550 | * when just a single record has been written): */ | 546 | * when just a single record has been written): */ |