com php-src: Fix tests failing if EC unavailable: ext/openssl/openssl.c ext/openssl/tests/bug64802.phpt ext/openssl/tests/bug66501.phpt
| From: | rdlowrey@php.net | Date: | Wed, 19 Feb 2014 00:00:14 +0000 |
| Subject: | com php-src: Fix tests failing if EC unavailable: ext/openssl/openssl.c ext/openssl/tests/bug64802.phpt ext/openssl/tests/bug66501.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76099@lists.php.net to get a copy of this message | ||
Commit: 5e14a1269dbf9f2f73ad7f63be88174f9e5a49fd
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 18 Feb 2014 17:00:14 -0700
Parents: 0576c91786ae8967fc0db806e09841c93371e9fc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e14a1269dbf9f2f73ad7f63be88174f9e5a49fd
Log:
Fix tests failing if EC unavailable
Changed paths:
M ext/openssl/openssl.c
M ext/openssl/tests/bug64802.phpt
M ext/openssl/tests/bug66501.phpt
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 3e60cd5..d20ca83 100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -78,6 +78,10 @@
#endif
#define DEBUG_SMIME 0
+#if !defined(OPENSSL_NO_EC) && defined(EVP_PKEY_EC)
+#define HAVE_EVP_PKEY_EC 1
+#endif
+
/* FIXME: Use the openssl constants instead of
* enum. It is now impossible to match real values
* against php constants. Also sorry to break the
@@ -88,7 +92,7 @@ enum php_openssl_key_type {
OPENSSL_KEYTYPE_DSA,
OPENSSL_KEYTYPE_DH,
OPENSSL_KEYTYPE_DEFAULT = OPENSSL_KEYTYPE_RSA,
-#ifdef EVP_PKEY_EC
+#ifdef HAVE_EVP_PKEY_EC
OPENSSL_KEYTYPE_EC = OPENSSL_KEYTYPE_DH +1
#endif
};
@@ -1116,7 +1120,7 @@ PHP_MINIT_FUNCTION(openssl)
REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DSA", OPENSSL_KEYTYPE_DSA,
CONST_CS|CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DH", OPENSSL_KEYTYPE_DH,
CONST_CS|CONST_PERSISTENT);
-#ifdef EVP_PKEY_EC
+#ifdef HAVE_EVP_PKEY_EC
REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_EC", OPENSSL_KEYTYPE_EC,
CONST_CS|CONST_PERSISTENT);
#endif
@@ -3014,7 +3018,7 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey TSRMLS_DC)
}
break;
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x0090800fL && !defined(OPENSSL_NO_EC) &&
defined(EVP_PKEY_EC)
+#ifdef HAVE_EVP_PKEY_EC
case EVP_PKEY_EC:
assert(pkey->pkey.ec != NULL);
@@ -3423,7 +3427,7 @@ PHP_FUNCTION(openssl_pkey_get_details)
}
break;
-#ifdef EVP_PKEY_EC
+#ifdef HAVE_EVP_PKEY_EC
case EVP_PKEY_EC:
ktype = OPENSSL_KEYTYPE_EC;
break;
diff --git a/ext/openssl/tests/bug64802.phpt b/ext/openssl/tests/bug64802.phpt
index 9a59701..be0b5f9 100644
--- a/ext/openssl/tests/bug64802.phpt
+++ b/ext/openssl/tests/bug64802.phpt
@@ -3,6 +3,7 @@ Bug #64802: openssl_x509_parse fails to parse subject properly in some cases
--SKIPIF--
<?php
if (!extension_loaded("openssl")) die("skip");
+if (!defined(OPENSSL_KEYTYPE_EC)) die("skip no EC available);
?>
--FILE--
<?php
diff --git a/ext/openssl/tests/bug66501.phpt b/ext/openssl/tests/bug66501.phpt
index 5c57f21..cd0da1f 100644
--- a/ext/openssl/tests/bug66501.phpt
+++ b/ext/openssl/tests/bug66501.phpt
@@ -3,6 +3,7 @@ Bug #66501: EC private key support in openssl_sign
--SKIPIF--
<?php
if (!extension_loaded("openssl")) die("skip");
+if (!defined(OPENSSL_KEYTYPE_EC)) die("skip no EC available);
--FILE--
<?php
$pkey = 'ASN1 OID: prime256v1