зеркало из https://github.com/mozilla/gecko-dev.git
Remove useless check for crypto methods
This commit is contained in:
Родитель
2404b54528
Коммит
38c74f2d92
|
@ -529,22 +529,20 @@ WeaveSvc.prototype = {
|
|||
|
||||
verifyPassphrase: function WeaveSvc_verifyPassphrase(username, password, passphrase)
|
||||
this._catch(this._notify("verify-passphrase", "", function() {
|
||||
if ('verifyPassphrase' in Svc.Crypto) {
|
||||
this._log.debug("Verifying passphrase");
|
||||
this.username = username;
|
||||
ID.get("WeaveID").setTempPassword(password);
|
||||
this._log.debug("Verifying passphrase");
|
||||
this.username = username;
|
||||
ID.get("WeaveID").setTempPassword(password);
|
||||
|
||||
try {
|
||||
let pubkey = PubKeys.getDefaultKey();
|
||||
let privkey = PrivKeys.get(pubkey.privateKeyUri);
|
||||
return Svc.Crypto.verifyPassphrase(
|
||||
privkey.payload.keyData, passphrase,
|
||||
privkey.payload.salt, privkey.payload.iv
|
||||
);
|
||||
} catch (e) {
|
||||
// this means no keys are present (or there's a network error)
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
let pubkey = PubKeys.getDefaultKey();
|
||||
let privkey = PrivKeys.get(pubkey.privateKeyUri);
|
||||
return Svc.Crypto.verifyPassphrase(
|
||||
privkey.payload.keyData, passphrase,
|
||||
privkey.payload.salt, privkey.payload.iv
|
||||
);
|
||||
} catch (e) {
|
||||
// this means no keys are present (or there's a network error)
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}))(),
|
||||
|
|
Загрузка…
Ссылка в новой задаче