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

Changing main api to be more key dependent

Browse Source
This commit is contained in:
seancolyer 2013-10-18 21:46:38 -04:00
parent 7cfa0ab705
commit 91070f9750
3 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/openpgp.js
View File

@ -67,6 +67,15 @@ function _openpgp() {
return packetList; return packetList;
} }
//TODO I think longterm we might actually want to just make key a subclass of packetlist
//passphrase is optional, this should work for both public and private
function getKeyFromPacketlist(keyPacketlist, passphrase){
var parsedKey = new key();
parsedKey.packets = keyPacketlist;
parsedKey.decrypt(passphrase);
return parsedKey;
}
function encryptMessage(publicKeys, message) { function encryptMessage(publicKeys, message) {
var packetList = new packet.list(); var packetList = new packet.list();
@ -109,23 +118,23 @@ function _openpgp() {
} }
function encryptAndSignMessage(publicKeys, privateKeyPacketlist, message) { function encryptAndSignMessage(publicKeys, privateKey, message) {
} }
function decryptMessage(privateKeyPacketlist, messagePacketlist) { function decryptMessage(privateKey, messagePacketlist) {
} }
function decryptAndVerifyMessage(privateKeyPacketlist, publicKeyPacketlist, messagePacketlist) { function decryptAndVerifyMessage(privateKey, publicKeys, messagePacketlist) {
} }
function verifyMessage(publicKeyPacketlist, messagePacketlist) { function verifyMessage(publicKeys, messagePacketlist) {
} }
function signMessage(privateKeyPacketlist, messagePacketlist) { function signMessage(privateKey, messagePacketlist) {
} }
@ -144,7 +153,6 @@ function _openpgp() {
* privateKeyArmored: [string], publicKeyArmored: [string]} * privateKeyArmored: [string], publicKeyArmored: [string]}
*/ */
function generateKeyPair(keyType, numBits, userId, passphrase) { function generateKeyPair(keyType, numBits, userId, passphrase) {
debugger;
var packetlist = new packet.list(); var packetlist = new packet.list();
var secretKeyPacket = new packet.secret_key(); var secretKeyPacket = new packet.secret_key();
@ -330,6 +338,7 @@ function _openpgp() {
this.encryptMessage = encryptMessage; this.encryptMessage = encryptMessage;
this.readArmoredPackets = readArmoredPackets; this.readArmoredPackets = readArmoredPackets;
this.readDearmoredPackets = readDearmoredPackets; this.readDearmoredPackets = readDearmoredPackets;
this.getKeyFromPacketlist = getKeyFromPacketlist;
} }
module.exports = new _openpgp(); module.exports = new _openpgp();

11
test/general/openpgp.basic.js
View File

@ -13,18 +13,13 @@ unit.register("Encryption/decryption", function() {
+ 'message: ' + message; + 'message: ' + message;
var keyPacketlist = openpgp.readArmoredPackets(key); var keyPacketlist = openpgp.readArmoredPackets(key);
if(!priv_key.decryptSecretMPIs(passphrase)) { debugger;
return new test_result('Generating a decryptable private key failed' var privKey = openpgp.getKeyFromPacketlist(keyPacketlist, passphrase);
+ info,
false);
}
var encrypted = openpgp.write_signed_and_encrypted_message(priv_key, var encrypted = openpgp.encryptMessage(keyPacketlist, message);
pub_key, message);
openpgp.keyring.importPublicKey(key.publicKeyArmored); openpgp.keyring.importPublicKey(key.publicKeyArmored);
var msg = openpgp.read_message(encrypted); var msg = openpgp.read_message(encrypted);
var keymat = null; var keymat = null;
var sesskey = null; var sesskey = null;

34
test/test-bundle.js
View File

File diff suppressed because one or more lines are too long