#ifdef out a few more functions when SSL is disabled.

diff --git a/lib/sslgen.c b/lib/sslgen.c
index 3549232ab21ba8b3ac8c31034aef28173eed78e3..ed578490db32ef1e3edc4575f59f052d0126d0e0 100644 (file)
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -390,7 +390,7 @@ CURLcode Curl_ssl_addsessionid(struct connectdata *conn,
 }
 
 
-#endif
+#endif /* USE_SSL */
 
 void Curl_ssl_close_all(struct SessionHandle *data)
 {

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 7e4ead79014462172cfc3e22bf5b3deb9db912e2..55f6c845336ef244f78b17e867720451a6026dbb 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -618,8 +618,6 @@ int Curl_ossl_check_cxn(struct connectdata *conn)
   return -1; /* connection status unknown */
 }
 
-#endif /* USE_SSLEAY */
-
 /* Selects an OpenSSL crypto engine
  */
 CURLcode Curl_ossl_set_engine(struct SessionHandle *data, const char *engine)
@@ -654,7 +652,6 @@ CURLcode Curl_ossl_set_engine(struct SessionHandle *data, const char *engine)
 #endif
 }
 
-#ifdef USE_SSLEAY
 /* Sets engine as default for all SSL operations
  */
 CURLcode Curl_ossl_set_engine_default(struct SessionHandle *data)
@@ -674,7 +671,6 @@ CURLcode Curl_ossl_set_engine_default(struct SessionHandle *data)
 #endif
   return CURLE_OK;
 }
-#endif /* USE_SSLEAY */
 
 /* Return list of OpenSSL crypto engine names.
  */
@@ -701,8 +697,6 @@ struct curl_slist *Curl_ossl_engines_list(struct SessionHandle *data)
 }
 
 
-#ifdef USE_SSLEAY
-
 /*
  * This function is called when an SSL connection is closed.
  */
@@ -907,10 +901,7 @@ static int Curl_ASN1_UTCTIME_output(struct connectdata *conn,
   return 0;
 }
 
-#endif
-
 /* ====================================================== */
-#ifdef USE_SSLEAY
 
 /*
  * Match a hostname against a wildcard pattern.
@@ -1150,7 +1141,7 @@ static CURLcode verifyhost(struct connectdata *conn,
   }
   return res;
 }
-#endif
+#endif /* USE_SSLEAY */
 
 /* The SSL_CTRL_SET_MSG_CALLBACK doesn't exist in ancient OpenSSL versions
    and thus this cannot be done there. */