Skip to content

crypto: fix Hash and Cipher abort on end #38425

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

Open
Linkgoron wants to merge 1 commit into
base: main
Choose a base branch
from
Open

crypto: fix Hash and Cipher abort on end #38425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions lib/internal/crypto/cipher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,16 @@ ObjectSetPrototypeOf(Cipher.prototype, LazyTransform.prototype);
ObjectSetPrototypeOf(Cipher, LazyTransform);

Cipher.prototype._transform = function _transform(chunk, encoding, callback) {
this.push(this[kHandle].update(chunk, encoding));
callback();
let error = null;
try {
if (typeof chunk === 'string') {
validateEncoding(chunk, encoding);
}
this.push(this[kHandle].update(chunk, encoding));
} catch (err) {
error = err;
}
callback(error);
};

Cipher.prototype._flush = function _flush(callback) {
Expand Down
9 changes: 7 additions & 2 deletions lib/internal/crypto/hash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,13 @@ Hash.prototype.copy = function copy(options) {
};

Hash.prototype._transform = function _transform(chunk, encoding, callback) {
this[kHandle].update(chunk, encoding);
callback();
let error = null;
try {
this.update(chunk, encoding);
} catch (err) {
error = err;
}
callback(error);
};

Hash.prototype._flush = function _flush(callback) {
Expand Down
25 changes: 25 additions & 0 deletions test/parallel/test-crypto-binary-default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,31 @@ assert.throws(
name: 'TypeError'
});

{
const hash = crypto.createHash('sha1');
hash.on('error', common.mustCall((err) => {
assert.strictEqual(err.code, 'ERR_INVALID_ARG_VALUE');
assert.strictEqual(err.name, 'TypeError');
}));
hash.end('str', 'hex', common.mustCall((err) => {
assert.ok(err instanceof Error, 'err should be an error');
assert.strictEqual(err.code, 'ERR_STREAM_DESTROYED');
assert.strictEqual(err.name, 'Error');
}));
}

{
const decipher = crypto.createDecipher('des-ede3-cbc', '');
decipher.on('error', common.mustCall((err) => {
assert.strictEqual(err.code, 'ERR_INVALID_ARG_VALUE');
assert.strictEqual(err.name, 'TypeError');
}));
decipher.end('str', 'hex', common.mustCall((err) => {
assert.ok(err instanceof Error, 'err should be an error');
assert.strictEqual(err.code, 'ERR_STREAM_DESTROYED');
assert.strictEqual(err.name, 'Error');
}));
}

// Test Diffie-Hellman with two parties sharing a secret,
// using various encodings as we go along
Expand Down