From 36fbe5c93380a51b924ec3011a2441d8b9f890b9 Mon Sep 17 00:00:00 2001 From: foobar Date: Fri, 12 Jul 2002 21:46:36 +0000 Subject: [PATCH] Fixed bug: #18295. e_os.h is not supposed to be included.. --- ext/openssl/openssl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 61565f60c7..fb42a3ce32 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #define DEFAULT_KEY_LENGTH 512 @@ -576,10 +575,12 @@ PHP_MINIT_FUNCTION(openssl) config_filename = getenv("OPENSSL_CONF"); if (config_filename == NULL) config_filename = getenv("SSLEAY_CONF"); - if (config_filename == NULL) { + + /* default to 'openssl.cnf' if no environment variable is set */ + if (config_filename == NULL) { snprintf(default_ssl_conf_filename, sizeof(default_ssl_conf_filename), "%s/%s", X509_get_default_cert_area(), - OPENSSL_CONF); + "openssl.cnf"); } else strncpy(default_ssl_conf_filename, config_filename, sizeof(default_ssl_conf_filename)); -- 2.40.0