diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-09 05:50:57 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-09 05:50:57 +0000 |
| commit | 68fed3306b1f39bfb6d5cd97485248dc0c3884f8 (patch) | |
| tree | 3b5358dd257bf44bb4ea15442ad4bdb078b6795f /crypto/openssl/ssl/ssl.h | |
| parent | e15884d6df140228c1e2db4ca751565a6933e1f5 (diff) | |
| parent | d4a5f67323e640990da5aa727b2e6da35d2157f3 (diff) | |
| download | FreeBSD-src-68fed3306b1f39bfb6d5cd97485248dc0c3884f8.zip FreeBSD-src-68fed3306b1f39bfb6d5cd97485248dc0c3884f8.tar.gz | |
Merge OpenSSL 1.0.1h.
Approved by: so (delphij)
Diffstat (limited to 'crypto/openssl/ssl/ssl.h')
| -rw-r--r-- | crypto/openssl/ssl/ssl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/ssl.h b/crypto/openssl/ssl/ssl.h index 7219a0e..4c1242c 100644 --- a/crypto/openssl/ssl/ssl.h +++ b/crypto/openssl/ssl/ssl.h @@ -553,7 +553,7 @@ struct ssl_session_st /* Allow initial connection to servers that don't support RI */ #define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004L #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L -#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L +#define SSL_OP_TLSEXT_PADDING 0x00000010L #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040L #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L @@ -562,6 +562,8 @@ struct ssl_session_st /* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */ #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 +/* Refers to ancient SSLREF and SSLv2, retained for compatibility */ +#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added * in OpenSSL 0.9.6d. Usually (depending on the application protocol) |
