feat: add password-hash command

Author: zdm

lib/commands/generate.js

@@ -31,10 +31,10 @@ export default class extends Command {
                     "title": "Encrypt / decrypt data with SSH private key",
                     "module": () => new URL( "generate/ssh.js", import.meta.url ),
                 },
-                "argon2": {
-                    "short": "a",
-                    "title": "Create / verify agron2 hash",
-                    "module": () => new URL( "generate/argon2.js", import.meta.url ),
+                "password-hash": {
+                    "short": "h",
+                    "title": "Create / verify password hash",
+                    "module": () => new URL( "generate/password-hash.js", import.meta.url ),
                 },
             },
         };

lib/commands/generate/argon2.js lib/commands/generate/password-hash.jslib/commands/generate/argon2.js renamed to lib/commands/generate/password-hash.js

@@ -8,13 +8,13 @@ export default class extends Command {
             "commands": {
                 "create": {
                     "short": "c",
-                    "title": "Create argon2 hash",
-                    "module": () => new URL( "argon2/create.js", import.meta.url ),
+                    "title": "Create password hash",
+                    "module": () => new URL( "password-hash/create.js", import.meta.url ),
                 },
                 "verify": {
                     "short": "v",
-                    "title": "Verify argon2 hash",
-                    "module": () => new URL( "argon2/verify.js", import.meta.url ),
+                    "title": "Verify password hash",
+                    "module": () => new URL( "password-hash/verify.js", import.meta.url ),
                 },
             },
         };

lib/commands/generate/argon2/create.js …ommands/generate/password-hash/create.jslib/commands/generate/argon2/create.js renamed to lib/commands/generate/password-hash/create.js lib/commands/generate/argon2/create.js renamed to lib/commands/generate/password-hash/create.js

@@ -1,4 +1,4 @@
-import Argon2 from "#core/argon2";
+import PasswordHash from "#core/crypto/password-hash";
 import Command from "#lib/command";
 
 export default class extends Command {
@@ -9,43 +9,53 @@ export default class extends Command {
             "options": {
                 "preset": {
                     "short": "P",
-                    "description": "Argon2 preset.",
-                    "default": Argon2.defaultPreset,
-                    "schema": { "enum": Object.keys( Argon2.presets ) },
-                },
-                "id": {
-                    "short": "i",
-                    "description": "Argon2 algorithm id.",
-                    "schema": { "enum": [ "argon2d", "argon2i", "argon2id" ] },
+                    "description": "Preset.",
+                    "default": PasswordHash.defaultPreset,
+                    "schema": { "enum": Object.keys( PasswordHash.presets ) },
                 },
                 "argon2-version": {
                     "short": "v",
-                    "description": "Argon2 algorithm version.",
+                    "description": "(argon2) Algorithm version.",
                     "schema": { "enum": [ 16, 19 ] },
                 },
                 "memory-cost": {
                     "short": "m",
-                    "description": "Argon2 memory cost parameter in KiB.",
+                    "description": "(argon2) Memory cost parameter in KiB.",
                     "schema": { "type": "integer", "minimum": 1, "maximum": 2 ** 32 - 1 },
                 },
                 "time-cost": {
                     "short": "t",
-                    "description": "Argon2 time cost parameter.",
+                    "description": "(argon2) Time cost parameter.",
                     "schema": { "type": "integer", "minimum": 1, "maximum": 2 ** 32 - 1 },
                 },
                 "parallelism": {
                     "short": "p",
-                    "description": "Argon2 parallelism parameter.",
+                    "description": "(argon2, scrypt) Parallelism parameter.",
                     "schema": { "type": "integer", "minimum": 1, "maximum": 255 },
                 },
+                "cost": {
+                    "short": "c",
+                    "description": "(scrypt) Cost parameter.",
+                    "schema": { "type": "integer", "minimum": 2 },
+                },
+                "block-size": {
+                    "short": "b",
+                    "description": "(scrypt) Block size parameter.",
+                    "schema": { "type": "integer", "minimum": 2 },
+                },
+                "iterations": {
+                    "short": "i",
+                    "description": "(pbkdf2) Iterations parameter.",
+                    "schema": { "type": "integer", "minimum": 1 },
+                },
                 "salt-length": {
                     "short": "s",
-                    "description": "Argon2 salt length.",
+                    "description": "Salt length.",
                     "schema": { "type": "integer", "minimum": 8, "maximum": 48 },
                 },
                 "hash-length": {
                     "short": "h",
-                    "description": "Argon2 hash length.",
+                    "description": "Hash length.",
                     "schema": { "type": "integer", "minimum": 12, "maximum": 64 },
                 },
             },
@@ -61,18 +71,20 @@ export default class extends Command {
 
     // public
     async run () {
-        const argon2 = new Argon2( {
+        const passwordHash = new PasswordHash( {
                 "preset": process.cli.options.preset,
-                "id": process.cli.options.id,
                 "version": process.cli.options[ "argon2-version" ],
                 "memoryCost": process.cli.options[ "memory-cost" ],
                 "timeCost": process.cli.options[ "time-cost" ],
                 "parallelism": process.cli.options[ "parallelism" ],
+                "cost": process.cli.options[ "cost" ],
+                "blockSize": process.cli.options[ "block-size" ],
+                "iterations": process.cli.options[ "iterations" ],
                 "saltLength": process.cli.options[ "salt-length" ],
                 "hashLength": process.cli.options[ "hash-length" ],
             } ),
-            hash = await argon2.createHash( process.cli.arguments.password );
+            hash = await passwordHash.createHash( process.cli.arguments.password );
 
-        console.log( hash );
+        console.log( hash.phc );
     }
 }