Browse Source

* Rename load|unload_ssl to libssl

Bryan Drewery 15 years ago
parent
commit
3623728680
4 changed files with 6 additions and 6 deletions
  1. 2 2
      src/libssl.c
  2. 2 2
      src/libssl.h
  3. 1 1
      src/main.c
  4. 1 1
      src/net.c

+ 2 - 2
src/libssl.c

@@ -67,7 +67,7 @@ static int load_symbols(void *handle) {
 }
 }
 
 
 
 
-int load_ssl() {
+int load_libssl() {
   if (ssl_ctx) {
   if (ssl_ctx) {
     return 0;
     return 0;
   }
   }
@@ -115,7 +115,7 @@ int load_ssl() {
   return 0;
   return 0;
 }
 }
 
 
-int unload_ssl() {
+int unload_libssl() {
   if (libssl_handle) {
   if (libssl_handle) {
 #ifdef EGG_SSL_EXT
 #ifdef EGG_SSL_EXT
     /* cleanup mess when quiting */
     /* cleanup mess when quiting */

+ 2 - 2
src/libssl.h

@@ -34,8 +34,8 @@ typedef void (*SSL_CTX_free_t)(SSL_CTX*);
 typedef SSL_CTX* (*SSL_CTX_new_t)(const SSL_METHOD*);
 typedef SSL_CTX* (*SSL_CTX_new_t)(const SSL_METHOD*);
 typedef long (*SSL_CTX_ctrl_t)(SSL_CTX*, int, long, void*);
 typedef long (*SSL_CTX_ctrl_t)(SSL_CTX*, int, long, void*);
 
 
-int load_ssl();
-int unload_ssl();
+int load_libssl();
+int unload_libssl();
 
 
 #ifdef EGG_SSL_EXT
 #ifdef EGG_SSL_EXT
 extern SSL_CTX *ssl_ctx;
 extern SSL_CTX *ssl_ctx;

+ 1 - 1
src/main.c

@@ -198,7 +198,7 @@ void fatal(const char *s, int recoverable)
 
 
 #ifdef EGG_SSL_EXT
 #ifdef EGG_SSL_EXT
   if (ssl_use) {
   if (ssl_use) {
-    unload_ssl();
+    unload_libssl();
   }
   }
 #endif
 #endif
 
 

+ 1 - 1
src/net.c

@@ -623,7 +623,7 @@ int open_telnet_raw(int sock, const char *ipIn, port_t sport, bool proxy_on, int
 int net_switch_to_ssl(int sock) {
 int net_switch_to_ssl(int sock) {
   int i = 0;
   int i = 0;
 
 
-  if (load_ssl()) {
+  if (load_libssl()) {
     debug0("Error while switching to SSL - error loading library");
     debug0("Error while switching to SSL - error loading library");
     return 0;
     return 0;
   }
   }