Commit 744fb1d3 authored by Nico Josuttis's avatar Nico Josuttis

simplified accepted keys stuff

parent 0d18ac6e
......@@ -1393,17 +1393,7 @@ Enigmail.msg = {
}
}
// if allowed, try to send automatically if all keys known
if (((sendFlags&ENCRYPT) == 0) && (!flagsObj.value || flagsObj.encrypt == 1) && bccAddr.length == 0) {
var keyList = Enigmail.hlp.validKeysForAllRecipients(toAddr,
true); // refresh key list
if (keyList != null) {
toAddr = keyList.join(", ");
sendFlags |= ENCRYPT;
}
}
// get keys for bcc addresses:
// get keys according to rules for bcc addresses:
// - matchedKeysObj will contain the keys and the remaining bccAddr elements
// - NOTE: bcc recipients are ignored when in general computing whether to sign or encrypt or pgpMime
if (!Enigmail.hlp.getRecipientsKeys(bccAddr,
......@@ -1418,6 +1408,16 @@ Enigmail.msg = {
EnigmailCommon.DEBUG_LOG("enigmailMsgComposeOverlay.js: Enigmail.msg.processRules(): after getRecipientsKeys() bccAddr=\""+bccAddr+"\"\n");
}
// if allowed, try to send automatically if all keys known
if (((sendFlags&ENCRYPT) == 0) && (!flagsObj.value || flagsObj.encrypt == 1) && bccAddr.length == 0) {
var keyList = Enigmail.hlp.validKeysForAllRecipients(toAddr,
true); // refresh key list
if (keyList != null) {
toAddr = keyList.join(", ");
sendFlags |= ENCRYPT;
}
}
return {
sendFlags: sendFlags,
optSendFlags: optSendFlags,
......
......@@ -91,9 +91,6 @@
</tooltip>
<!-- sending preferences: accepted keys -->
<tooltip id="acceptedKeysPersonal.tooltip">
<description>&enigmail.acceptedKeysPersonal.tooltip;</description>
</tooltip>
<tooltip id="acceptedKeysValid.tooltip">
<description>&enigmail.acceptedKeysValid.tooltip;</description>
</tooltip>
......@@ -287,10 +284,6 @@
pref="true"
preftype="int"
prefstring="extensions.enigmail.acceptedKeys">
<radio id="acceptedKeysPersonal"
value="0"
label="&enigmail.acceptedKeysPersonal.label;"
tooltip="acceptedKeysPersonal.tooltip"/>
<radio id="acceptedKeysValid"
value="0"
label="&enigmail.acceptedKeysValid.label;"
......
......@@ -208,12 +208,10 @@
<!ENTITY enigmail.defaultNotSignedsend.label "Do not sign messages by default">
<!ENTITY enigmail.acceptedKeysOption.label "To send encrypted, accept">
<!ENTITY enigmail.acceptedKeysPersonal.label "only keys signed by me personally">
<!ENTITY enigmail.acceptedKeysPersonal.tooltip "This option is provided to deal with the danger of faked keys, when you only trust yourself. You only accept keys that are signed by yourself.">
<!ENTITY enigmail.acceptedKeysValid.label "keys signed by me or other people I trust">
<!ENTITY enigmail.acceptedKeysValid.tooltip "This option is provided to deal with the danger of faked keys using the Web-of-Trust. You only accept keys that are signed by yourself or by other people you trust.">
<!ENTITY enigmail.acceptedKeysValid.tooltip "This option is provided to deal with the danger of faked keys using the Web-of-Trust. You only accept keys that are signed by yourself or by other people you trust. Technically, you only accept keys 'valid' for encryption.">
<!ENTITY enigmail.acceptedKeysAll.label "all keys except disabled, revoked, or expired">
<!ENTITY enigmail.acceptedKeysAll.tooltip "This option allows encryption whenever you have a key that is neither disabled by you nor revoked/expired by the owner. Because these keys are not necessarily validated/signed by you or people you trust, there is a risk that you use faked keys so that others than the requested receivers can read the content of the encrypted email. However, that is still better than sending emails unencrypted.">
<!ENTITY enigmail.acceptedKeysAll.tooltip "This option allows encryption whenever you have a key that is neither disabled by you nor revoked/expired by the owner. Because these keys are not necessarily validated/signed, there is a risk that you use faked keys, so that others than the requested recipients can read the content of the encrypted email. However, that's still better than sending emails unencrypted. Technically, this uses the GPG option '--trust-model always'.">
<!ENTITY enigmail.autoSendEncryptedOption.label "Automatically send encrypted">
<!ENTITY enigmail.autoSendEncryptedNever.label "Never (except according to recipient rules)">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment