Mercurial > gftp.yaz
changeset 174:e643d287fe32
2003-6-8 Brian Masney <masneyb@gftp.org>
* 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
| author | masneyb |
|---|---|
| date | Mon, 09 Jun 2003 01:07:33 +0000 |
| parents | 4c288d05b26a |
| children | 3b168fed3fde |
| files | ChangeLog lib/gftp.h lib/https.c lib/sslcommon.c |
| diffstat | 4 files changed, 44 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 09 00:53:20 2003 +0000 +++ b/ChangeLog Mon Jun 09 01:07:33 2003 +0000 @@ -1,3 +1,12 @@ +2003-6-8 Brian Masney <masneyb@gftp.org> + * 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 + 2003-6-8 Brian Masney <masneyb@gftp.org> * lib/bookmark.c lib/gftp.h lib/https.c lib/local.c lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c @@ -923,7 +932,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.83 2003/06/09 00:53:17 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.84 2003/06/09 01:07:32 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/gftp.h Mon Jun 09 00:53:20 2003 +0000 +++ b/lib/gftp.h Mon Jun 09 01:07:33 2003 +0000 @@ -693,6 +693,8 @@ void sshv2_register_module ( void ); +void ssl_register_module ( void ); + int bookmark_init ( gftp_request * request ); void bookmark_register_module ( void );
--- a/lib/https.c Mon Jun 09 00:53:20 2003 +0000 +++ b/lib/https.c Mon Jun 09 01:07:33 2003 +0000 @@ -54,6 +54,9 @@ void https_register_module (void) { +#ifdef USE_SSL + ssl_register_module (); +#endif }
--- 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 ());