From b9f46a71a943bdd3869515feda2690aff4a6e976 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 5 Sep 2011 01:14:08 +0000 Subject: [PATCH] 2011-09-05 03:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbssl/sslsess.c ! fixed to define SSL_SESSION_CMP(), SSL_SESSION_HASH() for OpenSSL 1.0.0 and later (they are noops in these versions) --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbssl/sslsess.c | 12 ++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9a9e5d24d2..2f0d9c6d9d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-09-05 03:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbssl/sslsess.c + ! fixed to define SSL_SESSION_CMP(), SSL_SESSION_HASH() + for OpenSSL 1.0.0 and later (they are noops in these + versions) + 2011-09-05 02:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + contrib/hbcups/readme.txt + added readme created by Chris Gonnerman. Thank you very much. diff --git a/harbour/contrib/hbssl/sslsess.c b/harbour/contrib/hbssl/sslsess.c index 5ff956b1ec..822f7f0a9b 100644 --- a/harbour/contrib/hbssl/sslsess.c +++ b/harbour/contrib/hbssl/sslsess.c @@ -99,24 +99,22 @@ HB_FUNC( SSL_SESSION_NEW ) hb_retptrGC( ph ); } -#if OPENSSL_VERSION_NUMBER < 0x10000000L - HB_FUNC( SSL_SESSION_CMP ) { if( hb_SSL_SESSION_is( 1 ) && hb_SSL_SESSION_is( 2 ) ) { +#if OPENSSL_VERSION_NUMBER < 0x10000000L SSL_SESSION * session1 = hb_SSL_SESSION_par( 1 ); SSL_SESSION * session2 = hb_SSL_SESSION_par( 2 ); if( session1 && session2 ) hb_retni( SSL_SESSION_cmp( session1, session2 ) ); +#endif } else hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -#endif - HB_FUNC( SSL_SESSION_SET_TIME ) { if( hb_SSL_SESSION_is( 1 ) ) @@ -169,23 +167,21 @@ HB_FUNC( SSL_SESSION_GET_TIMEOUT ) hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -#if OPENSSL_VERSION_NUMBER < 0x10000000L - HB_FUNC( SSL_SESSION_HASH ) { if( hb_SSL_SESSION_is( 1 ) ) { +#if OPENSSL_VERSION_NUMBER < 0x10000000L SSL_SESSION * session = hb_SSL_SESSION_par( 1 ); if( session ) hb_retnl( SSL_SESSION_hash( session ) ); +#endif } else hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -#endif - /* char *SSL_SESSION_get_app_data(SSL_SESSION *s); char *SSL_SESSION_get_ex_data(const SSL_SESSION *s, int idx);