cURL / Mailing Lists / curl-library / Single Mail

curl-library

Re: OpenSSL headers and library versions matching... fail

From: Daniel Stenberg <daniel_at_haxx.se>
Date: Mon, 19 Sep 2011 00:41:51 +0200 (CEST)

On Thu, 15 Sep 2011, Daniel Stenberg wrote:

> Ok. I tracked it down to m4/curl-openssl.m4, the OPEN_SSL_VERSION
> (0x1000005fL) when you put the x in front of it turns out to have a length
> of 12 now instead of 11, so copy pasting the x11) case to an x12) should do
> the trick. I guess the the third line needed the -8, but it might still be
> -7, not really sure what the does. It appears the change in openssl occurred
> 2011-Jan-03 with CVS commit 1.48.2.59 of openssl/crypto/opensslv.h, that
> seems to be where the length went from 10 to 11.

Right, the length went from 10 to 11 digits. the onfigure script extracts the
length of the actual define, without any initial 'x' so I don't get why you
need to make it accept 12 when the length is now 11... Can you?

I would rather think that the check should accept both 10 and 11 lengths and
deal with them the same way. Like this:

diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
index 9adc80f..cd9074b 100644
--- a/m4/curl-openssl.m4
+++ b/m4/curl-openssl.m4
@@ -55,7 +55,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [
          tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5`
          tst_api=0x$tst_vermaj$tst_vermin$tst_verfix
          ;;
- x11)
+ x11|x10)
          tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3`
          tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5`
          tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7`

-- 
  / daniel.haxx.se
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html
Received on 2011-09-19