generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

openssl: removed error string #ifdef

Browse Source 
ERR_error_string_n() was introduced in 0.9.6, no need to #ifdef anymore
This commit is contained in:
Daniel Stenberg 2015-06-05 00:12:56 +02:00
parent 30bd59ba6e
commit 1ce14037c0
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vtls/openssl.c
View File

@ -102,10 +102,6 @@
#undef HAVE_PKCS12_SUPPORT #undef HAVE_PKCS12_SUPPORT
#endif #endif
#if OPENSSL_VERSION_NUMBER >= 0x00906001L
#define HAVE_ERR_ERROR_STRING_N 1
#endif
#if OPENSSL_VERSION_NUMBER >= 0x00909000L #if OPENSSL_VERSION_NUMBER >= 0x00909000L
#define SSL_METHOD_QUAL const #define SSL_METHOD_QUAL const
#else #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) 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 /* OpenSSL 0.9.6 and later has a function named
ERR_error_string_n() that takes the size of the buffer as a ERR_error_string_n() that takes the size of the buffer as a
third argument */ third argument */
ERR_error_string_n(error, buf, size); ERR_error_string_n(error, buf, size);
#else
(void) size;
ERR_error_string(error, buf);
#endif
return buf; return buf;
} }