| 1 | diff --git a/SSLeay.xs b/SSLeay.xs
|
| 2 | index 1560604..c9c143a 100644
|
| 3 | |
| 4 | |
| 5 | @@ -46,11 +46,7 @@ extern "C" {
|
| 6 | #endif
|
| 7 |
|
| 8 |
|
| 9 | -#if SSLEAY_VERSION_NUMBER >= 0x0900
|
| 10 | -#define CRYPT_SSL_CLIENT_METHOD SSLv3_client_method()
|
| 11 | -#else
|
| 12 | -#define CRYPT_SSL_CLIENT_METHOD SSLv2_client_method()
|
| 13 | -#endif
|
| 14 | +#define CRYPT_SSL_CLIENT_METHOD TLS_client_method()
|
| 15 |
|
| 16 | static void InfoCallback(const SSL *s,int where,int ret)
|
| 17 | {
|
| 18 | @@ -148,17 +144,8 @@ SSL_CTX_new(packname, ssl_version)
|
| 19 | if(ssl_version == 23) {
|
| 20 | ctx = SSL_CTX_new(SSLv23_client_method());
|
| 21 | }
|
| 22 | - else if(ssl_version == 3) {
|
| 23 | - ctx = SSL_CTX_new(SSLv3_client_method());
|
| 24 | - }
|
| 25 | else {
|
| 26 | -#ifndef OPENSSL_NO_SSL2
|
| 27 | - /* v2 is the default */
|
| 28 | - ctx = SSL_CTX_new(SSLv2_client_method());
|
| 29 | -#else
|
| 30 | - /* v3 is the default */
|
| 31 | - ctx = SSL_CTX_new(SSLv3_client_method());
|
| 32 | -#endif
|
| 33 | + ctx = SSL_CTX_new(TLS_client_method());
|
| 34 | }
|
| 35 |
|
| 36 | SSL_CTX_set_options(ctx,SSL_OP_ALL|0);
|
| 37 | diff --git a/t/03-version.t b/t/03-version.t
|
| 38 | index fa6a38f..e6eb954 100644
|
| 39 | |
| 40 | |
| 41 | @@ -63,7 +63,7 @@ use Crypt::SSLeay::Version qw(
|
| 42 | note $version;
|
| 43 | like(
|
| 44 | $version,
|
| 45 | - qr/\AOpenSSL/,
|
| 46 | + qr/\A(Open|Libre)SSL/,
|
| 47 | 'openssl_version return value looks valid',
|
| 48 | );
|
| 49 | }
|