Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PubKeyManager_getDefaultKey: async + async/yield -> sync.

Browse Source
This commit is contained in:
Edward Lee 2009-06-04 17:04:51 -07:00
parent d30f38a715
commit 18ddfe6cf0
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/sync/modules/base_records/crypto.js
View File

@ -80,7 +80,7 @@ CryptoWrapper.prototype = {
return;
}
let pubkey = yield PubKeys.getDefaultKey(self.cb);
let pubkey = PubKeys.getDefaultKey();
let privkey = PrivKeys.get(pubkey.privateKeyUri);
let meta = CryptoMetas.get(this.encryption);
@ -105,7 +105,7 @@ CryptoWrapper.prototype = {
return;
}
let pubkey = yield PubKeys.getDefaultKey(self.cb);
let pubkey = PubKeys.getDefaultKey();
let privkey = PrivKeys.get(pubkey.privateKeyUri);
let meta = CryptoMetas.get(this.encryption);

9
services/sync/modules/base_records/keys.js
View File

@ -149,13 +149,8 @@ PubKeyManager.prototype = {
get defaultKeyUri() this._defaultKeyUri,
set defaultKeyUri(value) { this._defaultKeyUri = value; },
getDefaultKey: function KeyMgr_getDefaultKey(onComplete) {
let fn = function KeyMgr__getDefaultKey() {
let self = yield;
let ret = this.get(this.defaultKeyUri);
self.done(ret);
};
fn.async(this, onComplete);
getDefaultKey: function PubKeyManager_getDefaultKey() {
return this.get(this.defaultKeyUri);
},
createKeypair: function KeyMgr_createKeypair(passphrase, pubkeyUri, privkeyUri) {

2
services/sync/modules/engines.js
View File

@ -304,7 +304,7 @@ SyncEngine.prototype = {
let meta = CryptoMetas.get(this.cryptoMetaURL);
if (!meta) {
let symkey = Svc.Crypto.generateRandomKey();
let pubkey = yield PubKeys.getDefaultKey(self.cb);
let pubkey = PubKeys.getDefaultKey();
meta = new CryptoMeta(this.cryptoMetaURL);
meta.generateIV();
yield meta.addUnwrappedKey(self.cb, pubkey, symkey);

2
services/sync/modules/service.js
View File

@ -712,7 +712,7 @@ WeaveSvc.prototype = {
}
let needKeys = true;
let pubkey = yield PubKeys.getDefaultKey(self.cb);
let pubkey = PubKeys.getDefaultKey();
if (!pubkey)
this._log.debug("Could not get public key");
else if (pubkey.keyData == null)