Merge branch '3.0'

This commit is contained in:
terrafrost 2021-01-07 19:36:15 -06:00
commit d365f1f1d5

View File

@ -161,13 +161,15 @@ abstract class EC extends AsymmetricKey
$privatekey = new PrivateKey; $privatekey = new PrivateKey;
$curveName = $curve; $curveName = $curve;
$curve = '\phpseclib3\Crypt\EC\Curves\\' . $curveName; if (preg_match('#(?:^curve|^ed)\d+$#', $curveName)) {
if (!class_exists($curve)) {
$curveName = ucfirst($curveName); $curveName = ucfirst($curveName);
$curve = '\phpseclib3\Crypt\EC\Curves\\' . $curveName; } elseif (substr($curveName, 0, 10) == 'brainpoolp') {
if (!class_exists($curve)) { $curveName = 'brainpoolP' . substr($curveName, 10);
throw new UnsupportedCurveException('Named Curve of ' . $curveName . ' is not supported'); }
} $curve = '\phpseclib3\Crypt\EC\Curves\\' . $curveName;
if (!class_exists($curve)) {
throw new UnsupportedCurveException('Named Curve of ' . $curveName . ' is not supported');
} }
$reflect = new \ReflectionClass($curve); $reflect = new \ReflectionClass($curve);