Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert skip openssl 3.0 tests #39437

Closed
wants to merge 2 commits into from
Closed

Revert skip openssl 3.0 tests #39437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeacbba
Revert "test: skip tests for openssl-3.0.0-alpha15"
danbev Jul 19, 2021
0804afc
test: update OpenSSL3 error messages for beta-1
danbev Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions test/benchmark/test-benchmark-crypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
3 changes: 0 additions & 3 deletions test/parallel/test-crypto-async-sign-verify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 1 addition & 4 deletions test/parallel/test-crypto-dh-stateless.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -229,7 +226,7 @@ assert.throws(() => {
crypto.generateKeyPairSync('ec', { namedCurve: not256k1 }));
}, common.hasOpenSSL3 ? {
name: 'Error',
code: 'ERR_OSSL_MISMATCHING_SHARED_PARAMETERS'
code: 'ERR_OSSL_MISMATCHING_DOMAIN_PARAMETERS'
} : {
name: 'Error',
code: 'ERR_OSSL_EVP_DIFFERENT_PARAMETERS'
Expand Down
10 changes: 3 additions & 7 deletions test/parallel/test-crypto-key-objects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -308,7 +305,7 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
assert.throws(() => {
createPrivateKey({ key: '' });
}, common.hasOpenSSL3 ? {
message: 'Failed to read private key',
message: 'error:1E08010C:DECODER routines::unsupported',
} : {
message: 'error:0909006C:PEM routines:get_name:no start line',
code: 'ERR_OSSL_PEM_NO_START_LINE',
Expand Down Expand Up @@ -522,8 +519,7 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
// Reading an encrypted key without a passphrase should fail.
assert.throws(() => createPrivateKey(privateDsa), common.hasOpenSSL3 ? {
name: 'Error',
message: 'error:07880109:common libcrypto routines::interrupted or ' +
'cancelled',
message: 'error:1E08010C:DECODER routines::unsupported',
} : {
name: 'TypeError',
code: 'ERR_MISSING_PASSPHRASE',
Expand All @@ -549,7 +545,7 @@ const privateDsa = fixtures.readKey('dsa_private_encrypted_1025.pem',
passphrase: Buffer.alloc(1024, 'a')
}), {
message: common.hasOpenSSL3 ?
'error:07880109:common libcrypto routines::interrupted or cancelled' :
'error:1E08010C:DECODER routines::unsupported' :
/bad decrypt/
});

Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-crypto-keygen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -552,8 +549,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
// Since the private key is encrypted, signing shouldn't work anymore.
assert.throws(() => testSignVerify(publicKey, privateKey),
common.hasOpenSSL3 ? {
message: 'error:07880109:common libcrypto ' +
'routines::interrupted or cancelled'
message: 'error:1E08010C:DECODER routines::unsupported'
} : {
name: 'TypeError',
code: 'ERR_MISSING_PASSPHRASE',
Expand Down Expand Up @@ -590,8 +586,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
// Since the private key is encrypted, signing shouldn't work anymore.
assert.throws(() => testSignVerify(publicKey, privateKey),
common.hasOpenSSL3 ? {
message: 'error:07880109:common libcrypto ' +
'routines::interrupted or cancelled'
message: 'error:1E08010C:DECODER routines::unsupported'
} : {
name: 'TypeError',
code: 'ERR_MISSING_PASSPHRASE',
Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-crypto-rsa-dsa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-crypto-sign-verify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-derivebits-ecdh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-derivebits-node-dh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-derivekey-ecdh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-encrypt-decrypt-rsa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-export-import-dsa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-export-import-ec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-export-import-rsa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-export-import.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-rsa-pss-params.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-sign-verify-ecdsa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-sign-verify-node-dsa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-sign-verify-rsa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-webcrypto-wrap-unwrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down