1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00

made it compile properly when not building with SSL support

This commit is contained in:
Daniel Stenberg 2001-09-07 09:40:46 +00:00
parent 6147879837
commit 46372c04ee
2 changed files with 26 additions and 18 deletions

View File

@ -263,7 +263,6 @@ static int init_ssl=0;
void Curl_SSL_init(void) void Curl_SSL_init(void)
{ {
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
/* make sure this is only done once */ /* make sure this is only done once */
if(0 != init_ssl) if(0 != init_ssl)
return; return;
@ -275,9 +274,32 @@ void Curl_SSL_init(void)
/* Setup all the global SSL stuff */ /* Setup all the global SSL stuff */
SSLeay_add_ssl_algorithms(); SSLeay_add_ssl_algorithms();
#else
/* SSL disabled, do nothing */
#endif #endif
} }
/* Global cleanup */
void Curl_SSL_cleanup(void)
{
#ifdef USE_SSLEAY
if(init_ssl) {
/* only cleanup if we did a previous init */
/* Free the SSL error strings */
ERR_free_strings();
/* EVP_cleanup() removes all ciphers and digests from the
table. */
EVP_cleanup();
}
#else
/* SSL disabled, do nothing */
#endif
}
#ifdef USE_SSLEAY
/* /*
* This function is called when an SSL connection is closed. * This function is called when an SSL connection is closed.
*/ */
@ -310,23 +332,6 @@ void Curl_SSL_Close(struct connectdata *conn)
} }
} }
/* Global cleanup */
void Curl_SSL_cleanup(void)
{
#ifdef USE_SSLEAY
if(init_ssl) {
/* only cleanup if we did a previous init */
/* Free the SSL error strings */
ERR_free_strings();
/* EVP_cleanup() removes all ciphers and digests from the
table. */
EVP_cleanup();
}
#endif
}
/* /*
* This sets up a session cache to the specified size. * This sets up a session cache to the specified size.
@ -467,6 +472,8 @@ static int Store_SSL_Session(struct connectdata *conn)
return 0; return 0;
} }
#endif
/* ====================================================== */ /* ====================================================== */
CURLcode CURLcode
Curl_SSLConnect(struct connectdata *conn) Curl_SSLConnect(struct connectdata *conn)

View File

@ -24,6 +24,7 @@
*****************************************************************************/ *****************************************************************************/
#include "urldata.h" #include "urldata.h"
CURLcode Curl_SSLConnect(struct connectdata *conn); CURLcode Curl_SSLConnect(struct connectdata *conn);
void Curl_SSL_init(void); /* Global SSL init */ void Curl_SSL_init(void); /* Global SSL init */
void Curl_SSL_cleanup(void); /* Global SSL cleanup */ void Curl_SSL_cleanup(void); /* Global SSL cleanup */