Fix encoding of local-pw, secret-pw

See paseto-standard/paserk#13
paragonie · Sep 23, 2022 · 168d254 · 168d254
1 parent d2789ba
commit 168d254
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 22 deletions.
diff --git a/tests/KAT/LocalPWTest.php b/tests/KAT/LocalPWTest.php
@@ -8,6 +8,7 @@
 use ParagonIE\Paserk\Types\LocalPW;
 use ParagonIE\Paserk\Tests\KnownAnswers;
 use ParagonIE\Paseto\Exception\InvalidVersionException;
+use ParagonIE\Paseto\Keys\SymmetricKey;
 use ParagonIE\Paseto\Protocol\{
     Version3,
     Version4
@@ -43,7 +44,7 @@ protected function genericTest(ProtocolInterface $version, string $name, array $
     {
         foreach ($tests as $test) {
             $wrapper = new LocalPW(
-                new HiddenString(Hex::encode($test['password'])),
+                new HiddenString($test['password']),
                 $test['options'] ?? [],
                 $version
             );
@@ -55,6 +56,15 @@ protected function genericTest(ProtocolInterface $version, string $name, array $
                 }
                 $this->fail($name . ' > ' . $test['name'] . ': '. $test['comment']);
             }
+            if (empty($test['paserk'])) {
+                var_dump($wrapper->encode(
+                    new SymmetricKey(
+                        Hex::decode($test['unwrapped']),
+                        $version
+                    )
+                ));
+                continue;
+            }
             $unwrapped = $wrapper->decode($test['paserk']);
             $this->assertSame(
                 $test['unwrapped'],

diff --git a/tests/KAT/SecretPWTest.php b/tests/KAT/SecretPWTest.php
@@ -7,6 +7,7 @@
 use ParagonIE\HiddenString\HiddenString;
 use ParagonIE\Paserk\Types\SecretPW;
 use ParagonIE\Paserk\Tests\KnownAnswers;
+use ParagonIE\Paseto\Keys\AsymmetricSecretKey;
 use Throwable;
 use ParagonIE\Paseto\Protocol\{
     Version3,
@@ -40,7 +41,7 @@ protected function genericTest(ProtocolInterface $version, string $name, array $
     {
         foreach ($tests as $test) {
             $wrapper = new SecretPW(
-                new HiddenString(Hex::encode($test['password'])),
+                new HiddenString($test['password']),
                 $test['options'] ?? [],
                 $version
             );
@@ -52,6 +53,15 @@ protected function genericTest(ProtocolInterface $version, string $name, array $
                 }
                 $this->fail($name . ' > ' . $test['name'] . ': '. $test['comment']);
             }
+            if (empty($test['paserk'])) {
+                var_dump($wrapper->encode(
+                    new AsymmetricSecretKey(
+                        Hex::decode($test['unwrapped']),
+                        $version
+                    )
+                ));
+                continue;
+            }
             $unwrapped = $wrapper->decode($test['paserk']);
             if ($version::header() === 'v1') {
                 $this->assertSame(

diff --git a/tests/test-vectors/k3.local-pw.json b/tests/test-vectors/k3.local-pw.json
@@ -5,24 +5,32 @@
       "name": "k3.local-pw-1",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"iterations":  1000},
       "paserk": "k3.local-pw.meWTPJohkeLsaKvlgigDksM935uSCUO3jvjEEHAK28QAAAPoNoLFUMJwo8QHOp5bJpbNzk-ZD_Q6jPtk0XhX4ctVhZnJ3ydru5AuXObwRudmG_RNK3PsJ7kpLSw15Vncc5vmGIkae4DKmBmPI1h3PmOxMGX_hj9DNfu1MIEEm9ukhKQq"
     },
     {
       "name": "k3.local-pw-2",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"iterations":  10000},
       "paserk": "k3.local-pw.BZtl8KfhFR8CCZp6hB0V2yMWttTMpK_U8HiKxnuvMI0AACcQIm4KcJGvG1kfptqCbQxzQUOp72AzgtmhCLVP1mn3orDRJIpoDzRj82dc1cMnANbUsEdcYVG8xzSuCt99zfCjQnQ2rIKbKRM66gafzcSWmD9iMoY3W6KUaN56t0P-ODV2"
     },
+    {
+      "name": "k3.local-pw-3",
+      "expect-fail": false,
+      "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f",
+      "password": "correct horse battery staple",
+      "options": {"iterations":  10000},
+      "paserk": "k3.local-pw.a5cPboLhKgtNb_5C5FXniQuWVgChPXIwM4UKSEAjW3kAACcQzSQgm0Wh87-zAggZvwElhVYI__F7e0nCGL_tVsArrRMpKlkMfZrdi5d7ilpbqogeuiiKcHE9qBu2jTPYywyauZ4VymULdHlGn8fLCBZUGyNzXMbvb0qZS9kecwa4kQzP"
+    },
     {
       "name": "k3.local-pw-fail-1",
       "expect-fail": true,
       "comment": "Incorrect password",
       "unwrapped": null,
-      "password": "correct horse battery staplf",
+      "password": "636f727265637420686f727365206261747465727920737461706c66",
       "options": {"iterations":  10000},
       "paserk": "k3.local-pw.meWTPJohkeLsaKvlgigDksM935uSCUO3jvjEEHAK28QAAAPoNoLFUMJwo8QHOp5bJpbNzk-ZD_Q6jPtk0XhX4ctVhZnJ3ydru5AuXObwRudmG_RNK3PsJ7kpLSw15Vncc5vmGIkae4DKmBmPI1h3PmOxMGX_hj9DNfu1MIEEm9ukhKQq"
     },
@@ -31,7 +39,7 @@
       "expect-fail": true,
       "comment": "Incorrect authentication tag on ciphertext",
       "unwrapped": null,
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"iterations":  10000},
       "paserk": "k3.local-pw.meWTPJohkeLsaKvlgigDksM935uSCUO3jvjEEHAK28QAAAPoNoLFUMJwo8QHOp5bJpbNzk-ZD_Q6jPtk0XhX4ctVhZnJ3ydru5AuXObwRudmG_RNK3PsJ7kpLSw15Vncc5vmGIkae4DKmBmPI1h3PmOxMGX_hj9DNfu1MIEEm1vkhLQr"
     },
@@ -40,7 +48,7 @@
       "expect-fail": true,
       "comment": "Implementations MUST NOT accept a PASERK of the wrong version.",
       "unwrapped": null,
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 67108864, "opslimit": 2},
       "paserk": "k4.local-pw.cyacmXuslYEP8Xyheh9i-AAAAAAQAAAAAAAAAwAAAAEJh5jS-CAQP9grqo6xhuNMwmjcs6yTAvBjOW2HwZyBrBd0NNs6btknqo-6e-tyXJebU5S5918-es1Y9jhF1dOjMW0gDrsWkPoWT3Vy_poNxjIQHxHOHXaa"
     }

diff --git a/tests/test-vectors/k3.secret-pw.json b/tests/test-vectors/k3.secret-pw.json
@@ -5,7 +5,7 @@
       "name": "k3.secret-pw-1",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"iterations": 1000},
       "public-key": "2d2d2d2d2d424547494e205055424c4943204b45592d2d2d2d2d0a4d485977454159484b6f5a497a6a3043415159464b344545414349445967414547706b49495a4b624a667668356a33562b5562416c637174424f58376b424e6c0a69344e757946727974362b6d584c516e4c734567714e6333575a6f4d2f55516e476a4c5554574b6b2b7559597a454d537a32336a45726974455541626e624c420a4d5441432b2b7137344b564a47754e6977454b4448556239726658676a66646e0a2d2d2d2d2d454e44205055424c4943204b45592d2d2d2d2d",
       "paserk": "k3.secret-pw.kgGHkPhCK_nclk8kpCqJuTPM7BYfGxSwdeXETNnRglIAAAPonBRPeN3eNgUEMZAY9mLaQPXmg6zMls48IjN4429EoIyS2No-EGpKv6eRb_Zh65PdEec1pq0SaMWb434A2eqd4vt4_wcTfdobxiNovASIgyry03qnjx29FmuZ2bIvNzh-YExE_AA7UFDzs6BHom8F9Q"
@@ -14,17 +14,26 @@
       "name": "k3.secret-pw-2",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"iterations": 10000},
       "public-key": "2d2d2d2d2d424547494e205055424c4943204b45592d2d2d2d2d0a4d485977454159484b6f5a497a6a3043415159464b344545414349445967414547706b49495a4b624a667668356a33562b5562416c637174424f58376b424e6c0a69344e757946727974362b6d584c516e4c734567714e6333575a6f4d2f55516e476a4c5554574b6b2b7559597a454d537a32336a45726974455541626e624c420a4d5441432b2b7137344b564a47754e6977454b4448556239726658676a66646e0a2d2d2d2d2d454e44205055424c4943204b45592d2d2d2d2d",
       "paserk": "k3.secret-pw.LajP_XFziwwUW8t0xppL3ecIgaOzfSEx-5-UQG36jJ8AACcQUeD46ydUwIkMOqkXWFvacyf_eaH1BTMlJsdCy6ZhemmaFMZTclOD9LrOwCVnmhlCDQEePilxQEfvPsRM5cL_yxx1bWL0wjS4GAQABQiCvGyQTi_LGlbMnYuiZfxWgpqNJpAI6jx71m6s3f6wZIg68Q"
     },
