com php-src: Revert "Fix tests failing if EC unavailable": ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Wed, 19 Feb 2014 01:50:34 +0000 |
| Subject: | com php-src: Revert "Fix tests failing if EC unavailable": ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76104@lists.php.net to get a copy of this message | ||
Commit: f76d14fb52f1dc2c6a1849a707491b0d3d8bff37
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 18 Feb 2014 18:50:34 -0700
Parents: 293fdba30cb71b56a026fb4be0d7f206e4cb1dde
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f76d14fb52f1dc2c6a1849a707491b0d3d8bff37
Log:
Revert "Fix tests failing if EC unavailable"
This reverts commit 5e14a1269dbf9f2f73ad7f63be88174f9e5a49fd.
Conflicts:
ext/openssl/openssl.c
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index f1e582b..7e90cd5 100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3435,7 +3435,7 @@ PHP_FUNCTION(openssl_pkey_get_details)
}
break;
-#ifdef EVP_PKEY_EC
+#ifdef EVP_PKEY_EC
case EVP_PKEY_EC:
ktype = OPENSSL_KEYTYPE_EC;
break;