WIP

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

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/Enum/KeyAlgorithm.php b/src/Enum/KeyAlgorithm.php
@@ -150,11 +150,8 @@ public function forEncryption(): bool
     public function keyVersion(): int
     {
         return match ($this) {
-            self::X25519,
-            self::X448,
-            self::Ed25519,
-            self::Ed448
-                => KeyVersion::V6->value,
+            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/PublicKey.php b/src/Packet/PublicKey.php
@@ -70,7 +70,10 @@ public function __construct(
                 ? PacketTag::PublicSubkey
                 : PacketTag::PublicKey
         );
-        if ($version !== KeyVersion::V4->value && $version !== KeyVersion::V6->value) {
+        if (
+            $version !== KeyVersion::V4->value &&
+            $version !== KeyVersion::V6->value
+        ) {
             throw new \InvalidArgumentException(
                 "Version {$version} of the key packet is unsupported."
             );

diff --git a/src/Packet/SecretSubkey.php b/src/Packet/SecretSubkey.php
@@ -109,7 +109,9 @@ public static function generate(
         ?DateTimeInterface $time = null
     ): self {
         $keyMaterial = self::generateKeyMaterial(
-            $keyAlgorithm, $rsaKeySize, $curve
+            $keyAlgorithm,
+            $rsaKeySize,
+            $curve
         );
         return new self(
             new PublicSubkey(
@@ -132,12 +134,18 @@ public function encrypt(
         ?AeadAlgorithm $aead = null
     ): self {
         if ($this->isDecrypted()) {
-            [$encrypted, $iv, $s2k] = $this->encryptKeyMaterial($passphrase, $symmetric, $aead);
+            [$encrypted, $iv, $s2k] = $this->encryptKeyMaterial(
+                $passphrase,
+                $symmetric,
+                $aead
+            );
             return new self(
                 $this->getPublicKey(),
                 $encrypted,
                 $this->getKeyMaterial(),
-                $aead instanceof AeadAlgorithm ? S2kUsage::AeadProtect : S2kUsage::Cfb,
+                $aead instanceof AeadAlgorithm
+                    ? S2kUsage::AeadProtect
+                    : S2kUsage::Cfb,
                 $symmetric,
                 $s2k,
                 $aead,