From 532f577fe9147675956d87b12d63412845b3236a Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Sun, 3 Sep 2006 15:31:01 +0000 Subject: [PATCH] - add OPENSSL_VERSION_TEXT and OPENSSL_VERSION_NUMBER constants - skip tests if openssl version < 0.9.7j (known to work) --- ext/openssl/openssl.c | 3 +++ ext/openssl/tests/bug28382.phpt | 1 + ext/openssl/tests/bug36732.phpt | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 8c28c777a0..ece6eab5de 100644 --- 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 63900ae6d7..eecc088887 100644 --- a/ext/openssl/tests/bug28382.phpt +++ b/ext/openssl/tests/bug28382.phpt @@ -3,6 +3,7 @@ --SKIPIF-- --FILE-- --FILE--