test: split JWK async elliptic curve keygen tests

PR-URL: #49221
Refs: #49202
Refs: #41206
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

Author: joyeecheung

test/parallel/test-crypto-keygen-async-elliptic-curve-jwk-ec.js

@@ -0,0 +1,35 @@
+'use strict';
+
+constcommon=require('../common');
+if(!common.hasCrypto)
+common.skip('missing crypto');
+
+constassert=require('assert');
+const{
+ generateKeyPair,
+}=require('crypto');
+
+// Test async elliptic curve key generation with 'jwk' encoding and named
+// curve.
+['P-384','P-256','P-521','secp256k1'].forEach((curve)=>{
+generateKeyPair('ec',{
+namedCurve: curve,
+publicKeyEncoding: {
+format: 'jwk'
+},
+privateKeyEncoding: {
+format: 'jwk'
+}
+},common.mustSucceed((publicKey,privateKey)=>{
+assert.strictEqual(typeofpublicKey,'object');
+assert.strictEqual(typeofprivateKey,'object');
+assert.strictEqual(publicKey.x,privateKey.x);
+assert.strictEqual(publicKey.y,privateKey.y);
+assert(!publicKey.d);
+assert(privateKey.d);
+assert.strictEqual(publicKey.kty,'EC');
+assert.strictEqual(publicKey.kty,privateKey.kty);
+assert.strictEqual(publicKey.crv,curve);
+assert.strictEqual(publicKey.crv,privateKey.crv);
+}));
+});

test/parallel/test-crypto-keygen-async-elliptic-curve-jwk-rsa.js

@@ -0,0 +1,38 @@
+'use strict';
+
+constcommon=require('../common');
+if(!common.hasCrypto)
+common.skip('missing crypto');
+
+constassert=require('assert');
+const{
+ generateKeyPair,
+}=require('crypto');
+
+// Test async elliptic curve key generation with 'jwk' encoding and RSA.
+{
+generateKeyPair('rsa',{
+modulusLength: 4096,
+publicKeyEncoding: {
+format: 'jwk'
+},
+privateKeyEncoding: {
+format: 'jwk'
+}
+},common.mustSucceed((publicKey,privateKey)=>{
+assert.strictEqual(typeofpublicKey,'object');
+assert.strictEqual(typeofprivateKey,'object');
+assert.strictEqual(publicKey.kty,'RSA');
+assert.strictEqual(publicKey.kty,privateKey.kty);
+assert.strictEqual(typeofpublicKey.n,'string');
+assert.strictEqual(publicKey.n,privateKey.n);
+assert.strictEqual(typeofpublicKey.e,'string');
+assert.strictEqual(publicKey.e,privateKey.e);
+assert.strictEqual(typeofprivateKey.d,'string');
+assert.strictEqual(typeofprivateKey.p,'string');
+assert.strictEqual(typeofprivateKey.q,'string');
+assert.strictEqual(typeofprivateKey.dp,'string');
+assert.strictEqual(typeofprivateKey.dq,'string');
+assert.strictEqual(typeofprivateKey.qi,'string');
+}));
+}

test/parallel/test-crypto-keygen-async-elliptic-curve-jwk.js

@@ -9,92 +9,32 @@ const {
  generateKeyPair,
 }=require('crypto');
 
-// Test async elliptic curve key generation with 'jwk' encoding
+// Test async elliptic curve key generation with 'jwk' encoding.
 {
 [
-['ec',['P-384','P-256','P-521','secp256k1']],
-['rsa'],
-['ed25519'],
-['ed448'],
-['x25519'],
-['x448'],
-].forEach((types)=>{
-const[type,options]=types;
-switch(type){
-case'ec': {
-returnoptions.forEach((curve)=>{
-generateKeyPair(type,{
-namedCurve: curve,
-publicKeyEncoding: {
-format: 'jwk'
-},
-privateKeyEncoding: {
-format: 'jwk'
-}
-},common.mustSucceed((publicKey,privateKey)=>{
-assert.strictEqual(typeofpublicKey,'object');
-assert.strictEqual(typeofprivateKey,'object');
-assert.strictEqual(publicKey.x,privateKey.x);
-assert.strictEqual(publicKey.y,privateKey.y);
-assert(!publicKey.d);
-assert(privateKey.d);
-assert.strictEqual(publicKey.kty,'EC');
-assert.strictEqual(publicKey.kty,privateKey.kty);
-assert.strictEqual(publicKey.crv,curve);
-assert.strictEqual(publicKey.crv,privateKey.crv);
-}));
-});
+'ed25519',
+'ed448',
+'x25519',
+'x448',
+].forEach((type)=>{
+generateKeyPair(type,{
+publicKeyEncoding: {
+format: 'jwk'
+},
+privateKeyEncoding: {
+format: 'jwk'
 }
-case'rsa': {
-returngenerateKeyPair(type,{
-modulusLength: 4096,
-publicKeyEncoding: {
-format: 'jwk'
-},
-privateKeyEncoding: {
-format: 'jwk'
-}
-},common.mustSucceed((publicKey,privateKey)=>{
-assert.strictEqual(typeofpublicKey,'object');
-assert.strictEqual(typeofprivateKey,'object');
-assert.strictEqual(publicKey.kty,'RSA');
-assert.strictEqual(publicKey.kty,privateKey.kty);
-assert.strictEqual(typeofpublicKey.n,'string');
-assert.strictEqual(publicKey.n,privateKey.n);
-assert.strictEqual(typeofpublicKey.e,'string');
-assert.strictEqual(publicKey.e,privateKey.e);
-assert.strictEqual(typeofprivateKey.d,'string');
-assert.strictEqual(typeofprivateKey.p,'string');
-assert.strictEqual(typeofprivateKey.q,'string');
-assert.strictEqual(typeofprivateKey.dp,'string');
-assert.strictEqual(typeofprivateKey.dq,'string');
-assert.strictEqual(typeofprivateKey.qi,'string');
-}));
-}
-case'ed25519':
-case'ed448':
-case'x25519':
-case'x448': {
-generateKeyPair(type,{
-publicKeyEncoding: {
-format: 'jwk'
-},
-privateKeyEncoding: {
-format: 'jwk'
-}
-},common.mustSucceed((publicKey,privateKey)=>{
-assert.strictEqual(typeofpublicKey,'object');
-assert.strictEqual(typeofprivateKey,'object');
-assert.strictEqual(publicKey.x,privateKey.x);
-assert(!publicKey.d);
-assert(privateKey.d);
-assert.strictEqual(publicKey.kty,'OKP');
-assert.strictEqual(publicKey.kty,privateKey.kty);
-constexpectedCrv=`${type.charAt(0).toUpperCase()}${type.slice(1)}`;
-assert.strictEqual(publicKey.crv,expectedCrv);
-assert.strictEqual(publicKey.crv,privateKey.crv);
-}));
-}
-}
+},common.mustSucceed((publicKey,privateKey)=>{
+assert.strictEqual(typeofpublicKey,'object');
+assert.strictEqual(typeofprivateKey,'object');
+assert.strictEqual(publicKey.x,privateKey.x);
+assert(!publicKey.d);
+assert(privateKey.d);
+assert.strictEqual(publicKey.kty,'OKP');
+assert.strictEqual(publicKey.kty,privateKey.kty);
+constexpectedCrv=`${type.charAt(0).toUpperCase()}${type.slice(1)}`;
+assert.strictEqual(publicKey.crv,expectedCrv);
+assert.strictEqual(publicKey.crv,privateKey.crv);
+}));
 });
 }