mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fetch EC curve OID if name is blank. Issue #9745

Browse Source
This commit is contained in:
jim-p 2019-11-15 11:02:20 -05:00
parent 1120b85cb2
commit 9dfd57c041
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/etc/inc/certs.inc
View File

@ -2133,8 +2133,11 @@ function cert_print_infoblock($cert) {
} else {
/* Elliptic curve (EC) key curve name */
$certextinfo .= 'ECDSA<br/>';
$certextinfo .= '<b>' . gettext("Elliptic curve name: ") . '</b>';
$certextinfo .= $key_details['ec']['curve_name'] . '<br/>';
$curve = cert_get_pkey_curve($cert['prv']);
if (!empty($curve)) {
$certextinfo .= '<b>' . gettext("Elliptic curve name:") . ' </b>';
$certextinfo .= $curve . '<br/>';
}
}
}
@ -2311,9 +2314,12 @@ function cert_get_pkey_curve($pkey, $decode = true) {
$key_details = openssl_pkey_get_details($res_key);
/* If this is an EC key, and the curve name is not empty, return
* that curve name. */
if (($key_details['type'] == OPENSSL_KEYTYPE_EC) &&
(!empty($key_details['ec']['curve_name']))) {
return $key_details['ec']['curve_name'];
if ($key_details['type'] == OPENSSL_KEYTYPE_EC) {
if (!empty($key_details['ec']['curve_name'])) {
return $key_details['ec']['curve_name'];
} else {
return $key_details['ec']['curve_oid'];
}
}
}