From bbae366206de77e801c659585a32e528c35eb83b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 14 Mar 2011 15:18:11 +0000 Subject: [PATCH] 2011-03-14 16:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbssl/x509.c + Enable feature which is fixed with newer (1.0.0) openssl version. It's now enable for 1.0.0 final and newer, I did only test it with 1.0.0d. --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbssl/x509.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d84a46383e..f40c9a7042 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-14 16:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbssl/x509.c + + Enable feature which is fixed with newer (1.0.0) openssl + version. It's now enable for 1.0.0 final and newer, I did + only test it with 1.0.0d. + 2011-03-12 21:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtgui/hbqtgui.hbc * contrib/hbqt/qtwebkit/hbqtwebkit.hbc diff --git a/harbour/contrib/hbssl/x509.c b/harbour/contrib/hbssl/x509.c index 96bc0fa731..10fdb458c0 100644 --- a/harbour/contrib/hbssl/x509.c +++ b/harbour/contrib/hbssl/x509.c @@ -130,7 +130,7 @@ HB_FUNC( X509_GET_ISSUER_NAME ) HB_FUNC( X509_NAME_ONELINE ) { -#if OPENSSL_VERSION_NUMBER < 0x10000000L /* TOFIX: Compilation error when tried with 1.0.0beta5 */ +#if OPENSSL_VERSION_NUMBER < 0x10000000L || OPENSSL_VERSION_NUMBER >= 0x1000000FL /* NOTE: Compilation error when tried with 1.0.0beta5 */ X509_NAME * x509_name = ( X509_NAME * ) hb_parptr( 1 ); if( x509_name )