Skip to content

Fix for bug 66501 - key type not supported in this PHP build #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Fix for bug 66501 - key type not supported in this PHP build #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b54d9b4
commit for php bug 61421
Sep 14, 2012
76488b7
Merge remote-tracking branch 'upstream/master'
mk-j Aug 13, 2013
3e7eba1
Fix for php bug #64802 includes test case
mk-j Aug 14, 2013
9c098d5
Merge remote-tracking branch 'upstream/master'
mk-j Jan 16, 2014
6eeaabd
Fix for bug66501 - "key type not supported in this PHP build"
mk-j Jan 22, 2014
60fe4b2
fixing whitespace issue in last commit
mk-j Jan 22, 2014
17969bc
synching to master openssl.c
mk-j Jan 22, 2014
b81338a
updating to latest bug64802.phpt from upstream
mk-j Jan 22, 2014
8630e3b
Change OpenSSL DEFAULT_KEY_LENGTH to 2048
mk-j Jan 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ext/openssl/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#define timezone _timezone /* timezone is called _timezone in LibC */
#endif

#define DEFAULT_KEY_LENGTH 512
#define DEFAULT_KEY_LENGTH 2048
#define MIN_KEY_LENGTH 384

#define OPENSSL_ALGO_SHA1 1
Expand Down Expand Up @@ -3453,6 +3453,15 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey TSRMLS_DC)
return 0;
}
break;
#endif
#ifdef EVP_PKEY_EC
case EVP_PKEY_EC:
assert(pkey->pkey.ec != NULL);

if ( NULL == EC_KEY_get0_private_key(pkey->pkey.ec)) {
return 0;
}
break;
#endif
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "key type not supported in this PHP build!");
Expand Down
21 changes: 21 additions & 0 deletions ext/openssl/tests/bug66501.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
Bug #66501: EC private key support in openssl_sign
--SKIPIF--
<?php
if (!extension_loaded("openssl")) die("skip");
--FILE--
<?php
$pkey = 'ASN1 OID: prime256v1
-----BEGIN EC PARAMETERS-----
BggqhkjOPQMBBw==
-----END EC PARAMETERS-----
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEILPkqoeyM7XgwYkuSj3077lrsrfWJK5LqMolv+m2oOjZoAoGCCqGSM49
AwEHoUQDQgAEPq4hbIWHvB51rdWr8ejrjWo4qVNWVugYFtPg/xLQw0mHkIPZ4DvK
sqOTOnMoezkbSmVVMuwz9flvnqHGmQvmug==
-----END EC PRIVATE KEY-----';
$key = openssl_pkey_get_private($pkey);
$res = openssl_sign($data ='alpha', $sign, $key, 'ecdsa-with-SHA1');
var_dump($res);
--EXPECTF--
bool(true)