+    {
+      "name": "k3.secret-pw-3",
+      "expect-fail": false,
+      "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
+      "password": "correct horse battery staple",
+      "options": {"iterations": 10000},
+      "public-key": "2d2d2d2d2d424547494e205055424c4943204b45592d2d2d2d2d0a4d485977454159484b6f5a497a6a3043415159464b344545414349445967414547706b49495a4b624a667668356a33562b5562416c637174424f58376b424e6c0a69344e757946727974362b6d584c516e4c734567714e6333575a6f4d2f55516e476a4c5554574b6b2b7559597a454d537a32336a45726974455541626e624c420a4d5441432b2b7137344b564a47754e6977454b4448556239726658676a66646e0a2d2d2d2d2d454e44205055424c4943204b45592d2d2d2d2d",
+      "paserk": "k3.secret-pw._67v-WS5Jcez0HggRU2WqRDQewjO2cTKfLwsv2smSd0AACcQC-kvhegUybh2VVNQ4TU68Uqlg9ZOlPzmT36bpDsFc1vF2Lw5Jg8WRRuX1Bg3KT6GN1sUoAW95iuc2OnyIXNpDKXIA6FRPKkpztCVHiWFhEtiIUeGOg8hh11eueUNz4GmfCH91TNz2KtbAvy1TXT5Lw"
+    },
     {
       "name": "k3.secret-pw-fail-1",
       "expect-fail": true,
       "comment": "Incorrect password",
       "unwrapped": null,
-      "password": "correct horse battery staplf",
+      "password": "636f727265637420686f727365206261747465727920737461706c66",
       "options": {"iterations": 10000},
       "public-key": "2d2d2d2d2d424547494e205055424c4943204b45592d2d2d2d2d0a4d485977454159484b6f5a497a6a3043415159464b344545414349445967414547706b49495a4b624a667668356a33562b5562416c637174424f58376b424e6c0a69344e757946727974362b6d584c516e4c734567714e6333575a6f4d2f55516e476a4c5554574b6b2b7559597a454d537a32336a45726974455541626e624c420a4d5441432b2b7137344b564a47754e6977454b4448556239726658676a66646e0a2d2d2d2d2d454e44205055424c4943204b45592d2d2d2d2d",
       "paserk": "k3.secret-pw.LajP_XFziwwUW8t0xppL3ecIgaOzfSEx-5-UQG36jJ8AACcQUeD46ydUwIkMOqkXWFvacyf_eaH1BTMlJsdCy6ZhemmaFMZTclOD9LrOwCVnmhlCDQEePilxQEfvPsRM5cL_yxx1bWL0wjS4GAQABQiCvGyQTi_LGlbMnYuiZfxWgpqNJpAI6jx71m6s3f6wZIg68Q"
@@ -34,7 +43,7 @@
       "expect-fail": true,
       "comment": "Incorrect authentication tag on ciphertext",
       "unwrapped": null,
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"iterations": 10000},
       "public-key": "2d2d2d2d2d424547494e205055424c4943204b45592d2d2d2d2d0a4d485977454159484b6f5a497a6a3043415159464b344545414349445967414547706b49495a4b624a667668356a33562b5562416c637174424f58376b424e6c0a69344e757946727974362b6d584c516e4c734567714e6333575a6f4d2f55516e476a4c5554574b6b2b7559597a454d537a32336a45726974455541626e624c420a4d5441432b2b7137344b564a47754e6977454b4448556239726658676a66646e0a2d2d2d2d2d454e44205055424c4943204b45592d2d2d2d2d",
       "paserk": "k3.secret-pw.LajP_XFziwwUW8t0xppL3ecIgaOzfSEx-5-UQG36jJ8AACcQUeD46ydUwIkMOqkXWFvacyf_eaH1BTMlJsdCy6ZhemmaFMZTclOD9LrOwCVnmhlCDQEePilxQEfvPsRM5cL_yxx1bWL0wjS4GAQABQiCvGyQTi_LGlbMnYuiZfxWgpqNJpAI6jx71m6s4f6wZIg79R"
