moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2025-02-17 23:40:22 -05:00
Code Issues Releases Wiki Activity

bugfix import keypair after new generation

Browse Source
This commit is contained in:
Tankred Hase 2013-10-13 19:04:49 +02:00
parent df24d4f7a5
commit 0e17bd4f26
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/js/dao/email-dao.js
View File

@ -76,20 +76,32 @@ define(function(require) {
return; return;
} }
// persist newly generated keypair // import the new key pair into crypto module
var newKeypair = { self._crypto.importKeys({
publicKey: { passphrase: passphrase,
_id: generatedKeypair.keyId, privateKeyArmored: generatedKeypair.privateKeyArmored,
userId: self._account.emailAddress, publicKeyArmored: generatedKeypair.publicKeyArmored
publicKey: generatedKeypair.publicKeyArmored }, function(err) {
}, if (err) {
privateKey: { callback(err);
_id: generatedKeypair.keyId, return;
userId: self._account.emailAddress,
encryptedKey: generatedKeypair.privateKeyArmored
} }
};
self._keychain.putUserKeyPair(newKeypair, callback); // persist newly generated keypair
var newKeypair = {
publicKey: {
_id: generatedKeypair.keyId,
userId: self._account.emailAddress,
publicKey: generatedKeypair.publicKeyArmored
},
privateKey: {
_id: generatedKeypair.keyId,
userId: self._account.emailAddress,
encryptedKey: generatedKeypair.privateKeyArmored
}
};
self._keychain.putUserKeyPair(newKeypair, callback);
});
}); });
} }
}; };

2
src/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "Whiteout Mail", "name": "Whiteout Mail",
"description": "Simple & elegant email client with integrated end-to-end encryption. Keeping your emails safe has never been so easy.", "description": "Simple & elegant email client with integrated end-to-end encryption. Keeping your emails safe has never been so easy.",
"version": "0.0.5.1", "version": "0.0.6.0",
"manifest_version": 2, "manifest_version": 2,
"offline_enabled": true, "offline_enabled": true,
"icons": { "icons": {

4
test/new-unit/email-dao-test.js
View File

@ -73,12 +73,14 @@ define(function(require) {
devicestorageStub.init.yields(); devicestorageStub.init.yields();
keychainStub.getUserKeyPair.yields(); keychainStub.getUserKeyPair.yields();
pgpStub.generateKeys.yields(null, {}); pgpStub.generateKeys.yields(null, {});
pgpStub.importKeys.yields();
keychainStub.putUserKeyPair.yields(); keychainStub.putUserKeyPair.yields();
emailDao.init(account, emaildaoTest.passphrase, function(err) { emailDao.init(account, emaildaoTest.passphrase, function(err) {
expect(devicestorageStub.init.calledOnce).to.be.true; expect(devicestorageStub.init.calledOnce).to.be.true;
expect(keychainStub.getUserKeyPair.calledOnce).to.be.true; expect(keychainStub.getUserKeyPair.calledOnce).to.be.true;
expect(pgpStub.generateKeys.calledOnce).to.be.true; expect(pgpStub.generateKeys.calledOnce).to.be.true;
expect(pgpStub.importKeys.calledOnce).to.be.true;
expect(keychainStub.putUserKeyPair.calledOnce).to.be.true; expect(keychainStub.putUserKeyPair.calledOnce).to.be.true;
expect(err).to.not.exist; expect(err).to.not.exist;
done(); done();
@ -136,12 +138,14 @@ define(function(require) {
devicestorageStub.init.yields(); devicestorageStub.init.yields();
keychainStub.getUserKeyPair.yields(); keychainStub.getUserKeyPair.yields();
pgpStub.generateKeys.yields(null, {}); pgpStub.generateKeys.yields(null, {});
pgpStub.importKeys.yields();
keychainStub.putUserKeyPair.yields(); keychainStub.putUserKeyPair.yields();
emailDao.init(account, emaildaoTest.passphrase, function(err) { emailDao.init(account, emaildaoTest.passphrase, function(err) {
expect(devicestorageStub.init.calledOnce).to.be.true; expect(devicestorageStub.init.calledOnce).to.be.true;
expect(keychainStub.getUserKeyPair.calledOnce).to.be.true; expect(keychainStub.getUserKeyPair.calledOnce).to.be.true;
expect(pgpStub.generateKeys.calledOnce).to.be.true; expect(pgpStub.generateKeys.calledOnce).to.be.true;
expect(pgpStub.importKeys.calledOnce).to.be.true;
expect(keychainStub.putUserKeyPair.calledOnce).to.be.true; expect(keychainStub.putUserKeyPair.calledOnce).to.be.true;
expect(err).to.not.exist; expect(err).to.not.exist;
done(); done();