wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1243594 (part 1) - remove misleading references to utf8 in Credentials.jsm. r=rfkelly

Browse Source
This commit is contained in:
Mark Hammond 2016-02-26 15:46:30 +11:00
parent 9d70c36a9c
commit 64fd942f79
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/fxaccounts/Credentials.jsm
View File

@ -104,10 +104,7 @@ this.Credentials = Object.freeze({
let stretchedPWLength = options.stretchedPassLength || STRETCHED_PW_LENGTH_BYTES;
let pbkdf2Rounds = options.pbkdf2Rounds || PBKDF2_ROUNDS;
let result = {
emailUTF8: emailInput,
passwordUTF8: passwordInput,
};
let result = {};
let password = CommonUtils.encodeUTF8(passwordInput);
let salt = this.keyWordExtended("quickStretch", emailInput);

2
services/fxaccounts/FxAccountsClient.jsm
View File

@ -92,7 +92,7 @@ this.FxAccountsClient.prototype = {
return Credentials.setup(email, password).then((creds) => {
let data = {
authPW: CommonUtils.bytesAsHex(creds.authPW),
email: creds.emailUTF8,
email: email,
};
let keys = getKeys ? "?keys=true" : "";

14
services/fxaccounts/tests/xpcshell/test_credentials.js
View File

@ -71,12 +71,12 @@ add_task(function* test_client_stretch_kdf() {
let hkdf = CryptoUtils.hkdf;
let expected = vectors["client stretch-KDF"];
let emailUTF8 = h2s(expected.email);
let passwordUTF8 = h2s(expected.password);
let email = h2s(expected.email);
let password = h2s(expected.password);
// Intermediate value from sjcl implementation in fxa-js-client
// The key thing is the c3a9 sequence in "andré"
let salt = Credentials.keyWordExtended("quickStretch", emailUTF8);
let salt = Credentials.keyWordExtended("quickStretch", email);
do_check_eq(b2h(salt), "6964656e746974792e6d6f7a696c6c612e636f6d2f7069636c2f76312f717569636b537472657463683a616e6472c3a9406578616d706c652e6f7267");
let options = {
@ -88,13 +88,7 @@ add_task(function* test_client_stretch_kdf() {
hkdfLength: 32,
};
let results = yield Credentials.setup(emailUTF8, passwordUTF8, options);
do_check_eq(emailUTF8, results.emailUTF8,
"emailUTF8 is wrong");
do_check_eq(passwordUTF8, results.passwordUTF8,
"passwordUTF8 is wrong");
let results = yield Credentials.setup(email, password, options);
do_check_eq(expected.quickStretchedPW, b2h(results.quickStretchedPW),
"quickStretchedPW is wrong");