Skip to content

crypto: fix aes crash when tag length too small #38914

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
XadillaX wants to merge 4 commits into from
Closed

crypto: fix aes crash when tag length too small #38914

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
0ce31fb
crypto: fix aes crash when tag length too small
XadillaX Jun 3, 2021
9a4d39c
f
XadillaX Jun 3, 2021
98a407b
f
XadillaX Jun 10, 2021
e5c781a
f
XadillaX Jun 10, 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
Next Next commit
crypto: fix aes crash when tag length too small 
Refs: #38883
  • Loading branch information
@XadillaX
XadillaX committed Jun 3, 2021
commit 0ce31fb8f3ef0cf8948db04e74235c395c38701d
5 changes: 5 additions & 0 deletions lib/internal/crypto/aes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@ function asyncAesGcmCipher(
const slice = ArrayBufferIsView(data) ?
TypedArrayPrototypeSlice : ArrayBufferPrototypeSlice;
tag = slice(data, -tagByteLength);
if (tagByteLength > tag.byteLength) {
throw lazyDOMException(
'The provided data is too small.',
'OperationError');
}
data = slice(data, 0, -tagByteLength);
break;
case kWebCryptoCipherEncrypt:
Expand Down
31 changes: 31 additions & 0 deletions test/parallel/test-crypto-webcrypto-aes-decrypt-tag-too-small.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';

const common = require('../common');

if (!common.hasCrypto)
common.skip('missing crypto');

const assert = require('assert');
const crypto = require('crypto').webcrypto;

crypto.subtle.importKey(
'raw',
new Uint8Array(32),
{
name: 'AES-GCM'
},
false,
[ 'encrypt', 'decrypt' ])
.then((k) => {
assert.rejects(async () => {
Copy link
Member

@tniessen tniessen Jun 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function does not need the async keyword, and using it hides whether the exception is thrown synchronously or the Promise is actually rejected.

Copy link
Contributor Author

@XadillaX XadillaX Jun 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmmmm, Chrome rejects this situation in Promise. So shall we do reject or throw?

Copy link
Contributor Author

@XadillaX XadillaX Jun 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

window.crypto.subtle.decrypt({name: 'AES-GCM', iv: new Uint8Array(12)}, k, new Uint8Array(0));
> Promise {<pending>}
Uncaught (in promise) DOMException: The provided data is too small

Copy link
Member

@tniessen tniessen Jun 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that the behavior is correct, and the test works, but it isn't as strict as it could be. assert.rejects is fine, but the async weakens the test:

function fnThatThrows() { throw new Error(); }
async function fnThatRejects() { throw new Error(); }

// With 'async':

assert.rejects(async () => fnThatRejects()); // passes
assert.rejects(async () => fnThatThrows()); // passes, but should not!

// Now remove the 'async' keyword:

assert.rejects(() => fnThatRejects()); // passes
assert.rejects(() => fnThatThrows()); // fails as it should

So I'd simply remove the async keyword from the function declaration :)

Copy link
Contributor Author

@XadillaX XadillaX Jun 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've resolved it.

return crypto.subtle.decrypt({
name: 'AES-GCM',
iv: new Uint8Array(12),
},
k,
new Uint8Array(0));
}, {
name: 'OperationError',
message: /The provided data is too small/,
});
});