Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1285986 - [Web Crypto] Changed error when AES-CBC, AES-CTR has wrong iv length r=keeler

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D158540
This commit is contained in:
Carter Sellgren 2022-10-12 17:38:37 +00:00
parent 653af6e580
commit d77cb499b1
2 changed files with 77 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/crypto/WebCryptoTask.cpp
View File

@ -506,7 +506,7 @@ class AesTask : public ReturnArrayBufferViewTask, public DeferredData {
ATTEMPT_BUFFER_INIT(mIv, params.mIv)
if (mIv.Length() != 16) {
mEarlyRv = NS_ERROR_DOM_DATA_ERR;
mEarlyRv = NS_ERROR_DOM_OPERATION_ERR;
return;
}
} else if (algName.EqualsLiteral(WEBCRYPTO_ALG_AES_CTR)) {
@ -523,7 +523,7 @@ class AesTask : public ReturnArrayBufferViewTask, public DeferredData {
ATTEMPT_BUFFER_INIT(mIv, params.mCounter)
if (mIv.Length() != 16) {
mEarlyRv = NS_ERROR_DOM_DATA_ERR;
mEarlyRv = NS_ERROR_DOM_OPERATION_ERR;
return;
}

105
dom/crypto/test/test_WebCrypto.html
View File

@ -517,17 +517,27 @@ TestArray.addTest(
x, tv.aes_cbc_enc.data);
}
function doEncrypt(x) {
return encrypt(x, new Uint8Array(15))
.catch(function() { return encrypt(new Uint8Array(17)); });
function checkPromises(promises) {
for (var promise of promises) {
if (promise.status != "rejected") {
return false;
}
if (promise.reason.name != "OperationError") {
return false;
}
}
return true;
}
crypto.subtle.importKey("raw", tv.aes_cbc_enc.key, "AES-CBC", false, ["encrypt"])
.then(doEncrypt)
.then(
error(that),
complete(that)
);
.then(function(key) {
var p1 = encrypt(key, new Uint8Array(15));
var p2 = encrypt(key, new Uint8Array(17));
Promise.allSettled([p1, p2])
.then(complete(that, checkPromises));
});
}
);
@ -564,17 +574,27 @@ TestArray.addTest(
x, tv.aes_cbc_dec.data);
}
function doDecrypt(x) {
return decrypt(x, new Uint8Array(15))
.catch(function() { return decrypt(x, new Uint8Array(17)); });
function checkPromises(promises) {
for (var promise of promises) {
if (promise.status != "rejected") {
return false;
}
if (promise.reason.name != "OperationError") {
return false;
}
}
return true;
}
crypto.subtle.importKey("raw", tv.aes_cbc_dec.key, "AES-CBC", false, ["decrypt"])
.then(doDecrypt)
.then(
error(that),
complete(that)
);
.then(function(key) {
var p1 = decrypt(key, new Uint8Array(15));
var p2 = decrypt(key, new Uint8Array(17));
Promise.allSettled([p1, p2])
.then(complete(that, checkPromises));
});
}
);
@ -611,17 +631,27 @@ TestArray.addTest(
x, tv.aes_ctr_enc.data);
}
function doEncrypt(x) {
return encrypt(x, new Uint8Array(15))
.catch(function() { return encrypt(x, new Uint8Array(17)); });
function checkPromises(promises) {
for (var promise of promises) {
if (promise.status != "rejected") {
return false;
}
if (promise.reason.name != "OperationError") {
return false;
}
}
return true;
}
crypto.subtle.importKey("raw", tv.aes_ctr_enc.key, "AES-CTR", false, ["encrypt"])
.then(doEncrypt)
.then(
error(that),
complete(that)
);
.then(function(key) {
var p1 = encrypt(key, new Uint8Array(15));
var p2 = encrypt(key, new Uint8Array(17));
Promise.allSettled([p1, p2])
.then(complete(that, checkPromises));
});
}
);
@ -652,18 +682,33 @@ TestArray.addTest(
function() {
var that = this;
function doDecrypt(x, iv) {
function decrypt(x, iv) {
return crypto.subtle.decrypt(
{ name: "AES-CTR", counter: iv, length: 32 },
x, tv.aes_ctr_dec.data);
}
function checkPromises(promises) {
for (var promise of promises) {
if (promise.status != "rejected") {
return false;
}
if (promise.reason.name != "OperationError") {
return false;
}
}
return true;
}
crypto.subtle.importKey("raw", tv.aes_ctr_dec.key, "AES-CTR", false, ["decrypt"])
.then(doDecrypt)
.then(
error(that),
complete(that)
);
.then(function(key) {
var p1 = decrypt(key, new Uint8Array(15));
var p2 = decrypt(key, new Uint8Array(17));
Promise.allSettled([p1, p2])
.then(complete(that, checkPromises));
});
}
);