fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-01-09 16:18 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/hbssl/ssl.c
  * contrib/hbssl/sslctx.c
    ! disabled references to stuff deleted from OpenSSL 1.0.0+
This commit is contained in:
Viktor Szakats
2012-01-09 15:20:17 +00:00
parent 57eabfaa87
commit cdffe1ec9a
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -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

10
harbour/contrib/hbssl/ssl.c
View File

@@ -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;

2
harbour/contrib/hbssl/sslctx.c
View File

@@ -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;