fixes in line with new secp256k1 api

Thomas Kerin · afk11 · commit 513a3b708db0 · 2018-07-16T13:13:52.000+01:00
diff --git a/src/Crypto/EcAdapter/Impl/Secp256k1/Adapter/EcAdapter.php b/src/Crypto/EcAdapter/Impl/Secp256k1/Adapter/EcAdapter.php
@@ -128,7 +128,7 @@ public function getContext()
      */
     private function doRecover(BufferInterface $msg32, CompactSignature $compactSig): PublicKey
     {
-        $publicKey = '';
+        $publicKey = null;
         /** @var resource $publicKey */
         $context = $this->context;
         $sig = $compactSig->getResource();
diff --git a/src/Crypto/EcAdapter/Impl/Secp256k1/Key/PrivateKey.php b/src/Crypto/EcAdapter/Impl/Secp256k1/Key/PrivateKey.php
@@ -79,12 +79,11 @@ public function sign(BufferInterface $msg32, RbgInterface $rbgInterface = null):
     {
         $context = $this->ecAdapter->getContext();
 
-        /** @var resource $sig_t */
-        $sig_t = '';
+        $sig_t = null;
         if (1 !== secp256k1_ecdsa_sign($context, $sig_t, $msg32->getBinary(), $this->secretBin)) {
             throw new \RuntimeException('Secp256k1: failed to sign');
         }
-
+        /** @var resource $sig_t */
         $derSig = '';
         secp256k1_ecdsa_signature_serialize_der($context, $derSig, $sig_t);
 
@@ -106,14 +105,15 @@ public function signCompact(BufferInterface $msg32, RbgInterface $rbfInterface =
     {
         $context = $this->ecAdapter->getContext();
         
-        $sig_t = '';
+        $sig_t = null;
         if (1 !== secp256k1_ecdsa_sign_recoverable($context, $sig_t, $msg32->getBinary(), $this->secretBin)) {
             throw new \RuntimeException('Secp256k1: failed to sign');
         }
-
-        $recid = '';
+        /** @var resource $sig_t
+         */
+        $recid = 0;
         $ser = '';
-        if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($context, $sig_t, $ser, $recid)) {
+        if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($context, $ser, $recid, $sig_t)) {
             throw new \RuntimeException('Failed to obtain recid');
         }
 
@@ -160,12 +160,11 @@ public function getPublicKey()
     {
         if (null === $this->publicKey) {
             $context = $this->ecAdapter->getContext();
-            $publicKey_t = '';
-            /** @var resource $publicKey_t */
+            $publicKey_t = null;
             if (1 !== secp256k1_ec_pubkey_create($context, $publicKey_t, $this->getBinary())) {
                 throw new \RuntimeException('Failed to create public key');
             }
-
+            /** @var resource $publicKey_t */
             $this->publicKey = new PublicKey($this->ecAdapter, $publicKey_t, $this->compressed);
         }
 
diff --git a/src/Crypto/EcAdapter/Impl/Secp256k1/Key/PublicKey.php b/src/Crypto/EcAdapter/Impl/Secp256k1/Key/PublicKey.php
@@ -59,8 +59,11 @@ public function __construct(EcAdapter $ecAdapter, $secp256k1_pubkey_t, bool $com
      */
     public function verify(BufferInterface $msg32, SignatureInterface $signature): bool
     {
+        $ctx = $this->ecAdapter->getContext();
+        $normalized = null;
+        secp256k1_ecdsa_signature_normalize($ctx, $normalized, $signature->getResource());
         /** @var Signature $signature */
-        return (bool) secp256k1_ecdsa_verify($this->ecAdapter->getContext(), $signature->getResource(), $msg32->getBinary(), $this->pubkey_t);
+        return (bool) secp256k1_ecdsa_verify($ctx, $normalized, $msg32->getBinary(), $this->pubkey_t);
     }
 
     /**
@@ -121,7 +124,7 @@ private function clonePubkey()
         }
 
         /** @var resource $clone */
-        $clone = '';
+        $clone = null;
         if (1 !== secp256k1_ec_pubkey_parse($context, $clone, $serialized)) {
             throw new \Exception('Secp256k1 pubkey parse');
         }
diff --git a/src/Crypto/EcAdapter/Impl/Secp256k1/Serializer/Key/PublicKeySerializer.php b/src/Crypto/EcAdapter/Impl/Secp256k1/Serializer/Key/PublicKeySerializer.php
@@ -67,12 +67,11 @@ public function serialize(PublicKeyInterface $publicKey): BufferInterface
     public function parse(BufferInterface $buffer): PublicKeyInterface
     {
         $binary = $buffer->getBinary();
-        $pubkey_t = '';
-        /** @var resource $pubkey_t */
+        $pubkey_t = null;
         if (!secp256k1_ec_pubkey_parse($this->ecAdapter->getContext(), $pubkey_t, $binary)) {
             throw new \RuntimeException('Secp256k1 failed to parse public key');
         }
-
+        /** @var resource $pubkey_t */
         return new PublicKey(
             $this->ecAdapter,
             $pubkey_t,
diff --git a/src/Crypto/EcAdapter/Impl/Secp256k1/Serializer/Signature/CompactSignatureSerializer.php b/src/Crypto/EcAdapter/Impl/Secp256k1/Serializer/Signature/CompactSignatureSerializer.php
@@ -33,8 +33,8 @@ public function __construct(EcAdapter $ecAdapter)
     private function doSerialize(CompactSignature $signature)
     {
         $sig_t = '';
-        $recid = '';
-        if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($this->ecAdapter->getContext(), $signature->getResource(), $sig_t, $recid)) {
+        $recid = 0;
+        if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($this->ecAdapter->getContext(), $sig_t, $recid, $signature->getResource())) {
             throw new \RuntimeException('Secp256k1 serialize compact failure');
         }
 
@@ -73,12 +73,11 @@ public function parse(BufferInterface $buffer): CompactSignatureInterface
         $isCompressed = ($recoveryFlags & 4) !== 0;
         $recoveryId = $recoveryFlags - ($isCompressed ? 4 : 0);
 
-        $sig_t = '';
-        /** @var resource $sig_t */
+        $sig_t = null;
         if (!secp256k1_ecdsa_recoverable_signature_parse_compact($this->ecAdapter->getContext(), $sig_t, $sig->getBinary(), $recoveryId)) {
             throw new \RuntimeException('Unable to parse compact signature');
         }
-
+        /** @var resource $sig_t */
         return new CompactSignature($this->ecAdapter, $sig_t, $recoveryId, $isCompressed);
     }
 }
diff --git a/src/Crypto/EcAdapter/Impl/Secp256k1/Serializer/Signature/DerSignatureSerializer.php b/src/Crypto/EcAdapter/Impl/Secp256k1/Serializer/Signature/DerSignatureSerializer.php
@@ -95,7 +95,7 @@ public function parse(BufferInterface $derSignature): SignatureInterface
         $derSignature = (new Parser($derSignature))->getBuffer();
         $binary = $derSignature->getBinary();
 
-        $sig_t = '';
+        $sig_t = null;
         /** @var resource $sig_t */
         if (!ecdsa_signature_parse_der_lax($this->ecAdapter->getContext(), $sig_t, $binary)) {
             throw new \RuntimeException('Secp256k1: parse der failure');
diff --git a/src/Crypto/EcAdapter/Impl/Secp256k1/Signature/CompactSignature.php b/src/Crypto/EcAdapter/Impl/Secp256k1/Signature/CompactSignature.php
@@ -51,8 +51,8 @@ public function __construct(EcAdapter $ecAdapter, $secp256k1_ecdsa_signature_t,
         }
 
         $ser = '';
-        $recidout = '';
-        secp256k1_ecdsa_recoverable_signature_serialize_compact($ecAdapter->getContext(), $secp256k1_ecdsa_signature_t, $ser, $recidout);
+        $recidout = 0;
+        secp256k1_ecdsa_recoverable_signature_serialize_compact($ecAdapter->getContext(), $ser, $recidout, $secp256k1_ecdsa_signature_t);
         list ($r, $s) = array_map(
             function ($val) use ($math) {
                 return (new Buffer($val))->getGmp();

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public function getContext()`
`128`	`128`	`*/`
`129`	`129`	`private function doRecover(BufferInterface $msg32, CompactSignature $compactSig): PublicKey`
`130`	`130`	`{`
`131`		`- $publicKey = '';`
	`131`	`+ $publicKey = null;`
`132`	`132`	`/** @var resource $publicKey */`
`133`	`133`	`$context = $this->context;`
`134`	`134`	`$sig = $compactSig->getResource();`
Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,11 @@ public function sign(BufferInterface $msg32, RbgInterface $rbgInterface = null):`
`79`	`79`	`{`
`80`	`80`	`$context = $this->ecAdapter->getContext();`
`81`	`81`
`82`		`- /** @var resource $sig_t */`
`83`		`- $sig_t = '';`
	`82`	`+ $sig_t = null;`
`84`	`83`	`if (1 !== secp256k1_ecdsa_sign($context, $sig_t, $msg32->getBinary(), $this->secretBin)) {`
`85`	`84`	`throw new \RuntimeException('Secp256k1: failed to sign');`
`86`	`85`	`}`
`87`		`-`
	`86`	`+ /** @var resource $sig_t */`
`88`	`87`	`$derSig = '';`
`89`	`88`	`secp256k1_ecdsa_signature_serialize_der($context, $derSig, $sig_t);`
`90`	`89`
`@@ -106,14 +105,15 @@ public function signCompact(BufferInterface $msg32, RbgInterface $rbfInterface =`
`106`	`105`	`{`
`107`	`106`	`$context = $this->ecAdapter->getContext();`
`108`	`107`
`109`		`- $sig_t = '';`
	`108`	`+ $sig_t = null;`
`110`	`109`	`if (1 !== secp256k1_ecdsa_sign_recoverable($context, $sig_t, $msg32->getBinary(), $this->secretBin)) {`
`111`	`110`	`throw new \RuntimeException('Secp256k1: failed to sign');`
`112`	`111`	`}`
`113`		`-`
`114`		`- $recid = '';`
	`112`	`+ /** @var resource $sig_t`
	`113`	`+ */`
	`114`	`+ $recid = 0;`
`115`	`115`	`$ser = '';`
`116`		`- if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($context, $sig_t, $ser, $recid)) {`
	`116`	`+ if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($context, $ser, $recid, $sig_t)) {`
`117`	`117`	`throw new \RuntimeException('Failed to obtain recid');`
`118`	`118`	`}`
`119`	`119`
`@@ -160,12 +160,11 @@ public function getPublicKey()`
`160`	`160`	`{`
`161`	`161`	`if (null === $this->publicKey) {`
`162`	`162`	`$context = $this->ecAdapter->getContext();`
`163`		`- $publicKey_t = '';`
`164`		`- /** @var resource $publicKey_t */`
	`163`	`+ $publicKey_t = null;`
`165`	`164`	`if (1 !== secp256k1_ec_pubkey_create($context, $publicKey_t, $this->getBinary())) {`
`166`	`165`	`throw new \RuntimeException('Failed to create public key');`
`167`	`166`	`}`
`168`		`-`
	`167`	`+ /** @var resource $publicKey_t */`
`169`	`168`	`$this->publicKey = new PublicKey($this->ecAdapter, $publicKey_t, $this->compressed);`
`170`	`169`	`}`
`171`	`170`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,11 @@ public function __construct(EcAdapter $ecAdapter, $secp256k1_pubkey_t, bool $com`
`59`	`59`	`*/`
`60`	`60`	`public function verify(BufferInterface $msg32, SignatureInterface $signature): bool`
`61`	`61`	`{`
	`62`	`+ $ctx = $this->ecAdapter->getContext();`
	`63`	`+ $normalized = null;`
	`64`	`+ secp256k1_ecdsa_signature_normalize($ctx, $normalized, $signature->getResource());`
`62`	`65`	`/** @var Signature $signature */`
`63`		`- return (bool) secp256k1_ecdsa_verify($this->ecAdapter->getContext(), $signature->getResource(), $msg32->getBinary(), $this->pubkey_t);`
	`66`	`+ return (bool) secp256k1_ecdsa_verify($ctx, $normalized, $msg32->getBinary(), $this->pubkey_t);`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`/**`
`@@ -121,7 +124,7 @@ private function clonePubkey()`
`121`	`124`	`}`
`122`	`125`
`123`	`126`	`/** @var resource $clone */`
`124`		`- $clone = '';`
	`127`	`+ $clone = null;`
`125`	`128`	`if (1 !== secp256k1_ec_pubkey_parse($context, $clone, $serialized)) {`
`126`	`129`	`throw new \Exception('Secp256k1 pubkey parse');`
`127`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ public function __construct(EcAdapter $ecAdapter)`
`33`	`33`	`private function doSerialize(CompactSignature $signature)`
`34`	`34`	`{`
`35`	`35`	`$sig_t = '';`
`36`		`- $recid = '';`
`37`		`- if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($this->ecAdapter->getContext(), $signature->getResource(), $sig_t, $recid)) {`
	`36`	`+ $recid = 0;`
	`37`	`+ if (!secp256k1_ecdsa_recoverable_signature_serialize_compact($this->ecAdapter->getContext(), $sig_t, $recid, $signature->getResource())) {`
`38`	`38`	`throw new \RuntimeException('Secp256k1 serialize compact failure');`
`39`	`39`	`}`
`40`	`40`
`@@ -73,12 +73,11 @@ public function parse(BufferInterface $buffer): CompactSignatureInterface`
`73`	`73`	`$isCompressed = ($recoveryFlags & 4) !== 0;`
`74`	`74`	`$recoveryId = $recoveryFlags - ($isCompressed ? 4 : 0);`
`75`	`75`
`76`		`- $sig_t = '';`
`77`		`- /** @var resource $sig_t */`
	`76`	`+ $sig_t = null;`
`78`	`77`	`if (!secp256k1_ecdsa_recoverable_signature_parse_compact($this->ecAdapter->getContext(), $sig_t, $sig->getBinary(), $recoveryId)) {`
`79`	`78`	`throw new \RuntimeException('Unable to parse compact signature');`
`80`	`79`	`}`
`81`		`-`
	`80`	`+ /** @var resource $sig_t */`
`82`	`81`	`return new CompactSignature($this->ecAdapter, $sig_t, $recoveryId, $isCompressed);`
`83`	`82`	`}`
`84`	`83`	`}`