Skip to content

Commit

Permalink
openssl: removed error string #ifdef
Browse files Browse the repository at this point in the history
ERR_error_string_n() was introduced in 0.9.6, no need to #ifdef anymore
  • Loading branch information
bagder committed Jun 4, 2015
1 parent 30bd59b commit 1ce1403
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions lib/vtls/openssl.c
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 1ce1403

Please sign in to comment.