diff lib/sslcommon.c @ 174:e643d287fe32

2003-6-8 Brian Masney <[e-mail]> * lib/gftp.h lib/sslcommon.c - added ssl_register_module(). This function registers the configuration variables for the SSL engine. Right now, the only variable is the entropy source * lib/https.c (https_register_module) - call ssl_register_module(). Multiple protocols will be able to call this function, it will only be initialized once

--- a/lib/sslcommon.c	Mon Jun 09 00:53:20 2003 +0000
+++ b/lib/sslcommon.c	Mon Jun 09 01:07:33 2003 +0000
@@ -26,10 +26,34 @@
 
 #ifdef USE_SSL
 
+static gftp_config_vars config_vars[] =
+{
+  {"", N_("SSL Engine"), gftp_option_type_notebook, NULL, NULL, 0, NULL,
+   GFTP_PORT_GTK, NULL},
+
+  {"entropy_source", N_("SSL Entropy File:"), 
+   gftp_option_type_text, "/dev/urandom", NULL, 0, 
+   N_("SSL entropy file"), GFTP_PORT_ALL, 0},
+  {NULL, NULL, 0, NULL, NULL, 0, NULL, 0, NULL}
+};  
+
 static SSL_CTX * ctx = NULL;
 
 static volatile int gftp_ssl_initialized = 0;
 
+void
+ssl_register_module (void)
+{
+  static volatile int module_registered = 0;
+
+  if (!module_registered)
+    {
+      gftp_register_config_vars (config_vars);
+      module_registered = 1;
+    }
+}
+
+
 static int 
 gftp_ssl_verify_callback (int ok, X509_STORE_CTX *store)
 {
@@ -138,13 +162,14 @@
 int
 gftp_ssl_startup (gftp_request * request)
 {
+  char *entropy_source;
+
   if (gftp_ssl_initialized)
     return (0);
 
   gftp_ssl_initialized = 1;
 
   /* FIXME _ thread setup */
-  /* FIXME - only call this from one place */
   if (!SSL_library_init ())
     {
       request->logging_function (gftp_logging_error, request->user_data,
@@ -153,7 +178,9 @@
     }
 
   SSL_load_error_strings (); 
-  RAND_load_file ("/dev/urandom", 1024); /* FIXME - be able to specify this file */
+
+  gftp_lookup_request_option (request, "entropy_source", &entropy_source);
+  RAND_load_file (entropy_source, 1024);
 
   ctx = SSL_CTX_new (SSLv23_method ());