@@ -44,7 +53,7 @@
       "expect-fail": true,
       "comment": "Implementations MUST NOT accept a PASERK of the wrong version.",
       "unwrapped": null,
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k4.secret-pw.1n54ImYiJUSDhTn7vzBI4QAAAAAQAAAAAAAAAwAAAAFBZythnpR02Zza64_y9DuKHeyZVEP_vZx0Y721aIry1rZc70cR08Jb2rgV4pcqR9in25TvA4pV7L4kT3r-0b-5a8Z7wk35D0zOnPLEJloAHf2XEYGleFReV2-tiV1T79G6OhlATgd-bJbXjRqlEOCsk_-pRdSsCeE"
     }

diff --git a/tests/test-vectors/k4.local-pw.json b/tests/test-vectors/k4.local-pw.json
@@ -5,24 +5,32 @@
       "name": "k4.local-pw-1",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 67108864, "opslimit": 2},
       "paserk": "k4.local-pw.9VvzoqE_i23NOqsP9xoijQAAAAAEAAAAAAAAAgAAAAG_uxDZC-NsYyOW8OUOqISJqgHN8xIfAXiPfmFTfB4GPidUzm4aKzMGJmZtRPeyZCV11MxEJS3VMIRHXxYsfUQsmWLALpFwqUhxZdk_ymFcK2Nk0-N7CVp-"
     },
     {
       "name": "k4.local-pw-2",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k4.local-pw.cyacmXuslYEP8Xyheh9i-AAAAAAQAAAAAAAAAwAAAAEJh5jS-CAQP9grqo6xhuNMwmjcs6yTAvBjOW2HwZyBrBd0NNs6btknqo-6e-tyXJebU5S5918-es1Y9jhF1dOjMW0gDrsWkPoWT3Vy_poNxjIQHxHOHXaa"
     },
