diff --git a/src/js/crypto/pgp.js b/src/js/crypto/pgp.js
index c006e06..f3ae0bb 100644
--- a/src/js/crypto/pgp.js
+++ b/src/js/crypto/pgp.js
@@ -254,44 +254,60 @@ define(function(require) {
* Encrypt and sign a pgp message for a list of receivers
*/
PGP.prototype.encrypt = function(plaintext, publicKeysArmored, callback) {
- var publicKeys = [];
+ var publicKeys;
// check keys
- if (!this._privateKey || publicKeysArmored.length < 1) {
+ if (!this._privateKey) {
callback(new Error('Error encrypting. Keys must be set!'));
return;
}
// parse armored public keys
try {
- publicKeysArmored.forEach(function(pubkeyArmored) {
- publicKeys = publicKeys.concat(openpgp.key.readArmored(pubkeyArmored).keys);
- });
+ if (publicKeysArmored && publicKeysArmored.length) {
+ publicKeys = [];
+ publicKeysArmored.forEach(function(pubkeyArmored) {
+ publicKeys = publicKeys.concat(openpgp.key.readArmored(pubkeyArmored).keys);
+ });
+ }
} catch (err) {
callback(new Error('Error encrypting plaintext!'));
return;
}
- // encrypt and sign the plaintext
- openpgp.signAndEncryptMessage(publicKeys, this._privateKey, plaintext, callback);
+ if (publicKeys) {
+ // encrypt and sign the plaintext
+ openpgp.signAndEncryptMessage(publicKeys, this._privateKey, plaintext, callback);
+ } else {
+ // if no public keys are available encrypt for myself
+ openpgp.signAndEncryptMessage([this._publicKey], this._privateKey, plaintext, callback);
+ }
};
/**
- * Decrypt and verify a pgp message for a single sender.
- * You need to check if signatures are both present and valid in the callback!
+ * [decrypt description]
+ * @param {String} ciphertext The encrypted PGP message block
+ * @param {String} publicKeyArmored The public key used to sign the message
+ * @param {Function} callback(error, plaintext, signaturesValid) signaturesValid is undefined in case there are no signature, null in case there are signatures but the wrong public key or no key was used to verify, true if the signature was successfully verified, or false if the signataure verification failed.
*/
PGP.prototype.decrypt = function(ciphertext, publicKeyArmored, callback) {
var publicKeys, message, signaturesValid;
// check keys
- if (!this._privateKey || !publicKeyArmored) {
+ if (!this._privateKey) {
callback(new Error('Error decrypting. Keys must be set!'));
return;
}
// read keys and ciphertext message
try {
- publicKeys = openpgp.key.readArmored(publicKeyArmored).keys;
+ if (publicKeyArmored) {
+ // parse public keys if available ...
+ publicKeys = openpgp.key.readArmored(publicKeyArmored).keys;
+ } else {
+ // use own public key to know if signatures are available
+ publicKeys = [this._publicKey];
+ }
message = openpgp.message.readArmored(ciphertext);
} catch (err) {
callback(new Error('Error parsing encrypted PGP message!'));
@@ -303,19 +319,19 @@ define(function(require) {
function onDecrypted(err, decrypted) {
if (err) {
- callback(new Error('Error decrypting PGP message!'));
+ callback(new Error('Error decrypting and verifying PGP message!'));
return;
}
// check if signatures are valid
if (decrypted.signatures.length > 0) {
- signaturesValid = true;
+ signaturesValid = true; // signature is correct
for (var i = 0; i < decrypted.signatures.length; i++) {
if (decrypted.signatures[i].valid === false) {
signaturesValid = false; // signature is wrong ... message was tampered with
break;
} else if (decrypted.signatures[i].valid === null) {
- signaturesValid = undefined; // signature not found for the specified public key
+ signaturesValid = null; // signature not found for the specified public key
break;
}
}
diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index 01814c4..4e63b89 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -831,19 +831,19 @@ define(function(require) {
return;
}
- if (!senderPublicKey) {
- // this should only happen if a mail from another channel is in the inbox
- showError('Public key for sender not found!');
- return;
- }
-
// get the receiver's public key to check the message signature
var encryptedNode = filterBodyParts(message.bodyParts, 'encrypted')[0];
- self._pgp.decrypt(encryptedNode.content, senderPublicKey.publicKey, function(err, decrypted, signaturesValid) {
+ var senderKey = senderPublicKey ? senderPublicKey.publicKey : undefined;
+ self._pgp.decrypt(encryptedNode.content, senderKey, function(err, decrypted, signaturesValid) {
if (err || !decrypted) {
return showError(err.message || 'An error occurred during the decryption.');
}
+ // if the decryption worked and signatures are present, everything's fine.
+ // no error is thrown if signatures are not present
+ message.signed = typeof signaturesValid !== 'undefined';
+ message.signaturesValid = signaturesValid;
+
// if the encrypted node contains pgp/inline, we must not parse it
// with the mailreader as it is not well-formed MIME
if (encryptedNode._isPgpInline) {
@@ -875,9 +875,6 @@ define(function(require) {
});
inlineExternalImages(message);
- // if the decryption worked and signatures are present, everything's fine.
- // no error is thrown if signatures are not present
- message.signed = signaturesValid;
message.decrypted = true;
// we're done here!
diff --git a/src/lib/openpgp/openpgp.js b/src/lib/openpgp/openpgp.js
index 9ed83d7..6de4190 100644
--- a/src/lib/openpgp/openpgp.js
+++ b/src/lib/openpgp/openpgp.js
@@ -1503,7 +1503,7 @@ module.exports = {
show_version: true,
show_comment: true,
- versionstring: "OpenPGP.js v0.6.5",
+ versionstring: "OpenPGP.js v0.7.0",
commentstring: "http://openpgpjs.org",
keyserver: "keyserver.linux.it", // "pgp.mit.edu:11371"
@@ -12439,24 +12439,25 @@ Message.prototype.verify = function(keys) {
var literalDataList = msg.packets.filterByTag(enums.packet.literal);
if (literalDataList.length !== 1) throw new Error('Can only verify message with one literal data packet.');
var signatureList = msg.packets.filterByTag(enums.packet.signature);
- keys.forEach(function(key) {
+ for (var i = 0; i < signatureList.length; i++) {
var keyPacket = null;
- for (var i = 0; i < signatureList.length; i++) {
- keyPacket = key.getKeyPacket([signatureList[i].issuerKeyId]);
+ for (var j = 0; j < keys.length; j++) {
+ keyPacket = keys[j].getKeyPacket([signatureList[i].issuerKeyId]);
if (keyPacket) {
break;
}
}
+
var verifiedSig = {};
if (keyPacket) {
verifiedSig.keyid = signatureList[i].issuerKeyId;
verifiedSig.valid = signatureList[i].verify(keyPacket, literalDataList[0]);
} else {
- verifiedSig.keyid = key.primaryKey.keyid;
+ verifiedSig.keyid = signatureList[i].issuerKeyId;
verifiedSig.valid = null;
}
result.push(verifiedSig);
- });
+ }
return result;
};
diff --git a/src/sass/views/_read.scss b/src/sass/views/_read.scss
index 5ee37f2..b3c58c3 100644
--- a/src/sass/views/_read.scss
+++ b/src/sass/views/_read.scss
@@ -117,6 +117,17 @@
}
}
+ .signature-status {
+ flex-shrink: 0;
+ padding: 0.9em;
+ text-align: center;
+
+ p {
+ color: $label-primary-back-color;
+ margin: 0;
+ }
+ }
+
.display-images {
flex-shrink: 0;
padding: 0.9em;
diff --git a/src/tpl/read.html b/src/tpl/read.html
index 98647d3..3224c46 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -53,6 +53,11 @@
+
+
Invalid PGP signature. This message could have been tampered with.