cvs: php4(PHP_4_2_0) /ext/openssl openssl.c
| From: | Jani Taskinen | Date: | Fri, 12 Jul 2002 21:47:33 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/openssl openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12799@lists.php.net to get a copy of this message | ||
sniper Fri Jul 12 17:47:33 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/openssl openssl.c
Log:
MFH
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.41.2.5 php4/ext/openssl/openssl.c:1.41.2.6
--- php4/ext/openssl/openssl.c:1.41.2.5 Wed May 1 04:22:56 2002
+++ php4/ext/openssl/openssl.c Fri Jul 12 17:47:33 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.41.2.5 2002/05/01 08:22:56 wez Exp $ */
+/* $Id: openssl.c,v 1.41.2.6 2002/07/12 21:47:33 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
@@ -577,7 +576,7 @@
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));