+    {
+      "name": "k4.local-pw-3",
+      "expect-fail": false,
+      "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f",
+      "password": "correct horse battery staple",
+      "options": {"memlimit": 268435456, "opslimit": 3},
+      "paserk": "k4.local-pw.1zXpYe7LSsL95YKf92kkJAAAAAAQAAAAAAAAAwAAAAG9WUsB_V2gVnTE1cCAs7RrS9-j22y2rcNixSycUw4_cryOPztPM8vASZw_BYHlQHxXqCl7wBS9NkUnMLa6b8e3ZNeaGiqaGFxRpmOK1Hal4GpHys6lC2Jw"
+    },
     {
       "name": "k4.local-pw-fail-1",
       "expect-fail": true,
       "comment": "Incorrect password",
       "unwrapped": null,
-      "password": "correct horse battery staplf",
+      "password": "636f727265637420686f727365206261747465727920737461706c66",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k4.local-pw.cyacmXuslYEP8Xyheh9i-AAAAAAQAAAAAAAAAwAAAAEJh5jS-CAQP9grqo6xhuNMwmjcs6yTAvBjOW2HwZyBrBd0NNs6btknqo-6e-tyXJebU5S5918-es1Y9jhF1dOjMW0gDrsWkPoWT3Vy_poNxjIQHxHOHXaa"
     },
@@ -31,7 +39,7 @@
       "expect-fail": true,
       "comment": "Incorrect authentication tag on ciphertext",
       "unwrapped": null,
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k4.local-pw.cyacmXuslYEP8Xyheh9i-AAAAAAQAAAAAAAAAwAAAAEJh5jS-CAQP9grqo6xhuNMwmjcs6yTAvBjOW2HwZyBrBd0NNs6btknqo-6e-tyXJebU5S5918-es1Y9jhF1dOjMW0gDrsWkPoWT3Vy_poNxjIQHyHOHXbb"
     },
@@ -40,7 +48,7 @@
       "expect-fail": true,
       "comment": "Implementations MUST NOT accept a PASERK of the wrong version.",
       "unwrapped": null,
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"iterations":  10000},
       "paserk": "k3.local-pw.BZtl8KfhFR8CCZp6hB0V2yMWttTMpK_U8HiKxnuvMI0AACcQIm4KcJGvG1kfptqCbQxzQUOp72AzgtmhCLVP1mn3orDRJIpoDzRj82dc1cMnANbUsEdcYVG8xzSuCt99zfCjQnQ2rIKbKRM66gafzcSWmD9iMoY3W6KUaN56t0P-ODV2"
     }

