sslgen.c: cleanup temporary compile-time SSL-backend check

diff --git a/lib/curl_schannel.h b/lib/curl_schannel.h
index cf5b79a6b3eabe90c6308a6867e056ec339cfd47..ed925773132344c19bab8851bdad5b16f4446097 100644 (file)
--- a/lib/curl_schannel.h
+++ b/lib/curl_schannel.h
@@ -135,7 +135,5 @@ size_t Curl_schannel_version(char *buffer, size_t size);
 #define curlssl_version Curl_schannel_version
 #define curlssl_check_cxn(x) (x=x, -1)
 #define curlssl_data_pending Curl_schannel_data_pending
-#define curlssl_random /* not used with the schannel backend */
-#define curlssl_md5sum /* not used with the schannel backend */
 #endif /* USE_SCHANNEL */
 #endif /* HEADER_CURL_SCHANNEL_H */

diff --git a/lib/sslgen.c b/lib/sslgen.c
index 0f8de452a7fd1bbf88efa9d451a7df049127d049..8408d58ee789c9876f008263df48b7fe74a89fb1 100644 (file)
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -165,39 +165,6 @@ void Curl_free_ssl_config(struct ssl_config_data* sslc)
 
 #ifdef USE_SSL
 
-/* SSL 'backend' compile-time sanity checks */
-#if !defined(curlssl_init)
-# error "SSL backend lacks definition for curlssl_init"
-#elif !defined(curlssl_cleanup)
-# error "SSL backend lacks definition for curlssl_cleanup"
-#elif !defined(curlssl_connect) && !defined(curlssl_connect_nonblocking)
-# error "SSL backend lacks curlssl_connect or curlssl_connect_nonblocking"
-#elif !defined(curlssl_session_free)
-# error "SSL backend lacks definition for curlssl_session_free"
-#elif !defined(curlssl_close_all)
-# error "SSL backend lacks definition for curlssl_close_all"
-#elif !defined(curlssl_close)
-# error "SSL backend lacks definition for curlssl_close"
-#elif !defined(curlssl_shutdown)
-# error "SSL backend lacks definition for curlssl_shutdown"
-#elif !defined(curlssl_set_engine)
-# error "SSL backend lacks definition for curlssl_set_engine"
-#elif !defined(curlssl_set_engine_default)
-# error "SSL backend lacks definition for curlssl_set_engine_default"
-#elif !defined(curlssl_engines_list)
-# error "SSL backend lacks definition for curlssl_engines_list"
-#elif !defined(curlssl_version)
-# error "SSL backend lacks definition for curlssl_version"
-#elif !defined(curlssl_check_cxn)
-# error "SSL backend lacks definition for curlssl_check_cxn"
-#elif !defined(curlssl_data_pending)
-# error "SSL backend lacks definition for curlssl_data_pending"
-#elif !defined(curlssl_random)
-# error "SSL backend lacks definition for curlssl_random"
-#elif !defined(curlssl_md5sum)
-# error "SSL backend lacks definition for curlssl_md5sum"
-#endif
-
 /* "global" init done? */
 static bool init_ssl=FALSE;
 
@@ -555,8 +522,9 @@ void Curl_ssl_free_certinfo(struct SessionHandle *data)
   }
 }
 
-#ifndef USE_WINDOWS_SSPI
-/* these functions are not used when SSPI is used for NTLM */
+#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_NSS) || \
+    defined(USE_DARWINSSL)
+/* these functions are only used by some SSL backends */
 
 void Curl_ssl_random(struct SessionHandle *data,
                      unsigned char *entropy,
@@ -572,6 +540,6 @@ void Curl_ssl_md5sum(unsigned char *tmp, /* input */
 {
   curlssl_md5sum(tmp, tmplen, md5sum, md5len);
 }
-#endif /* USE_WINDOWS_SSPI */
+#endif /* USE_SSLEAY || USE_GNUTLS || USE_NSS || USE_DARWINSSL */
 
 #endif /* USE_SSL */