From db4f802fba012b4da9e6d8ab273e739efc34e3a2 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 19 Jul 2021 08:06:04 +0200 Subject: [PATCH] Revert "test: skip tests for openssl-3.0.0-alpha15" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2ff93c8975508736bbc07b98cf84f47d68b47201. PR-URL: https://github.com/nodejs/node/pull/39437 Reviewed-By: Michaël Zasso Reviewed-By: Richard Lau Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- test/benchmark/test-benchmark-crypto.js | 4 ---- test/parallel/test-crypto-async-sign-verify.js | 3 --- test/parallel/test-crypto-dh-stateless.js | 3 --- test/parallel/test-crypto-key-objects.js | 3 --- test/parallel/test-crypto-keygen.js | 3 --- test/parallel/test-crypto-rsa-dsa.js | 3 --- test/parallel/test-crypto-sign-verify.js | 3 --- test/parallel/test-webcrypto-derivebits-ecdh.js | 3 --- test/parallel/test-webcrypto-derivebits-node-dh.js | 3 --- test/parallel/test-webcrypto-derivekey-ecdh.js | 3 --- test/parallel/test-webcrypto-encrypt-decrypt-rsa.js | 3 --- test/parallel/test-webcrypto-export-import-dsa.js | 3 --- test/parallel/test-webcrypto-export-import-ec.js | 3 --- test/parallel/test-webcrypto-export-import-rsa.js | 3 --- test/parallel/test-webcrypto-export-import.js | 3 --- test/parallel/test-webcrypto-rsa-pss-params.js | 3 --- test/parallel/test-webcrypto-sign-verify-ecdsa.js | 3 --- test/parallel/test-webcrypto-sign-verify-node-dsa.js | 3 --- test/parallel/test-webcrypto-sign-verify-rsa.js | 3 --- test/parallel/test-webcrypto-wrap-unwrap.js | 3 --- 20 files changed, 61 deletions(-) diff --git a/test/benchmark/test-benchmark-crypto.js b/test/benchmark/test-benchmark-crypto.js index f7f155ac8e55d8..7f6988acf234d8 100644 --- a/test/benchmark/test-benchmark-crypto.js +++ b/test/benchmark/test-benchmark-crypto.js @@ -8,10 +8,6 @@ if (!common.hasCrypto) if (common.hasFipsCrypto) common.skip('some benchmarks are FIPS-incompatible'); -if (common.hasOpenSSL3) { - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); -} - const runBenchmark = require('../common/benchmark'); runBenchmark('crypto', { NODEJS_BENCHMARK_ZERO_ALLOWED: 1 }); diff --git a/test/parallel/test-crypto-async-sign-verify.js b/test/parallel/test-crypto-async-sign-verify.js index 2e6c9e0bc539f4..4e3c32fdcd23fb 100644 --- a/test/parallel/test-crypto-async-sign-verify.js +++ b/test/parallel/test-crypto-async-sign-verify.js @@ -3,9 +3,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const util = require('util'); const crypto = require('crypto'); diff --git a/test/parallel/test-crypto-dh-stateless.js b/test/parallel/test-crypto-dh-stateless.js index 658bd38fff655a..943ead06cda1fb 100644 --- a/test/parallel/test-crypto-dh-stateless.js +++ b/test/parallel/test-crypto-dh-stateless.js @@ -3,9 +3,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const crypto = require('crypto'); diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js index 3159b0da3f2901..689fbadd29d926 100644 --- a/test/parallel/test-crypto-key-objects.js +++ b/test/parallel/test-crypto-key-objects.js @@ -4,9 +4,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { types: { isKeyObject } } = require('util'); const { diff --git a/test/parallel/test-crypto-keygen.js b/test/parallel/test-crypto-keygen.js index 4612fc4a1ac40a..58e5d305b6b05a 100644 --- a/test/parallel/test-crypto-keygen.js +++ b/test/parallel/test-crypto-keygen.js @@ -4,9 +4,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { constants, diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js index 567d8650c5a177..9afcb38616dafd 100644 --- a/test/parallel/test-crypto-rsa-dsa.js +++ b/test/parallel/test-crypto-rsa-dsa.js @@ -3,9 +3,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const crypto = require('crypto'); diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js index 15fa3db4a69f19..444135538ccff8 100644 --- a/test/parallel/test-crypto-sign-verify.js +++ b/test/parallel/test-crypto-sign-verify.js @@ -3,9 +3,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const fs = require('fs'); const path = require('path'); diff --git a/test/parallel/test-webcrypto-derivebits-ecdh.js b/test/parallel/test-webcrypto-derivebits-ecdh.js index 49076ce443a54a..64cbae7cec6a03 100644 --- a/test/parallel/test-webcrypto-derivebits-ecdh.js +++ b/test/parallel/test-webcrypto-derivebits-ecdh.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle, getRandomValues } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-derivebits-node-dh.js b/test/parallel/test-webcrypto-derivebits-node-dh.js index cab7d40c1a7abf..2503bc17032e0d 100644 --- a/test/parallel/test-webcrypto-derivebits-node-dh.js +++ b/test/parallel/test-webcrypto-derivebits-node-dh.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-derivekey-ecdh.js b/test/parallel/test-webcrypto-derivekey-ecdh.js index a0bf28e89e4e3a..bdd9bd7588a763 100644 --- a/test/parallel/test-webcrypto-derivekey-ecdh.js +++ b/test/parallel/test-webcrypto-derivekey-ecdh.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle, getRandomValues } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js b/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js index e01152c07f294d..151eebd36c9765 100644 --- a/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js +++ b/test/parallel/test-webcrypto-encrypt-decrypt-rsa.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-export-import-dsa.js b/test/parallel/test-webcrypto-export-import-dsa.js index 6b47b99c1ddbf8..3fddd9dd9c4559 100644 --- a/test/parallel/test-webcrypto-export-import-dsa.js +++ b/test/parallel/test-webcrypto-export-import-dsa.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-export-import-ec.js b/test/parallel/test-webcrypto-export-import-ec.js index e5453878a19050..31ab2c09cdb1f9 100644 --- a/test/parallel/test-webcrypto-export-import-ec.js +++ b/test/parallel/test-webcrypto-export-import-ec.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-export-import-rsa.js b/test/parallel/test-webcrypto-export-import-rsa.js index 46e96628a33f8c..f43259fd22faea 100644 --- a/test/parallel/test-webcrypto-export-import-rsa.js +++ b/test/parallel/test-webcrypto-export-import-rsa.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-export-import.js b/test/parallel/test-webcrypto-export-import.js index 9cf8833cecfc47..d7db433b364011 100644 --- a/test/parallel/test-webcrypto-export-import.js +++ b/test/parallel/test-webcrypto-export-import.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle, getRandomValues } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-rsa-pss-params.js b/test/parallel/test-webcrypto-rsa-pss-params.js index d52a9bf6add223..964eaf32e890fd 100644 --- a/test/parallel/test-webcrypto-rsa-pss-params.js +++ b/test/parallel/test-webcrypto-rsa-pss-params.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const { createPrivateKey, createPublicKey, diff --git a/test/parallel/test-webcrypto-sign-verify-ecdsa.js b/test/parallel/test-webcrypto-sign-verify-ecdsa.js index 8620498d89b00c..2f8f3a2fd229bd 100644 --- a/test/parallel/test-webcrypto-sign-verify-ecdsa.js +++ b/test/parallel/test-webcrypto-sign-verify-ecdsa.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-sign-verify-node-dsa.js b/test/parallel/test-webcrypto-sign-verify-node-dsa.js index 24d739062fb098..73b006b9236249 100644 --- a/test/parallel/test-webcrypto-sign-verify-node-dsa.js +++ b/test/parallel/test-webcrypto-sign-verify-node-dsa.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-sign-verify-rsa.js b/test/parallel/test-webcrypto-sign-verify-rsa.js index 2cfcf6e2ec02bd..60815c5ea0451d 100644 --- a/test/parallel/test-webcrypto-sign-verify-rsa.js +++ b/test/parallel/test-webcrypto-sign-verify-rsa.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto; diff --git a/test/parallel/test-webcrypto-wrap-unwrap.js b/test/parallel/test-webcrypto-wrap-unwrap.js index 54a5a782a09586..1094845c73e143 100644 --- a/test/parallel/test-webcrypto-wrap-unwrap.js +++ b/test/parallel/test-webcrypto-wrap-unwrap.js @@ -5,9 +5,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -if (common.hasOpenSSL3) - common.skip('temporarily skipping for OpenSSL 3.0-alpha15'); - const assert = require('assert'); const { subtle } = require('crypto').webcrypto;