diff options
| author | Ben Murdoch <benm@google.com> | 2014-10-02 15:47:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-10-03 16:32:18 +0100 |
| commit | cc2cd4790cd85023341988efac0ec88b9f630f73 (patch) | |
| tree | ff7b9055783c8d1b95c6148a6371f60842303365 /openssl/include/openssl/tls1.h | |
| parent | 06bb5023d34b9a8f6d9260a6a419090379c363c4 (diff) | |
| download | openssl-lollipop-cts-release.tar.gz | |
Add client-side support for TLS_FALLBACK_SCSV.android-wear-5.0.0_r1android-cts-5.1_r27android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-release
Change-Id: I56626b12407f19e7ed48a680b596e2b2c7b46de1
Diffstat (limited to 'openssl/include/openssl/tls1.h')
| -rw-r--r-- | openssl/include/openssl/tls1.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/openssl/include/openssl/tls1.h b/openssl/include/openssl/tls1.h index 5559486..a01d2d7 100644 --- a/openssl/include/openssl/tls1.h +++ b/openssl/include/openssl/tls1.h @@ -159,17 +159,19 @@ extern "C" { #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 +#define TLS1_VERSION 0x0301 +#define TLS1_1_VERSION 0x0302 #define TLS1_2_VERSION 0x0303 -#define TLS1_2_VERSION_MAJOR 0x03 -#define TLS1_2_VERSION_MINOR 0x03 +#define TLS_MAX_VERSION TLS1_2_VERSION + +#define TLS1_VERSION_MAJOR 0x03 +#define TLS1_VERSION_MINOR 0x01 -#define TLS1_1_VERSION 0x0302 #define TLS1_1_VERSION_MAJOR 0x03 #define TLS1_1_VERSION_MINOR 0x02 -#define TLS1_VERSION 0x0301 -#define TLS1_VERSION_MAJOR 0x03 -#define TLS1_VERSION_MINOR 0x01 +#define TLS1_2_VERSION_MAJOR 0x03 +#define TLS1_2_VERSION_MINOR 0x03 #define TLS1_get_version(s) \ ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0) @@ -187,6 +189,7 @@ extern "C" { #define TLS1_AD_PROTOCOL_VERSION 70 /* fatal */ #define TLS1_AD_INSUFFICIENT_SECURITY 71 /* fatal */ #define TLS1_AD_INTERNAL_ERROR 80 /* fatal */ +#define TLS1_AD_INAPPROPRIATE_FALLBACK 86 /* fatal */ #define TLS1_AD_USER_CANCELLED 90 #define TLS1_AD_NO_RENEGOTIATION 100 /* codes 110-114 are from RFC3546 */ |