Skip to content

Upgrade to OpenSSL-1.1.0i #22318

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

Closed
shigeki wants to merge 4 commits into from
Closed

Upgrade to OpenSSL-1.1.0i #22318

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8315458
deps: upgrade openssl sources to 1.1.0i
shigeki Aug 14, 2018
7ea3581
deps: add s390 asm rules for OpenSSL-1.1.0
shigeki Mar 7, 2018
415d6f9
deps: update archs files for OpenSSL-1.1.0i
shigeki Aug 14, 2018
5143132
test: fix error messages for OpenSSL-1.1.0i
shigeki Aug 14, 2018
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
Prev Previous commit
test: fix error messages for OpenSSL-1.1.0i 
After upgradeing OpenSSL-1.1.0i, two tests are failed due to changes
of error messages.

Ref: openssl/openssl@45ae18b
Ref: openssl/openssl@36d2517
  • Loading branch information
@shigeki
shigeki committed Aug 14, 2018
commit 51431329ef1a6fee6431a12fa2e305320e5daa6f
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-scrypt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ const good = [
const bad = [
{ N: 1, p: 1, r: 1 }, // N < 2
{ N: 3, p: 1, r: 1 }, // Not power of 2.
{ N: 2 ** 16, p: 1, r: 1 }, // N >= 2**(r*16)
{ N: 2, p: 2 ** 30, r: 1 }, // p > (2**30-1)/r
{ N: 1, cost: 1 }, // both N and cost
{ p: 1, parallelization: 1 }, // both p and parallelization
{ r: 1, blockSize: 1 } // both r and blocksize
];

// Test vectors where 128*N*r exceeds maxmem.
const toobig = [
{ N: 2 ** 16, p: 1, r: 1 }, // N >= 2**(r*16)
{ N: 2, p: 2 ** 30, r: 1 }, // p > (2**30-1)/r
{ N: 2 ** 20, p: 1, r: 8 },
{ N: 2 ** 10, p: 1, r: 8, maxmem: 2 ** 20 },
];
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-passphrase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ server.listen(0, common.mustCall(function() {
}, common.mustCall());
})).unref();

const errMessagePassword = /bad password read/;
const errMessagePassword = /bad decrypt/;

// Missing passphrase
assert.throws(function() {
Expand Down