diff options
| author | TingPing <tingping@tingping.se> | 2015-01-30 21:25:41 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2015-01-30 21:25:41 -0500 |
| commit | 5fe2dda146df35003f3f41348036105b8b48ee44 (patch) | |
| tree | 6f7344957609d007cec933b70481094b008ff153 | |
| parent | 85fd6f525e057f77ce11083a36cd85a5443f669b (diff) | |
ssl: Remove unused server code
| -rw-r--r-- | src/common/server.c | 2 | ||||
| -rw-r--r-- | src/common/ssl.c | 4 | ||||
| -rw-r--r-- | src/common/ssl.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/common/server.c b/src/common/server.c index d09f6c40..b837fdbe 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -1501,7 +1501,7 @@ server_connect (server *serv, char *hostname, int port, int no_login) #ifdef USE_OPENSSL if (!serv->ctx && serv->use_ssl) { - if (!(serv->ctx = _SSL_context_init (ssl_cb_info, FALSE))) + if (!(serv->ctx = _SSL_context_init (ssl_cb_info))) { fprintf (stderr, "_SSL_context_init failed\n"); exit (1); diff --git a/src/common/ssl.c b/src/common/ssl.c index 0a1db9f6..22286d60 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -80,7 +80,7 @@ __SSL_critical_error (char *funcname) /* +++++ SSL functions +++++ */ SSL_CTX * -_SSL_context_init (void (*info_cb_func), int server) +_SSL_context_init (void (*info_cb_func)) { SSL_CTX *ctx; #ifdef WIN32 @@ -89,7 +89,7 @@ _SSL_context_init (void (*info_cb_func), int server) SSLeay_add_ssl_algorithms (); SSL_load_error_strings (); - ctx = SSL_CTX_new (server ? SSLv23_server_method() : SSLv23_client_method ()); + ctx = SSL_CTX_new (SSLv23_client_method ()); SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH); SSL_CTX_set_timeout (ctx, 300); diff --git a/src/common/ssl.h b/src/common/ssl.h index ce2f616c..e722f831 100644 --- a/src/common/ssl.h +++ b/src/common/ssl.h @@ -41,7 +41,7 @@ struct chiper_info { int chiper_bits; }; -SSL_CTX *_SSL_context_init (void (*info_cb_func), int server); +SSL_CTX *_SSL_context_init (void (*info_cb_func)); #define _SSL_context_free(a) SSL_CTX_free(a); SSL *_SSL_socket (SSL_CTX *ctx, int sd); |