- add OPENSSL_VERSION_TEXT and OPENSSL_VERSION_NUMBER constants

- skip tests if openssl version < 0.9.7j (known to work)

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 8c28c777a0d1f5e16187c2661adfec65a561bbf2..ece6eab5de81138525100c5a042bb8bdedf27670 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -651,6 +651,9 @@ PHP_MINIT_FUNCTION(openssl)
         * 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);

diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt
index 63900ae6d7ace92981e45bcc5e2fed0cd6ae932e..eecc088887ebeeb3242aa6a248bd833157e774a8 100644 (file)
--- a/ext/openssl/tests/bug28382.phpt
+++ b/ext/openssl/tests/bug28382.phpt
@@ -3,6 +3,7 @@
 --SKIPIF--
 <?php 
 if (!extension_loaded("openssl")) die("skip"); 
+if (OPENSSL_VERSION_NUMBER<0x009070af) die("skip");
 ?>
 --FILE--
 <?php

diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt
index c7bb8abc535cb32a85126b8b57144589285f7ea7..9878f4028d7cc54b4129aa4c4adb25249872552e 100644 (file)
--- a/ext/openssl/tests/bug36732.phpt
+++ b/ext/openssl/tests/bug36732.phpt
@@ -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