From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 17 Sep 2015 06:48:43 +0000 (+0200)
Subject: openssl: build with < 0.9.8
X-Git-Tag: curl-7_45_0~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82e3e8e31fbdd237e82233d137fd1bbb730f13f5;p=thirdparty%2Fcurl.git

openssl: build with < 0.9.8

... without sha256 support and no define saying so.

Reported-by: Rajkumar Mandal
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 8600c61846..71ce331ef9 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -3185,7 +3185,7 @@ void Curl_ossl_md5sum(unsigned char *tmp, /* input */
   MD5_Final(md5sum, &MD5pw);
 }
 
-#ifndef OPENSSL_NO_SHA256
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)
 void Curl_ossl_sha256sum(const unsigned char *tmp, /* input */
                       size_t tmplen,
                       unsigned char *sha256sum /* output */,
diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h
index a1f347a059..27738cc301 100644
--- a/lib/vtls/openssl.h
+++ b/lib/vtls/openssl.h
@@ -108,7 +108,7 @@ bool Curl_ossl_cert_status_request(void);
 #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y)
 #define curlssl_random(x,y,z) Curl_ossl_random(x,y,z)
 #define curlssl_md5sum(a,b,c,d) Curl_ossl_md5sum(a,b,c,d)
-#ifndef OPENSSL_NO_SHA256
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)
 #define curlssl_sha256sum(a,b,c,d) Curl_ossl_sha256sum(a,b,c,d)
 #endif
 #define curlssl_cert_status_request() Curl_ossl_cert_status_request()