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

Remove sessionKeyAlgorithm parameter from message.decrypt()

Browse Source 
See: 2010456a19 (commitcomment-12397926)
This commit is contained in:
Tankred Hase 2016-02-06 14:33:10 +07:00
parent c4bc9b2fe0
commit 55110c3409
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/message.js
View File

@ -87,19 +87,11 @@ Message.prototype.getSigningKeyIds = function() {
/** /**
* Decrypt the message * Decrypt the message
* @param {module:key~Key|String} privateKey private key with decrypted secret data, password or session key * @param {module:key~Key|String} privateKey private key with decrypted secret data, password or session key
* @param {String} sessionKeyAlgorithm if privateKey is a session key, this must be set to the session key algorithm (i.e. 'aes256').
* Do not set if privateKey is not a session key.
* @return {Array<module:message~Message>} new message with decrypted content * @return {Array<module:message~Message>} new message with decrypted content
*/ */
Message.prototype.decrypt = function(privateKey, sessionKeyAlgorithm) { Message.prototype.decrypt = function(privateKey) {
var keyObj; var keyObj = this.decryptSessionKey(privateKey);
if(sessionKeyAlgorithm) { if (keyObj) {
keyObj = {key: privateKey, algo: sessionKeyAlgorithm};
}
else {
keyObj = this.decryptSessionKey(privateKey);
}
if(keyObj) {
var symEncryptedPacketlist = this.packets.filterByTag(enums.packet.symmetricallyEncrypted, enums.packet.symEncryptedIntegrityProtected); var symEncryptedPacketlist = this.packets.filterByTag(enums.packet.symmetricallyEncrypted, enums.packet.symEncryptedIntegrityProtected);
if (symEncryptedPacketlist.length !== 0) { if (symEncryptedPacketlist.length !== 0) {
var symEncryptedPacket = symEncryptedPacketlist[0]; var symEncryptedPacket = symEncryptedPacketlist[0];
@ -166,7 +158,7 @@ Message.prototype.decryptSessionKey = function(privateKey) {
/** /**
* Get literal data that is the body of the message * Get literal data that is the body of the message
* @return {(String|null)} literal body of the message as string * @return {(Uint8Array|null)} literal body of the message as Uint8Array
*/ */
Message.prototype.getLiteralData = function() { Message.prototype.getLiteralData = function() {
var literal = this.packets.findPacket(enums.packet.literal); var literal = this.packets.findPacket(enums.packet.literal);