diff options
| author | David Benjamin <davidben@chromium.org> | 2014-08-27 22:35:09 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-08-28 04:41:34 +0400 |
| commit | 457112e1973251a721ae419128d7108844d3c1a3 (patch) | |
| tree | ccd7d5d5d2bd10345a78f7a789a674388ac96a97 /include/openssl/tls1.h | |
| parent | 1f3591d4c75fc4039dbd120ff1c459b311e976e2 (diff) | |
unifdef a bunch of OPENSSL_NO_* ifdefs.
Get all this stuff out of the way.
- OPENSSL_NO_MD5
- OPENSSL_NO_SHA
- OPENSSL_NO_EC
- OPENSSL_NO_ECDSA
- OPENSSL_NO_ECDH
- OPENSSL_NO_NEXTPROTONEG
- OPENSSL_NO_DH
- OPENSSL_NO_SSL3
- OPENSSL_NO_RC4
- OPENSSL_NO_RSA
Also manually removed a couple instances of OPENSSL_NO_DSA that seemed to be
confused anyway. Did some minor manual cleanup. (Removed a few now-pointless
'if (0)'s.)
Change-Id: Id540ba97ee22ff2309ab20ceb24c7eabe766d4c4
Reviewed-on: https://boringssl-review.googlesource.com/1662
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'include/openssl/tls1.h')
| -rw-r--r-- | include/openssl/tls1.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 76a12969..b8dd7ae5 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -249,10 +249,8 @@ extern "C" { /* ExtensionType value from RFC6962 */ #define TLSEXT_TYPE_certificate_timestamp 18 -#ifndef OPENSSL_NO_NEXTPROTONEG /* This is not an IANA defined extension number */ #define TLSEXT_TYPE_next_proto_neg 13172 -#endif /* This is not an IANA defined extension number */ #define TLSEXT_TYPE_channel_id 30031 |