suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Sanjana Rajan 2017-12-02 11:17:39 -08:00
parent 6189cd4568
commit 0e254a8c8c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/message.js
View File

@ -220,9 +220,9 @@ Message.prototype.encrypt = function(keys, passwords, sessionKey) {
let symAlgo, msg, symEncryptedPacket; let symAlgo, msg, symEncryptedPacket;
return Promise.resolve().then(() => { return Promise.resolve().then(() => {
if (keys) { if (keys) {
symAlgo = keyModule.getPreferredSymAlgo(keys); symAlgo = enums.read(enums.symmetric, keyModule.getPreferredSymAlgo(keys));
} else if (passwords) { } else if (passwords) {
symAlgo = config.encryption_cipher; symAlgo = enums.read(enums.symmetric, config.encryption_cipher);
} else { } else {
throw new Error('No keys or passwords'); throw new Error('No keys or passwords');
} }
@ -231,13 +231,13 @@ Message.prototype.encrypt = function(keys, passwords, sessionKey) {
if (!util.isUint8Array(sessionKey.data) || !util.isString(sessionKey.algorithm)) { if (!util.isUint8Array(sessionKey.data) || !util.isString(sessionKey.algorithm)) {
throw new Error('Invalid session key for encryption.'); throw new Error('Invalid session key for encryption.');
} }
symAlgo = enums.write(enums.symmetric, sessionKey.algorithm); symAlgo = sessionKey.algorithm;
sessionKey = sessionKey.data; sessionKey = sessionKey.data;
} else { } else {
sessionKey = crypto.generateSessionKey(enums.read(enums.symmetric, symAlgo)); sessionKey = crypto.generateSessionKey(symAlgo);
} }
msg = encryptSessionKey(sessionKey, enums.read(enums.symmetric, symAlgo), keys, passwords); msg = encryptSessionKey(sessionKey, symAlgo, keys, passwords);
if (config.aead_protect) { if (config.aead_protect) {
symEncryptedPacket = new packet.SymEncryptedAEADProtected(); symEncryptedPacket = new packet.SymEncryptedAEADProtected();
@ -248,7 +248,7 @@ Message.prototype.encrypt = function(keys, passwords, sessionKey) {
} }
symEncryptedPacket.packets = this.packets; symEncryptedPacket.packets = this.packets;
return symEncryptedPacket.encrypt(enums.read(enums.symmetric, symAlgo), sessionKey); return symEncryptedPacket.encrypt(symAlgo, sessionKey);
}).then(() => { }).then(() => {
msg.packets.push(symEncryptedPacket); msg.packets.push(symEncryptedPacket);
@ -257,7 +257,7 @@ Message.prototype.encrypt = function(keys, passwords, sessionKey) {
message: msg, message: msg,
sessionKey: { sessionKey: {
data: sessionKey, data: sessionKey,
algorithm: enums.read(enums.symmetric, symAlgo) algorithm: symAlgo
} }
}; };
}); });