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

Specify a filename in encrypt fromBinary [Closes #284]

Browse Source
This commit is contained in:
Nick Doiron 2015-02-14 08:35:11 -05:00 committed by evilaliv3
parent 6f8a3abdfa
commit ef566b6a3c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/message.js
View File

@ -381,11 +381,15 @@ function fromText(text) {
/** /**
* creates new message object from binary data * creates new message object from binary data
* @param {String} bytes * @param {String} bytes
* @param {String} filename
* @return {module:message~Message} new message object * @return {module:message~Message} new message object
* @static * @static
*/ */
function fromBinary(bytes) { function fromBinary(bytes, filename) {
var literalDataPacket = new packet.Literal(); var literalDataPacket = new packet.Literal();
if (filename) {
literalDataPacket.setFilename(filename);
}
literalDataPacket.setBytes(bytes, enums.read(enums.literal, enums.literal.binary)); literalDataPacket.setBytes(bytes, enums.read(enums.literal, enums.literal.binary));
var literalDataPacketlist = new packet.List(); var literalDataPacketlist = new packet.List();
literalDataPacketlist.push(literalDataPacket); literalDataPacketlist.push(literalDataPacket);

2
test/general/basic.js
View File

@ -145,7 +145,7 @@ describe('Basic', function() {
// sign and encrypt // sign and encrypt
var msg, encrypted; var msg, encrypted;
msg = openpgp.message.fromBinary(message); msg = openpgp.message.fromBinary(message, "test.txt");
msg = msg.sign([privKey]); msg = msg.sign([privKey]);
msg = msg.encrypt([pubKey]); msg = msg.encrypt([pubKey]);
encrypted = openpgp.armor.encode(openpgp.enums.armor.message, msg.packets.write()); encrypted = openpgp.armor.encode(openpgp.enums.armor.message, msg.packets.write());