From c4bbf34a5e865bb74e3709aa6be1aad1e5b4505a Mon Sep 17 00:00:00 2001
From: Justin Wind <justin.wind+git@gmail.com>
Date: Sat, 4 Mar 2023 11:25:34 -0800
Subject: [PATCH] eslint cleanups

---
 lib/version-parameters.js | 48 ++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/lib/version-parameters.js b/lib/version-parameters.js
index 9af7d49..5f449a7 100644
--- a/lib/version-parameters.js
+++ b/lib/version-parameters.js
@@ -1,5 +1,17 @@
 'use strict';
 
+const ALG = {
+  AES_256_GCM: 'aes-256-gcm',
+  CHACHA20_POLY1305: 'chacha20-poly1305',
+  XCHACHA20_POLY1305: 'xchacha20-poly1305',
+};
+
+const KD = {
+  SCRYPT: 'scrypt',
+  SHAKE256: 'shake256',
+  BLAKE2B512: 'blake2b512',
+};
+
 /**
  * Supported packings/cipher types.
  * To be useful, any cipher included here must be Authenticated Encryption with Additional Data (AEAD).
@@ -8,19 +20,19 @@
 const allVersions = {
   1: {
     version: 1,
-    algorithm: 'aes-256-gcm',
+    algorithm: ALG.AES_256_GCM,
     algOptions: {},
     versionBytes: 1,
     flagsBytes: 1,
     ivBytes: 12,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'scrypt',
+    keyDeriver: KD.SCRYPT,
     keyBytes: 32,
   },
   2: {
     version: 2,
-    algorithm: 'chacha20-poly1305', // Prefer this over NIST because we stan djb
+    algorithm: ALG.CHACHA20_POLY1305, // Prefer this over NIST because we stan djb
     algOptions: {
       authTagLength: 16,
     },
@@ -29,12 +41,12 @@ const allVersions = {
     ivBytes: 12,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'scrypt',
+    keyDeriver: KD.SCRYPT,
     keyBytes: 32,
   },
   3: {
     version: 3,
-    algorithm: 'xchacha20-poly1305', // Not yet available, but would prefer even more...
+    algorithm: ALG.XCHACHA20_POLY1305, // Not yet available, but would prefer even more...
     algOptions: {
       authTagLength: 16,
     },
@@ -43,24 +55,24 @@ const allVersions = {
     ivBytes: 24,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'scrypt',
+    keyDeriver: KD.SCRYPT,
     keyBytes: 32,
   },
   4: {
     version: 4,
-    algorithm: 'aes-256-gcm',
+    algorithm: ALG.AES_256_GCM,
     algOptions: {},
     versionBytes: 1,
     flagsBytes: 1,
     ivBytes: 12,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'shake256',
+    keyDeriver: KD.SHAKE256,
     keyBytes: 32,
   },
   5: {
     version: 5,
-    algorithm: 'chacha20-poly1305',
+    algorithm: ALG.CHACHA20_POLY1305,
     algOptions: {
       authTagLength: 16,
     },
@@ -69,12 +81,12 @@ const allVersions = {
     ivBytes: 12,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'shake256',
+    keyDeriver: KD.SHAKE256,
     keyBytes: 32,
   },
   6: {
     version: 6,
-    algorithm: 'xchacha20-poly1305', // Not yet available, but would prefer even more...
+    algorithm: ALG.XCHACHA20_POLY1305, // Not yet available, but would prefer even more...
     algOptions: {
       authTagLength: 16,
     },
@@ -83,24 +95,24 @@ const allVersions = {
     ivBytes: 24,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'shake256',
+    keyDeriver: KD.SHAKE256,
     keyBytes: 32,
   },
   7: {
     version: 7,
-    algorithm: 'aes-256-gcm',
+    algorithm: ALG.AES_256_GCM,
     algOptions: {},
     versionBytes: 1,
     flagsBytes: 1,
     ivBytes: 12,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'blake2b512',
+    keyDeriver: KD.BLAKE2B512,
     keyBytes: 32,
   },
   8: {
     version: 8,
-    algorithm: 'chacha20-poly1305',
+    algorithm: ALG.CHACHA20_POLY1305,
     algOptions: {
       authTagLength: 16,
     },
@@ -109,12 +121,12 @@ const allVersions = {
     ivBytes: 12,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'blake2b512',
+    keyDeriver: KD.BLAKE2B512,
     keyBytes: 32,
   },
   9: {
     version: 9,
-    algorithm: 'xchacha20-poly1305', // Not yet available, but would prefer even more...
+    algorithm: ALG.XCHACHA20_POLY1305, // Not yet available, but would prefer even more...
     algOptions: {
       authTagLength: 16,
     },
@@ -123,7 +135,7 @@ const allVersions = {
     ivBytes: 24,
     saltBytes: 16,
     tagBytes: 16,
-    keyDeriver: 'blake2b512',
+    keyDeriver: KD.BLAKE2B512,
     keyBytes: 32,
   },
 };
-- 
2.45.2