From cdffe1ec9a020e46601786019e9f1d09540d94b4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 9 Jan 2012 15:20:17 +0000 Subject: [PATCH] 2012-01-09 16:18 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbssl/ssl.c * contrib/hbssl/sslctx.c ! disabled references to stuff deleted from OpenSSL 1.0.0+ --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbssl/ssl.c | 10 ++++++---- harbour/contrib/hbssl/sslctx.c | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bf1156856a..af3fe756a6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-01-09 16:18 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbssl/ssl.c + * contrib/hbssl/sslctx.c + ! disabled references to stuff deleted from OpenSSL 1.0.0+ + 2012-01-09 14:41 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/src/rdd/dbf1.c ! fixed default initialization value in UNICODE fields after diff --git a/harbour/contrib/hbssl/ssl.c b/harbour/contrib/hbssl/ssl.c index 4e79acade7..27e5032c56 100644 --- a/harbour/contrib/hbssl/ssl.c +++ b/harbour/contrib/hbssl/ssl.c @@ -624,12 +624,14 @@ HB_FUNC( SSL_GET_SSL_METHOD ) #endif int n; - if( p == SSLv2_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV2; - else if( p == SSLv2_server_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV2_SERVER; - else if( p == SSLv2_client_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV2_CLIENT; - else if( p == SSLv3_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV3; + if( p == SSLv3_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV3; else if( p == SSLv3_server_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV3_SERVER; else if( p == SSLv3_client_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV3_CLIENT; +#if OPENSSL_VERSION_NUMBER < 0x10000000L + else if( p == SSLv2_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV2; + else if( p == SSLv2_server_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV2_SERVER; + else if( p == SSLv2_client_method() ) n = HB_SSL_CTX_NEW_METHOD_SSLV2_CLIENT; +#endif else if( p == TLSv1_method() ) n = HB_SSL_CTX_NEW_METHOD_TLSV1; else if( p == TLSv1_server_method() ) n = HB_SSL_CTX_NEW_METHOD_TLSV1_SERVER; else if( p == TLSv1_client_method() ) n = HB_SSL_CTX_NEW_METHOD_TLSV1_CLIENT; diff --git a/harbour/contrib/hbssl/sslctx.c b/harbour/contrib/hbssl/sslctx.c index d1436af79a..07853538aa 100644 --- a/harbour/contrib/hbssl/sslctx.c +++ b/harbour/contrib/hbssl/sslctx.c @@ -100,9 +100,11 @@ const SSL_METHOD * hb_ssl_method_id_to_ptr( int n ) switch( n ) { +#if OPENSSL_VERSION_NUMBER < 0x10000000L case HB_SSL_CTX_NEW_METHOD_SSLV2 : p = SSLv2_method(); break; case HB_SSL_CTX_NEW_METHOD_SSLV2_SERVER : p = SSLv2_server_method(); break; case HB_SSL_CTX_NEW_METHOD_SSLV2_CLIENT : p = SSLv2_client_method(); break; +#endif case HB_SSL_CTX_NEW_METHOD_SSLV3 : p = SSLv3_method(); break; case HB_SSL_CTX_NEW_METHOD_SSLV3_SERVER : p = SSLv3_server_method(); break; case HB_SSL_CTX_NEW_METHOD_SSLV3_CLIENT : p = SSLv3_client_method(); break;