From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 4 Jun 2015 22:12:56 +0000 (+0200)
Subject: openssl: removed error string #ifdef
X-Git-Tag: curl-7_43_0~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ce14037c0c4f7448422ba2d4c7f12ceb1289811;p=curl

openssl: removed error string #ifdef

ERR_error_string_n() was introduced in 0.9.6, no need to #ifdef anymore
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 0525942d8..6378e10ff 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -102,10 +102,6 @@
 #undef HAVE_PKCS12_SUPPORT
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x00906001L
-#define HAVE_ERR_ERROR_STRING_N 1
-#endif
-
 #if OPENSSL_VERSION_NUMBER >= 0x00909000L
 #define SSL_METHOD_QUAL const
 #else
@@ -680,15 +676,10 @@ static int x509_name_oneline(X509_NAME *a, char *buf, size_t size)
  */
 static char *SSL_strerror(unsigned long error, char *buf, size_t size)
 {
-#ifdef HAVE_ERR_ERROR_STRING_N
   /* OpenSSL 0.9.6 and later has a function named
      ERR_error_string_n() that takes the size of the buffer as a
      third argument */
   ERR_error_string_n(error, buf, size);
-#else
-  (void) size;
-  ERR_error_string(error, buf);
-#endif
   return buf;
 }