Commit 083c5e17 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Yang Tse fixed: Openssl 0.9.9 makes 'const' the SSL_METHOD parameter in 

SSL_CTX_new and others, and also makes functions SSLv23_client_method,
TLSv1_client_method, etc return a 'const' SSL_METHOD pointer. Previous
versions do not use the 'const' qualifier.
parent 272231fb

lib/ssluse.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -104,11 +104,16 @@ 
#undef HAVE_PKCS12_SUPPORT

#undef HAVE_PKCS12_SUPPORT

#endif

#endif







#if OPENSSL_VERSION_NUMBER >= 0x00906001L

#if OPENSSL_VERSION_NUMBER >= 0x00906001L

#define HAVE_ERR_ERROR_STRING_N 1

#define HAVE_ERR_ERROR_STRING_N 1

#endif

#endif





#if OPENSSL_VERSION_NUMBER >= 0x00909000L

#define SSL_METHOD_QUAL const

#else

#define SSL_METHOD_QUAL

#endif



/*

/*

 * Number of bytes to read from the random number seed file. This must be

 * Number of bytes to read from the random number seed file. This must be

 * a finite value (because some entropy "files" like /dev/urandom have

 * a finite value (because some entropy "files" like /dev/urandom have
@@ -1121,7 +1126,7 @@ Curl_ossl_connect(struct connectdata *conn, 
  long lerr;

  long lerr;

  int what;

  int what;

  char * str;

  char * str;

  const SSL_METHOD *req_method;

  SSL_METHOD_QUAL SSL_METHOD *req_method=NULL;

  void *ssl_sessionid=NULL;

  void *ssl_sessionid=NULL;

  ASN1_TIME *certdate;

  ASN1_TIME *certdate;

  curl_socket_t sockfd = conn->sock[sockindex];

  curl_socket_t sockfd = conn->sock[sockindex];