kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move deprecated SSL_OP_* values back to the top.

Browse Source 
We try to keep the deprecated values hidden, but if we do that, we won't
be able to allocate new constants without knowing which collide.

Change-Id: I3f249639bdf8869b2c83f3efdadd98b63ed839be
Reviewed-on: https://boringssl-review.googlesource.com/8881
Reviewed-by: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2016-07-21 12:59:10 +02:00 committed by CQ bot account: commit-bot@chromium.org
parent d7573dc894
commit 84f8551753
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/openssl/ssl.h
View File

@ -593,6 +593,16 @@ OPENSSL_EXPORT int SSL_version(const SSL *ssl);
* |SSL_CTX|. */ * |SSL_CTX|. */
#define SSL_OP_DISABLE_NPN 0x00800000L #define SSL_OP_DISABLE_NPN 0x00800000L
/* The following flags toggle individual protocol versions. This is deprecated.
* Use |SSL_CTX_set_min_version| and |SSL_CTX_set_max_version| instead. */
#define SSL_OP_NO_SSLv3 0x02000000L
#define SSL_OP_NO_TLSv1 0x04000000L
#define SSL_OP_NO_TLSv1_2 0x08000000L
#define SSL_OP_NO_TLSv1_1 0x10000000L
#define SSL_OP_NO_TLSv1_3 0x20000000L
#define SSL_OP_NO_DTLSv1 SSL_OP_NO_TLSv1
#define SSL_OP_NO_DTLSv1_2 SSL_OP_NO_TLSv1_2
/* SSL_CTX_set_options enables all options set in |options| (which should be one /* SSL_CTX_set_options enables all options set in |options| (which should be one
* or more of the |SSL_OP_*| values, ORed together) in |ctx|. It returns a * or more of the |SSL_OP_*| values, ORed together) in |ctx|. It returns a
* bitmask representing the resulting enabled options. */ * bitmask representing the resulting enabled options. */
@ -3302,16 +3312,6 @@ struct ssl_comp_st {
DECLARE_STACK_OF(SSL_COMP) DECLARE_STACK_OF(SSL_COMP)
/* The following flags toggle individual protocol versions. This is deprecated.
* Use |SSL_CTX_set_min_version| and |SSL_CTX_set_max_version| instead. */
#define SSL_OP_NO_SSLv3 0x02000000L
#define SSL_OP_NO_TLSv1 0x04000000L
#define SSL_OP_NO_TLSv1_2 0x08000000L
#define SSL_OP_NO_TLSv1_1 0x10000000L
#define SSL_OP_NO_TLSv1_3 0x20000000L
#define SSL_OP_NO_DTLSv1 SSL_OP_NO_TLSv1
#define SSL_OP_NO_DTLSv1_2 SSL_OP_NO_TLSv1_2
/* The following flags do nothing and are included only to make it easier to /* The following flags do nothing and are included only to make it easier to
* compile code with BoringSSL. */ * compile code with BoringSSL. */
#define SSL_MODE_AUTO_RETRY 0 #define SSL_MODE_AUTO_RETRY 0