WIP

Signed-off-by: Nguyen Van Nguyen <[email protected]>
web-of-trust · Aug 23, 2024 · 042749d · 042749d
1 parent 27858e1
commit 042749d
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Packet/Key/ECDHSecretKeyMaterial.php b/src/Packet/Key/ECDHSecretKeyMaterial.php
@@ -25,6 +25,8 @@
  */
 class ECDHSecretKeyMaterial extends ECSecretKeyMaterial
 {
+    const CURVE25519_KEY_LENGTH  = 32;
+
     /**
      * Read key material from bytes
      *
@@ -50,16 +52,19 @@ public static function fromBytes(
     public static function generate(CurveOid $curveOid): self
     {
         if ($curveOid !== CurveOid::Ed25519) {
-            $privateKey = EC::createKey($curveOid->name);
             if ($curveOid === CurveOid::Curve25519) {
-                $d = Helper::bin2BigInt(
-                    strrev($privateKey->toString('MontgomeryPrivate'))
-                );
+                do {
+                    $privateKey = EC::createKey($curveOid->name);
+                    $d = Helper::bin2BigInt(
+                        strrev($privateKey->toString('MontgomeryPrivate'))
+                    );
+                } while ($d->getLengthInBytes() !== self::CURVE25519_KEY_LENGTH);
                 $q = Helper::bin2BigInt(
                     "\x40" . $privateKey->getEncodedCoordinates()
                 );
             }
             else {
+                $privateKey = EC::createKey($curveOid->name);
                 $params = PKCS8::load($privateKey->toString('PKCS8'));
                 $d = $params['dA'];
                 $q = Helper::bin2BigInt(