cvs: php4 /ext/openssl openssl.c

sniper Fri Jul 12 17:46:35 2002 EDT Modified files: /php4/ext/openssl openssl.c Log: Fixed bug: #18295. e_os.h is not supposed to be included.. Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.49 php4/ext/openssl/openssl.c:1.50 --- php4/ext/openssl/openssl.c:1.49 Thu Jun 13 15:41:21 2002 +++ php4/ext/openssl/openssl.c Fri Jul 12 17:46:34 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.49 2002/06/13 19:41:21 sniper Exp $ */ +/* $Id: openssl.c,v 1.50 2002/07/12 21:46:34 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -39,7 +39,6 @@ #include <openssl/pem.h> #include <openssl/err.h> #include <openssl/conf.h> -#include <openssl/e_os.h> #include <openssl/rand.h> #define DEFAULT_KEY_LENGTH 512 @@ -576,10 +575,12 @@ 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));