del php-src: ext/openssl/openssl.c ext/openssl/tests/bug64802.phpt ext/openssl/tests/bug66501.phpt

Branch: PHP-5.6 Deleted commits count: 6 User: Ferenc Kovacs <tyrael@php.net> Wed, 19 Feb 2014 07:51:22 +0000 Changed paths: M ext/openssl/openssl.c M ext/openssl/tests/bug64802.phpt M ext/openssl/tests/bug66501.phpt Diff: diff --git b/ext/openssl/openssl.c a/ext/openssl/openssl.c index 1dc93e5..31704e5 100755 --- b/ext/openssl/openssl.c +++ a/ext/openssl/openssl.c @@ -79,10 +79,6 @@ #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 @@ -93,7 +89,7 @@ enum php_openssl_key_type { OPENSSL_KEYTYPE_DSA, OPENSSL_KEYTYPE_DH, OPENSSL_KEYTYPE_DEFAULT = OPENSSL_KEYTYPE_RSA, -#ifdef HAVE_EVP_PKEY_EC +#ifdef EVP_PKEY_EC OPENSSL_KEYTYPE_EC = OPENSSL_KEYTYPE_DH +1 #endif }; @@ -1173,7 +1169,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 HAVE_EVP_PKEY_EC +#ifdef EVP_PKEY_EC REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_EC", OPENSSL_KEYTYPE_EC, CONST_CS|CONST_PERSISTENT); #endif @@ -3472,7 +3468,7 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey TSRMLS_DC) } break; #endif -#ifdef HAVE_EVP_PKEY_EC +#if OPENSSL_VERSION_NUMBER >= 0x0090800fL && !defined(OPENSSL_NO_EC) && defined(EVP_PKEY_EC) case EVP_PKEY_EC: assert(pkey->pkey.ec != NULL); @@ -3881,7 +3877,7 @@ PHP_FUNCTION(openssl_pkey_get_details) } break; -#ifdef HAVE_EVP_PKEY_EC +#ifdef EVP_PKEY_EC case EVP_PKEY_EC: ktype = OPENSSL_KEYTYPE_EC; break; diff --git b/ext/openssl/tests/bug64802.phpt a/ext/openssl/tests/bug64802.phpt index be0b5f9..9a59701 100644 --- b/ext/openssl/tests/bug64802.phpt +++ a/ext/openssl/tests/bug64802.phpt @@ -3,7 +3,6 @@ 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 b/ext/openssl/tests/bug66501.phpt a/ext/openssl/tests/bug66501.phpt index cd0da1f..5c57f21 100644 --- b/ext/openssl/tests/bug66501.phpt +++ a/ext/openssl/tests/bug66501.phpt @@ -3,7 +3,6 @@ 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