diff options
| author | foobar <sniper@php.net> | 2002-07-12 21:46:36 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-07-12 21:46:36 +0000 |
| commit | 36fbe5c93380a51b924ec3011a2441d8b9f890b9 (patch) | |
| tree | 72e783631f112e3574b66416fa114e5ca14c7528 /ext/openssl/openssl.c | |
| parent | b6cc6a2376b864552f1ac5eaec8a507ba9f8cf3b (diff) | |
| download | php-git-36fbe5c93380a51b924ec3011a2441d8b9f890b9.tar.gz | |
Fixed bug: #18295. e_os.h is not supposed to be included..
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 7 |
1 files 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 <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 @@ 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)); |