diff --git a/tests/test-vectors/k4.secret-pw.json b/tests/test-vectors/k4.secret-pw.json
@@ -5,24 +5,32 @@
       "name": "k4.secret-pw-1",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f1ce56a48c82ff99162a14bc544612674e5d61fb9317e65d4055780fdbcb4dc35",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 67108864, "opslimit": 2},
       "paserk": "k4.secret-pw.g5CZn27bLJQkPVOYjrWEQAAAAAAEAAAAAAAAAgAAAAGpohE13nAyCtWfj2Xf3rgORRrE1X0qw2U1FWSJm_6snSbneAqz59FTgsmUR2cNmC41rauCVViAEijox_mY4iJzIUOv34cHkLLIZ_te-FpqKDK0bFtH-rgdFkiy-RjCG0EN349NFFqCZHu7gOlQw98nyeRwWelHCJE"
     },
     {
       "name": "k4.secret-pw-2",
       "expect-fail": false,
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f1ce56a48c82ff99162a14bc544612674e5d61fb9317e65d4055780fdbcb4dc35",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k4.secret-pw.1n54ImYiJUSDhTn7vzBI4QAAAAAQAAAAAAAAAwAAAAFBZythnpR02Zza64_y9DuKHeyZVEP_vZx0Y721aIry1rZc70cR08Jb2rgV4pcqR9in25TvA4pV7L4kT3r-0b-5a8Z7wk35D0zOnPLEJloAHf2XEYGleFReV2-tiV1T79G6OhlATgd-bJbXjRqlEOCsk_-pRdSsCeE"
     },
+    {
+      "name": "k4.secret-pw-3",
+      "expect-fail": false,
+      "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f1ce56a48c82ff99162a14bc544612674e5d61fb9317e65d4055780fdbcb4dc35",
+      "password": "correct horse battery staple",
+      "options": {"memlimit": 268435456, "opslimit": 3},
+      "paserk": "k4.secret-pw.l7bNRB3P5Pwp2FN11-O5dgAAAAAQAAAAAAAAAwAAAAGMe2vxUAZ5quIB-7KCN6_zP_rFqqPmgaVI8ut4xvM2QZQ7QNpr4MlmZ52UulTstEf0uT8vyWzn7bthOALA2ZH_0iBiG9pPWqD8UzmuUjUP5Yi92B_5pUw3DJ0vwNP-GgvjHQObQXLsWPfe_exECoYAWdkI6q-VtSM"
+    },
     {
       "name": "k4.secret-pw-fail-1",
       "expect-fail": true,
       "comment": "Incorrect password",
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f1ce56a48c82ff99162a14bc544612674e5d61fb9317e65d4055780fdbcb4dc35",
-      "password": "correct horse battery staplf",
+      "password": "636f727265637420686f727365206261747465727920737461706c66",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k4.secret-pw.1n54ImYiJUSDhTn7vzBI4QAAAAAQAAAAAAAAAwAAAAFBZythnpR02Zza64_y9DuKHeyZVEP_vZx0Y721aIry1rZc70cR08Jb2rgV4pcqR9in25TvA4pV7L4kT3r-0b-5a8Z7wk35D0zOnPLEJloAHf2XEYGleFReV2-tiV1T79G6OhlATgd-bJbXjRqlEOCsk_-pRdSsCeE"
     },
@@ -31,7 +39,7 @@
       "expect-fail": true,
       "comment": "Incorrect authentication tag on ciphertext",
       "unwrapped": "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f1ce56a48c82ff99162a14bc544612674e5d61fb9317e65d4055780fdbcb4dc35",
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k4.secret-pw.1n54ImYiJUSDhTn7vzBI4QAAAAAQAAAAAAAAAwAAAAFBZythnpR02Zza64_y9DuKHeyZVEP_vZx0Y721aIry1rZc70cR08Jb2rgV4pcqR9in25TvA4pV7L4kT3r-0b-5a8Z7wk35D0zOnPLEJloAHf2XEYGleFReV2-tiV1T79G6OhlATgd-bJbXjRqlEOCsk_-qRdStDfF"
     },
@@ -40,7 +48,7 @@
       "expect-fail": true,
       "comment": "Implementations MUST NOT accept a PASERK of the wrong version.",
       "unwrapped": null,
-      "password": "correct horse battery staple",
+      "password": "636f727265637420686f727365206261747465727920737461706c65",
       "options": {"memlimit": 268435456, "opslimit": 3},
       "paserk": "k3.secret-pw.LajP_XFziwwUW8t0xppL3ecIgaOzfSEx-5-UQG36jJ8AACcQUeD46ydUwIkMOqkXWFvacyf_eaH1BTMlJsdCy6ZhemmaFMZTclOD9LrOwCVnmhlCDQEePilxQEfvPsRM5cL_yxx1bWL0wjS4GAQABQiCvGyQTi_LGlbMnYuiZfxWgpqNJpAI6jx71m6s3f6wZIg68Q"
     }