diff options
author | tedu <> | 2014-04-15 21:47:56 +0000 |
---|---|---|
committer | tedu <> | 2014-04-15 21:47:56 +0000 |
commit | d29691e0c778ae0a3a5eb74acbb053caacdee990 (patch) | |
tree | e9ca306a8d286d0b62f82cb4b82cffd7dfbb0e70 /src/lib/libssl/ssl.h | |
parent | 0fccfaa49773dea8f4e6d9930d774dd2a44b33db (diff) | |
download | openbsd-d29691e0c778ae0a3a5eb74acbb053caacdee990.tar.gz openbsd-d29691e0c778ae0a3a5eb74acbb053caacdee990.tar.bz2 openbsd-d29691e0c778ae0a3a5eb74acbb053caacdee990.zip |
remove ssl2 support even more completely.
in the process, always include ssl3 and tls1, we don't need config options
for them. when the time comes to expire ssl3, it will be with an ax.
checked by miod
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 97e4a3f96c..d3e015e738 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -350,10 +350,6 @@ extern "C" { | |||
350 | extern "C" { | 350 | extern "C" { |
351 | #endif | 351 | #endif |
352 | 352 | ||
353 | #if (defined(OPENSSL_NO_RSA) || defined(OPENSSL_NO_MD5)) && !defined(OPENSSL_NO_SSL2) | ||
354 | #define OPENSSL_NO_SSL2 | ||
355 | #endif | ||
356 | |||
357 | #define SSL_FILETYPE_ASN1 X509_FILETYPE_ASN1 | 353 | #define SSL_FILETYPE_ASN1 X509_FILETYPE_ASN1 |
358 | #define SSL_FILETYPE_PEM X509_FILETYPE_PEM | 354 | #define SSL_FILETYPE_PEM X509_FILETYPE_PEM |
359 | 355 | ||
@@ -1839,12 +1835,6 @@ const char *SSL_get_version(const SSL *s); | |||
1839 | /* This sets the 'default' SSL version that SSL_new() will create */ | 1835 | /* This sets the 'default' SSL version that SSL_new() will create */ |
1840 | int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth); | 1836 | int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth); |
1841 | 1837 | ||
1842 | #ifndef OPENSSL_NO_SSL2 | ||
1843 | const SSL_METHOD *SSLv2_method(void); /* SSLv2 */ | ||
1844 | const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */ | ||
1845 | const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */ | ||
1846 | #endif | ||
1847 | |||
1848 | const SSL_METHOD *SSLv3_method(void); /* SSLv3 */ | 1838 | const SSL_METHOD *SSLv3_method(void); /* SSLv3 */ |
1849 | const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */ | 1839 | const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */ |
1850 | const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */ | 1840 | const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */ |