mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-02 22:08:40 +09:00
Issue #2690 - Allow 0-length keys/empty passwords for PBKDF2.
This commit is contained in:
parent
3d7a95ab44
commit
e1e7a0c5bc
1 changed files with 4 additions and 9 deletions
|
|
@ -1544,7 +1544,8 @@ public:
|
|||
}
|
||||
|
||||
// Check that we have valid key data.
|
||||
if (mKeyData.Length() == 0) {
|
||||
// Zero-length key is allowed for PBKDF2 since it will be padded.
|
||||
if (mKeyData.Length() == 0 && !mAlgName.EqualsLiteral(WEBCRYPTO_ALG_PBKDF2)) {
|
||||
return NS_ERROR_DOM_DATA_ERR;
|
||||
}
|
||||
|
||||
|
|
@ -2741,12 +2742,6 @@ public:
|
|||
{
|
||||
CHECK_KEY_ALGORITHM(aKey.Algorithm(), WEBCRYPTO_ALG_PBKDF2);
|
||||
|
||||
// Check that we got a symmetric key
|
||||
if (mSymKey.Length() == 0) {
|
||||
mEarlyRv = NS_ERROR_DOM_INVALID_ACCESS_ERR;
|
||||
return;
|
||||
}
|
||||
|
||||
RootedDictionary<Pbkdf2Params> params(aCx);
|
||||
mEarlyRv = Coerce(aCx, params, aAlgorithm);
|
||||
if (NS_FAILED(mEarlyRv)) {
|
||||
|
|
@ -2754,9 +2749,9 @@ public:
|
|||
return;
|
||||
}
|
||||
|
||||
// length must be a multiple of 8 bigger than zero.
|
||||
// Length must be a multiple of 8 bigger than zero.
|
||||
if (aLength == 0 || aLength % 8) {
|
||||
mEarlyRv = NS_ERROR_DOM_DATA_ERR;
|
||||
mEarlyRv = NS_ERROR_DOM_OPERATION_ERR;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue