pajoye Sun Sep 3 15:31:01 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/openssl openssl.c
/php-src/ext/openssl/tests bug28382.phpt bug36732.phpt
Log:
- add OPENSSL_VERSION_TEXT and OPENSSL_VERSION_NUMBER constants
- skip tests if openssl version < 0.9.7j (known to work)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.15&r2=1.98.2.5.2.16&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.15
php-src/ext/openssl/openssl.c:1.98.2.5.2.16
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.15 Thu Aug 31 13:48:16 2006
+++ php-src/ext/openssl/openssl.c Sun Sep 3 15:31:00 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.15 2006/08/31 13:48:16 tony2001 Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.16 2006/09/03 15:31:00 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -651,6 +651,9 @@
* openSSL callbacks */
ssl_stream_data_index = SSL_get_ex_new_index(0, "PHP stream index",
NULL, NULL, NULL);
+ REGISTER_STRING_CONSTANT("OPENSSL_VERSION_TEXT", OPENSSL_VERSION_TEXT,
CONST_CS|CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("OPENSSL_VERSION_NUMBER",
OPENSSL_VERSION_NUMBER, CONST_CS|CONST_PERSISTENT);
+
/* purposes for cert purpose checking */
REGISTER_LONG_CONSTANT("X509_PURPOSE_SSL_CLIENT",
X509_PURPOSE_SSL_CLIENT, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("X509_PURPOSE_SSL_SERVER",
X509_PURPOSE_SSL_SERVER, CONST_CS|CONST_PERSISTENT);
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug28382.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/openssl/tests/bug28382.phpt
diff -u php-src/ext/openssl/tests/bug28382.phpt:1.1.2.2
php-src/ext/openssl/tests/bug28382.phpt:1.1.2.3
--- php-src/ext/openssl/tests/bug28382.phpt:1.1.2.2 Sun Jul 30 17:03:12 2006
+++ php-src/ext/openssl/tests/bug28382.phpt Sun Sep 3 15:31:00 2006
@@ -3,6 +3,7 @@
--SKIPIF--
<?php
if (!extension_loaded("openssl")) die("skip");
+if (OPENSSL_VERSION_NUMBER<0x009070af) die("skip");
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug36732.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/openssl/tests/bug36732.phpt
diff -u php-src/ext/openssl/tests/bug36732.phpt:1.1.2.1
php-src/ext/openssl/tests/bug36732.phpt:1.1.2.2
--- php-src/ext/openssl/tests/bug36732.phpt:1.1.2.1 Mon Jul 31 00:33:41 2006
+++ php-src/ext/openssl/tests/bug36732.phpt Sun Sep 3 15:31:00 2006
@@ -2,7 +2,8 @@
#36732, add support for req_extensions in openss_csr_new and sign
--SKIPIF--
<?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip");
+if (OPENSSL_VERSION_NUMBER < 0x009070af) die("skip");
?>
--FILE--
<?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
