octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-02-04 21:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2024-07-31 18:34:21 -05:00
commit e1345b0ad9
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/Crypt/EC/Formats/Signature/IEEE.php
View File

@ -54,11 +54,11 @@ abstract class IEEE
/** /**
* Returns a signature in the appropriate format * Returns a signature in the appropriate format
*/ */
public static function save(BigInteger $r, BigInteger $s): string public static function save(BigInteger $r, BigInteger $s, string $curve, int $length): string
{ {
$r = $r->toBytes(); $r = $r->toBytes();
$s = $s->toBytes(); $s = $s->toBytes();
$len = max(strlen($r), strlen($s)); $length >>= 3;
return str_pad($r, $len, "\0", STR_PAD_LEFT) . str_pad($s, $len, "\0", STR_PAD_LEFT); return str_pad($r, $length, "\0", STR_PAD_LEFT) . str_pad($s, $length, "\0", STR_PAD_LEFT);
} }
} }

28
phpseclib/Crypt/EC/PrivateKey.php
View File

@ -158,7 +158,7 @@ final class PrivateKey extends EC implements Common\PrivateKey
extract(ASN1Signature::load($signature)); extract(ASN1Signature::load($signature));
return $shortFormat == 'SSH2' ? $format::save($r, $s, $this->getCurve()) : $format::save($r, $s); return $this->formatSignature($r, $s);
} }
} }
@ -207,7 +207,7 @@ final class PrivateKey extends EC implements Common\PrivateKey
list(, $s) = $temp->divide($this->q); list(, $s) = $temp->divide($this->q);
*/ */
return $shortFormat == 'SSH2' ? $format::save($r, $s, $this->getCurve()) : $format::save($r, $s); return $this->formatSignature($r, $s);
} }
/** /**
@ -249,4 +249,28 @@ final class PrivateKey extends EC implements Common\PrivateKey
} }
return $key; return $key;
} }
/**
* Returns a signature in the appropriate format
*
* @return string
*/
private function formatSignature(BigInteger $r, BigInteger $s): string
{
$format = $this->sigFormat;
$temp = new \ReflectionMethod($format, 'save');
$paramCount = $temp->getNumberOfRequiredParameters();
// @codingStandardsIgnoreStart
switch ($paramCount) {
case 2: return $format::save($r, $s);
case 3: return $format::save($r, $s, $this->getCurve());
case 4: return $format::save($r, $s, $this->getCurve(), $this->getLength());
}
// @codingStandardsIgnoreEnd
// presumably the only way you could get to this is if you were using a custom plugin
throw new UnsupportedOperationException("$format::save() has $paramCount parameters - the only valid parameter counts are 2 or 3");
}
} }

14
tests/Unit/Crypt/EC/KeyTest.php
View File

@ -749,4 +749,18 @@ z9DYTLdGkQDqox3AtEs9nn6kE1O/vHE4bqMegjj4gbA=
$key = EC::loadFormat('PKCS8', $key); $key = EC::loadFormat('PKCS8', $key);
$this->assertInstanceOf(PublicKey::class, $key); $this->assertInstanceOf(PublicKey::class, $key);
} }
public function testIEEESignatureCreate(): void
{
$key = PublicKeyLoader::load('-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7+qVCtyt+tV2hTou
kbZNIHu+PaE0osExnxdlkiC+VYqhRANCAAS8yEueJvIAnCk++0rsD8X9dk3hAmyb
4lv6WkjCQU5iksxIG/E60L8IeDZX8+oNzHPjNN5/6MBk0ISrGKyFhlH1
-----END PRIVATE KEY-----');
$priv = $key->withSignatureFormat('IEEE');
$sig = $priv->sign('ddd');
$this->assertTrue($key->getPublicKey()->withSignatureFormat('IEEE')->verify('ddd', $sig));
}
} }