sig

kawax · Dec 26, 2024 · ca1011a · ca1011a
1 parent 152e897
commit ca1011a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/src/Crypto/Signature.php b/src/Crypto/Signature.php
@@ -28,4 +28,20 @@ public static function fromCompact(string $sig): string
 
         return ASN1::save($r, $s);
     }
+
+    public static function toCompact(string $sig): string
+    {
+        if (strlen($sig) === 64) {
+            return $sig;
+        }
+
+        $arr = ASN1::load($sig);
+
+        /** @var BigInteger $r */
+        $r = $arr['r'];
+        /** @var BigInteger $s */
+        $s = $arr['s'];
+
+        return $r->toBytes().$s->toBytes();
+    }
 }
diff --git a/src/Labeler/Labeler.php b/src/Labeler/Labeler.php
@@ -11,6 +11,7 @@
 use Revolution\Bluesky\Core\CBOR;
 use Revolution\Bluesky\Core\CBOR\AtBytes;
 use Revolution\Bluesky\Crypto\K256;
+use Revolution\Bluesky\Crypto\Signature;
 use Revolution\Bluesky\FeedGenerator\ValidateAuth;
 use RuntimeException;
 
@@ -151,6 +152,7 @@ public static function signLabel(UnsignedLabel $unsigned): array
         }
 
         $sign = K256::load($key)->privateKey()->sign($bytes);
+        $sign = Signature::toCompact($sign);
 
         $label = Arr::add($label, 'sig', new AtBytes($sign));
         $label = SignedLabel::fromArray($label);

diff --git a/tests/Feature/Crypto/CryptoTest.php b/tests/Feature/Crypto/CryptoTest.php
@@ -8,6 +8,7 @@
 use Revolution\Bluesky\Crypto\DidKey;
 use Revolution\Bluesky\Crypto\Format\Base58btc;
 use Revolution\Bluesky\Crypto\K256;
+use Revolution\Bluesky\Crypto\Signature;
 use Tests\TestCase;
 
 class CryptoTest extends TestCase
@@ -49,4 +50,14 @@ public function test_did_key_encode(): void
         $this->assertSame('ES256K', $parsed['alg']);
         $this->assertSame($b58key, $b58key2);
     }
+
+    public function test_sig_to_compact(): void
+    {
+        $sk = K256::create()->privateKey();
+
+        $sign = $sk->sign('test');
+
+        $compact = Signature::toCompact($sign);
+        $this->assertSame(64, strlen($compact));
+    }
 }