diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/ssl/ssl.h | 12 | ||||
| -rw-r--r-- | src/lib/libssl/ssl.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h index 6a03da5c0b..58493fa988 100644 --- a/src/lib/libssl/src/ssl/ssl.h +++ b/src/lib/libssl/src/ssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.95 2015/10/25 15:58:57 doug Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.96 2015/10/25 16:07:04 doug 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 | * |
| @@ -568,13 +568,18 @@ struct ssl_session_st { | |||
| 568 | 568 | ||
| 569 | /* Obsolete flags kept for compatibility. No sane code should use them. */ | 569 | /* Obsolete flags kept for compatibility. No sane code should use them. */ |
| 570 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 | 570 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 |
| 571 | #define SSL_OP_CISCO_ANYCONNECT 0x0 | ||
| 571 | #define SSL_OP_EPHEMERAL_RSA 0x0 | 572 | #define SSL_OP_EPHEMERAL_RSA 0x0 |
| 573 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0 | ||
| 572 | #define SSL_OP_MICROSOFT_SESS_ID_BUG 0x0 | 574 | #define SSL_OP_MICROSOFT_SESS_ID_BUG 0x0 |
| 573 | #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 | 575 | #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 |
| 574 | #define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 | 576 | #define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 |
| 575 | #define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x0 | 577 | #define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x0 |
| 576 | #define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0 | 578 | #define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0 |
| 577 | #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0 | 579 | #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0 |
| 580 | #define SSL_OP_NO_COMPRESSION 0x0 | ||
| 581 | #define SSL_OP_NO_SSLv2 0x0 | ||
| 582 | #define SSL_OP_NO_SSLv3 0x0 | ||
| 578 | #define SSL_OP_PKCS1_CHECK_1 0x0 | 583 | #define SSL_OP_PKCS1_CHECK_1 0x0 |
| 579 | #define SSL_OP_PKCS1_CHECK_2 0x0 | 584 | #define SSL_OP_PKCS1_CHECK_2 0x0 |
| 580 | #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x0 | 585 | #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x0 |
| @@ -582,11 +587,6 @@ struct ssl_session_st { | |||
| 582 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 | 587 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 |
| 583 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 | 588 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 |
| 584 | #define SSL_OP_TLS_D5_BUG 0x0 | 589 | #define SSL_OP_TLS_D5_BUG 0x0 |
| 585 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0 | ||
| 586 | #define SSL_OP_CISCO_ANYCONNECT 0x0 | ||
| 587 | #define SSL_OP_NO_COMPRESSION 0x0 | ||
| 588 | #define SSL_OP_NO_SSLv2 0x0 | ||
| 589 | #define SSL_OP_NO_SSLv3 0x0 | ||
| 590 | 590 | ||
| 591 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success | 591 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success |
| 592 | * when just a single record has been written): */ | 592 | * when just a single record has been written): */ |
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 6a03da5c0b..58493fa988 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.95 2015/10/25 15:58:57 doug Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.96 2015/10/25 16:07:04 doug 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 | * |
| @@ -568,13 +568,18 @@ struct ssl_session_st { | |||
| 568 | 568 | ||
| 569 | /* Obsolete flags kept for compatibility. No sane code should use them. */ | 569 | /* Obsolete flags kept for compatibility. No sane code should use them. */ |
| 570 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 | 570 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 |
| 571 | #define SSL_OP_CISCO_ANYCONNECT 0x0 | ||
| 571 | #define SSL_OP_EPHEMERAL_RSA 0x0 | 572 | #define SSL_OP_EPHEMERAL_RSA 0x0 |
| 573 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0 | ||
| 572 | #define SSL_OP_MICROSOFT_SESS_ID_BUG 0x0 | 574 | #define SSL_OP_MICROSOFT_SESS_ID_BUG 0x0 |
| 573 | #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 | 575 | #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 |
| 574 | #define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 | 576 | #define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 |
| 575 | #define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x0 | 577 | #define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x0 |
| 576 | #define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0 | 578 | #define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0 |
| 577 | #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0 | 579 | #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0 |
| 580 | #define SSL_OP_NO_COMPRESSION 0x0 | ||
| 581 | #define SSL_OP_NO_SSLv2 0x0 | ||
| 582 | #define SSL_OP_NO_SSLv3 0x0 | ||
| 578 | #define SSL_OP_PKCS1_CHECK_1 0x0 | 583 | #define SSL_OP_PKCS1_CHECK_1 0x0 |
| 579 | #define SSL_OP_PKCS1_CHECK_2 0x0 | 584 | #define SSL_OP_PKCS1_CHECK_2 0x0 |
| 580 | #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x0 | 585 | #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x0 |
| @@ -582,11 +587,6 @@ struct ssl_session_st { | |||
| 582 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 | 587 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 |
| 583 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 | 588 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 |
| 584 | #define SSL_OP_TLS_D5_BUG 0x0 | 589 | #define SSL_OP_TLS_D5_BUG 0x0 |
| 585 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0 | ||
| 586 | #define SSL_OP_CISCO_ANYCONNECT 0x0 | ||
| 587 | #define SSL_OP_NO_COMPRESSION 0x0 | ||
| 588 | #define SSL_OP_NO_SSLv2 0x0 | ||
| 589 | #define SSL_OP_NO_SSLv3 0x0 | ||
| 590 | 590 | ||
| 591 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success | 591 | /* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success |
| 592 | * when just a single record has been written): */ | 592 | * when just a single record has been written): */ |