diff options
author | Bob Beck <beck@cvs.openbsd.org> | 1999-03-07 23:12:02 +0000 |
---|---|---|
committer | Bob Beck <beck@cvs.openbsd.org> | 1999-03-07 23:12:02 +0000 |
commit | 112b5872ca5da59532ef463ea99e69c5f499c3c7 (patch) | |
tree | 8abfa559270c9b4ab88e114ccca18f8cbf485bad /usr.sbin/httpd | |
parent | 2a3531b75e52fd25751feab28f6596a2617e2dfb (diff) |
don't fatal out on init if RSA doesn't work, so as not to die if an RSA
libssl isn't installed and we only want to do http
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c index 7df32b19af9..06084f34981 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c @@ -241,8 +241,17 @@ void ssl_init_Module(server_rec *s, pool *p) ssl_log(s, SSL_LOG_INFO, "Init: Generating temporary (512 bit) RSA private key"); mc->pRSATmpKey = RSA_generate_key(512, RSA_F4, NULL, NULL); if (mc->pRSATmpKey == NULL) { +#ifdef __OpenBSD__ + ssl_log(s, SSL_LOG_ERROR, "Init: Failed to generate temporary (512 bit) RSA private key (SSL won't work without an RSA capable shared library)"); + ssl_log(s, SSL_LOG_ERROR, "Init: pkg_add ftp://ftp.openbsd.org/pub/2.5/packages/<arch>/libssl-1.1.tgz if you are able to use RSA"); + /* harmless in http only case. We'll get a fatal error below + * if this didn't work and we try to init https servers + */ + return; +#else ssl_log(s, SSL_LOG_ERROR, "Init: Failed to generate temporary (512 bit) RSA private key"); ssl_die(); +#endif } } |