From 6acd6d42d4f5ce0e6d35a1a201a77d80d857740d Mon Sep 17 00:00:00 2001 From: Filip Skokan Date: Sun, 17 Mar 2019 17:55:55 +0100 Subject: [PATCH] style: alg containers --- lib/jwk/key/ec.js | 8 ++------ lib/jwk/key/oct.js | 32 ++++---------------------------- lib/jwk/key/rsa.js | 8 +++----- 3 files changed, 9 insertions(+), 39 deletions(-) diff --git a/lib/jwk/key/ec.js b/lib/jwk/key/ec.js index 8ba821c7b3..7d9ca928e9 100644 --- a/lib/jwk/key/ec.js +++ b/lib/jwk/key/ec.js @@ -6,12 +6,8 @@ const { THUMBPRINT_MATERIAL, PUBLIC_MEMBERS, PRIVATE_MEMBERS, JWK_MEMBERS } = re const Key = require('./base') const generateKeyPair = promisify(async) -const WRAP_ALGS = new Set([ - 'ECDH-ES', - 'ECDH-ES+A128KW', - 'ECDH-ES+A192KW', - 'ECDH-ES+A256KW' -]) + +const WRAP_ALGS = ['ECDH-ES', 'ECDH-ES+A128KW', 'ECDH-ES+A192KW', 'ECDH-ES+A256KW'] const EC_PUBLIC = new Set(['crv', 'x', 'y']) Object.freeze(EC_PUBLIC) diff --git a/lib/jwk/key/oct.js b/lib/jwk/key/oct.js index ab0af732fa..31a7a9bd75 100644 --- a/lib/jwk/key/oct.js +++ b/lib/jwk/key/oct.js @@ -6,35 +6,11 @@ const { THUMBPRINT_MATERIAL, PUBLIC_MEMBERS, PRIVATE_MEMBERS } = require('../../ const Key = require('./base') -const SIG_ALGS = new Set([ - 'HS256', - 'HS384', - 'HS512' -]) - -const ENC_LEN = new Set([ - 128, - 192, - 256, - 384, - 512 -]) - -const ENC_ALGS = new Set([ - 'A128CBC-HS256', - 'A128GCM', - 'A192CBC-HS384', - 'A192GCM', - 'A256CBC-HS512', - 'A256GCM' -]) - +const ENC_ALGS = new Set(['A128CBC-HS256', 'A128GCM', 'A192CBC-HS384', 'A192GCM', 'A256CBC-HS512', 'A256GCM']) +const ENC_LEN = new Set([128, 192, 256, 384, 512]) const PBES2 = ['PBES2-HS256+A128KW', 'PBES2-HS384+A192KW', 'PBES2-HS512+A256KW'] -const WRAP_LEN = new Set([ - 128, - 192, - 256 -]) +const SIG_ALGS = ['HS256', 'HS384', 'HS512'] +const WRAP_LEN = new Set([128, 192, 256]) const OCT_PUBLIC = new Set() Object.freeze(OCT_PUBLIC) diff --git a/lib/jwk/key/rsa.js b/lib/jwk/key/rsa.js index 79e510aab5..a6df0ad5cd 100644 --- a/lib/jwk/key/rsa.js +++ b/lib/jwk/key/rsa.js @@ -7,10 +7,8 @@ const Key = require('./base') const generateKeyPair = promisify(async) -const WRAP_ALGS = new Set([ - 'RSA-OAEP', - 'RSA1_5' -]) +const SIG_ALGS = ['PS256', 'RS256', 'PS384', 'RS384', 'PS512', 'RS512'] +const WRAP_ALGS = ['RSA-OAEP', 'RSA1_5'] const RSA_PUBLIC = new Set(['e', 'n']) Object.freeze(RSA_PUBLIC) @@ -20,7 +18,7 @@ Object.freeze(RSA_PRIVATE) const sigAlgsAvailableFor = (length) => { switch (true) { case length >= 1040: - return new Set(['PS256', 'RS256', 'PS384', 'RS384', 'PS512', 'RS512']) + return new Set(SIG_ALGS) case length >= 784: return new Set(['PS256', 'RS256', 'PS384', 'RS384', 'RS512']) case length >= 752: