diff options
| author | jsing <> | 2015-06-20 12:29:39 +0000 |
|---|---|---|
| committer | jsing <> | 2015-06-20 12:29:39 +0000 |
| commit | c20a320b71eec149be5b817565a280f26954a04b (patch) | |
| tree | 52713f4b9ab567e5e6b263b46f0b396374c5d90c /src | |
| parent | 3660913fccfa7203b81635423ee9fd049f440469 (diff) | |
| download | openbsd-c20a320b71eec149be5b817565a280f26954a04b.tar.gz openbsd-c20a320b71eec149be5b817565a280f26954a04b.tar.bz2 openbsd-c20a320b71eec149be5b817565a280f26954a04b.zip | |
Make SSL_OP_ALL readable.
ok deraadt@ doug@ millert@ miod@ sthen@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/ssl/ssl.h | 11 | ||||
| -rw-r--r-- | src/lib/libssl/ssl.h | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h index fd50d9b69c..c47ae4632f 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.86 2015/06/17 14:27:56 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.87 2015/06/20 12:29:39 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 | * |
| @@ -572,7 +572,14 @@ struct ssl_session_st { | |||
| 572 | #define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L | 572 | #define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L |
| 573 | 573 | ||
| 574 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ | 574 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ |
| 575 | #define SSL_OP_ALL 0x80000374L | 575 | #define SSL_OP_ALL \ |
| 576 | (SSL_OP_LEGACY_SERVER_CONNECT | \ | ||
| 577 | SSL_OP_TLSEXT_PADDING | \ | ||
| 578 | SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER | \ | ||
| 579 | SSL_OP_SAFARI_ECDHE_ECDSA_BUG | \ | ||
| 580 | SSL_OP_TLS_D5_BUG | \ | ||
| 581 | SSL_OP_TLS_BLOCK_PADDING_BUG | \ | ||
| 582 | SSL_OP_CRYPTOPRO_TLSEXT_BUG) | ||
| 576 | 583 | ||
| 577 | /* Obsolete flags kept for compatibility. No sane code should use them. */ | 584 | /* Obsolete flags kept for compatibility. No sane code should use them. */ |
| 578 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 | 585 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 |
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index fd50d9b69c..c47ae4632f 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.86 2015/06/17 14:27:56 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.87 2015/06/20 12:29:39 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 | * |
| @@ -572,7 +572,14 @@ struct ssl_session_st { | |||
| 572 | #define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L | 572 | #define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L |
| 573 | 573 | ||
| 574 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ | 574 | /* SSL_OP_ALL: various bug workarounds that should be rather harmless. */ |
| 575 | #define SSL_OP_ALL 0x80000374L | 575 | #define SSL_OP_ALL \ |
| 576 | (SSL_OP_LEGACY_SERVER_CONNECT | \ | ||
| 577 | SSL_OP_TLSEXT_PADDING | \ | ||
| 578 | SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER | \ | ||
| 579 | SSL_OP_SAFARI_ECDHE_ECDSA_BUG | \ | ||
| 580 | SSL_OP_TLS_D5_BUG | \ | ||
| 581 | SSL_OP_TLS_BLOCK_PADDING_BUG | \ | ||
| 582 | SSL_OP_CRYPTOPRO_TLSEXT_BUG) | ||
| 576 | 583 | ||
| 577 | /* Obsolete flags kept for compatibility. No sane code should use them. */ | 584 | /* Obsolete flags kept for compatibility. No sane code should use them. */ |
| 578 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 | 585 | #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0 |