WIP

Signed-off-by: Nguyen Van Nguyen <nguyennv1981@gmail.com>
web-of-trust · Nov 5, 2024 · dbefd70 · dbefd70
1 parent 76af13a
commit dbefd70
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/src/Enum/KeyAlgorithm.php b/src/Enum/KeyAlgorithm.php
@@ -8,6 +8,8 @@
 
 namespace OpenPGP\Enum;
 
+use OpenPGP\Common\Config;
+
 /**
  * Key algorithm enum
  *
@@ -139,4 +141,23 @@ public function forEncryption(): bool
             default => true,
         };
     }
+
+    /**
+     * Get key version
+     *
+     * @return int
+     */
+    public function keyVersion(): int
+    {
+        return match ($this) {
+            self::X25519,
+            self::X448,
+            self::Ed25519,
+            self::Ed448
+                => KeyVersion::V6->value,
+            default => Config::useV6Key()
+                ? KeyVersion::V6->value
+                : KeyVersion::V4->value,
+        };
+    }
 }
diff --git a/src/Packet/SecretKey.php b/src/Packet/SecretKey.php
@@ -133,19 +133,9 @@ public static function generate(
             $rsaKeySize,
             $curve
         );
-        $version = match ($keyAlgorithm) {
-            KeyAlgorithm::X25519,
-            KeyAlgorithm::X448,
-            KeyAlgorithm::Ed25519,
-            KeyAlgorithm::Ed448
-                => KeyVersion::V6->value,
-            default => Config::useV6Key()
-                ? KeyVersion::V6->value
-                : KeyVersion::V4->value,
-        };
         return new self(
             new PublicKey(
-                $version,
+                $keyAlgorithm->keyVersion(),
                 $time ?? new \DateTime(),
                 $keyAlgorithm,
                 $keyMaterial->getPublicMaterial()

diff --git a/src/Packet/SecretSubkey.php b/src/Packet/SecretSubkey.php
@@ -14,7 +14,6 @@
     AeadAlgorithm,
     Ecc,
     KeyAlgorithm,
-    KeyVersion,
     RSAKeySize,
     S2kUsage,
     SymmetricAlgorithm
@@ -112,19 +111,9 @@ public static function generate(
         $keyMaterial = self::generateKeyMaterial(
             $keyAlgorithm, $rsaKeySize, $curve
         );
-        $version = match ($keyAlgorithm) {
-            KeyAlgorithm::X25519,
-            KeyAlgorithm::X448,
-            KeyAlgorithm::Ed25519,
-            KeyAlgorithm::Ed448
-                => KeyVersion::V6->value,
-            default => Config::useV6Key()
-                ? KeyVersion::V6->value
-                : KeyVersion::V4->value,
-        };
         return new self(
             new PublicSubkey(
-                $version,
+                $keyAlgorithm->keyVersion(),
                 $time ?? new \DateTime(),
                 $keyAlgorithm,
                 $keyMaterial->getPublicMaterial()