|
Lines 922-931
Enigmail.prototype = {
Link Here
|
| 922 |
if (this.gpgAgentProcess != null) { |
922 |
if (this.gpgAgentProcess != null) { |
| 923 |
Ec.DEBUG_LOG("enigmail.js: Enigmail.finalize: stopping gpg-agent PID="+this.gpgAgentProcess+"\n"); |
923 |
Ec.DEBUG_LOG("enigmail.js: Enigmail.finalize: stopping gpg-agent PID="+this.gpgAgentProcess+"\n"); |
| 924 |
try { |
924 |
try { |
| 925 |
var installLoc = Components.classes[NS_EXTENSION_MANAGER_CONTRACTID] |
925 |
var directoryService = |
| 926 |
.getService(Components.interfaces.nsIExtensionManager) |
926 |
Components.classes["@mozilla.org/file/directory_service;1"]. |
| 927 |
.getInstallLocation(ENIGMAIL_EXTENSION_ID); |
927 |
getService(Components.interfaces.nsIProperties); |
| 928 |
var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers"); |
928 |
|
|
|
929 |
var extensionLoc = directoryService.get("resource:app", Components.interfaces.nsIFile); |
| 930 |
extensionLoc.append("extensions"); |
| 931 |
extensionLoc.append(ENIGMAIL_EXTENSION_ID); |
| 932 |
extensionLoc.append("wrappers"); |
| 929 |
extensionLoc.append("gpg-agent-wrapper.sh"); |
933 |
extensionLoc.append("gpg-agent-wrapper.sh"); |
| 930 |
try { |
934 |
try { |
| 931 |
extensionLoc.permissions=0755; |
935 |
extensionLoc.permissions=0755; |
|
Lines 1056-1062
Enigmail.prototype = {
Link Here
|
| 1056 |
|
1060 |
|
| 1057 |
if (matches && (matches.length > 1)) { |
1061 |
if (matches && (matches.length > 1)) { |
| 1058 |
gLogLevel = matches[1]; |
1062 |
gLogLevel = matches[1]; |
| 1059 |
WARNING_LOG("enigmail.js: Enigmail: gLogLevel="+gLogLevel+"\n"); |
1063 |
Ec.WARNING_LOG("enigmail.js: Enigmail: gLogLevel="+gLogLevel+"\n"); |
| 1060 |
} |
1064 |
} |
| 1061 |
|
1065 |
|
| 1062 |
// Initialize global environment variables list |
1066 |
// Initialize global environment variables list |
|
Lines 1452-1461
Enigmail.prototype = {
Link Here
|
| 1452 |
"--max-cache-ttl", "999999" ]; // ca. 11 days |
1456 |
"--max-cache-ttl", "999999" ]; // ca. 11 days |
| 1453 |
|
1457 |
|
| 1454 |
try { |
1458 |
try { |
| 1455 |
var installLoc = Components.classes[NS_EXTENSION_MANAGER_CONTRACTID] |
1459 |
var directoryService = |
| 1456 |
.getService(Components.interfaces.nsIExtensionManager) |
1460 |
Components.classes["@mozilla.org/file/directory_service;1"]. |
| 1457 |
.getInstallLocation(ENIGMAIL_EXTENSION_ID); |
1461 |
getService(Components.interfaces.nsIProperties); |
| 1458 |
var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers"); |
1462 |
var extensionLoc = |
|
|
1463 |
directoryService.get("resource:app", Components.interfaces.nsIFile); |
| 1464 |
extensionLoc.append("extensions"); |
| 1465 |
extensionLoc.append(ENIGMAIL_EXTENSION_ID); |
| 1466 |
extensionLoc.append("wrappers"); |
| 1459 |
extensionLoc.append("gpg-agent-wrapper.sh"); |
1467 |
extensionLoc.append("gpg-agent-wrapper.sh"); |
| 1460 |
try { |
1468 |
try { |
| 1461 |
extensionLoc.permissions=0755; |
1469 |
extensionLoc.permissions=0755; |
|
Lines 1472-1480
Enigmail.prototype = {
Link Here
|
| 1472 |
} |
1480 |
} |
| 1473 |
catch (ex) { |
1481 |
catch (ex) { |
| 1474 |
Ec.ERROR_LOG("enigmail.js: detectGpgAgent: "+command+" failed\n"); |
1482 |
Ec.ERROR_LOG("enigmail.js: detectGpgAgent: "+command+" failed\n"); |
|
|
1483 |
Ec.ERROR_LOG("reason: "+ex+"\n"); |
| 1475 |
exitCode = -1; |
1484 |
exitCode = -1; |
| 1476 |
} |
1485 |
} |
| 1477 |
|
|
|
| 1478 |
Ec.CONSOLE_LOG("enigmail> "+printCmdLine(command, args)+"\n"); |
1486 |
Ec.CONSOLE_LOG("enigmail> "+printCmdLine(command, args)+"\n"); |
| 1479 |
|
1487 |
|
| 1480 |
if (exitCode == 0) { |
1488 |
if (exitCode == 0) { |
|
Lines 1625-1636
Enigmail.prototype = {
Link Here
|
| 1625 |
} |
1633 |
} |
| 1626 |
} |
1634 |
} |
| 1627 |
if ((this.agentType == "gpg") && (exitCode == 256)) { |
1635 |
if ((this.agentType == "gpg") && (exitCode == 256)) { |
| 1628 |
WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg and exit code is 256. You seem to use cygwin-gpg, activating countermeasures.\n"); |
1636 |
Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg and exit code is 256. You seem to use cygwin-gpg, activating countermeasures.\n"); |
| 1629 |
if (statusFlags & (nsIEnigmail.BAD_PASSPHRASE | nsIEnigmail.UNVERIFIED_SIGNATURE)) { |
1637 |
if (statusFlags & (nsIEnigmail.BAD_PASSPHRASE | nsIEnigmail.UNVERIFIED_SIGNATURE)) { |
| 1630 |
WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->2\n"); |
1638 |
Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->2\n"); |
| 1631 |
exitCode = 2; |
1639 |
exitCode = 2; |
| 1632 |
} else { |
1640 |
} else { |
| 1633 |
WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->0\n"); |
1641 |
Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->0\n"); |
| 1634 |
exitCode = 0; |
1642 |
exitCode = 0; |
| 1635 |
} |
1643 |
} |
| 1636 |
} |
1644 |
} |
|
Lines 1643-1649
Enigmail.prototype = {
Link Here
|
| 1643 |
nsIEnigmail.DECRYPTION_FAILED | |
1651 |
nsIEnigmail.DECRYPTION_FAILED | |
| 1644 |
nsIEnigmail.NO_PUBKEY | |
1652 |
nsIEnigmail.NO_PUBKEY | |
| 1645 |
nsIEnigmail.NO_SECKEY)))) { |
1653 |
nsIEnigmail.NO_SECKEY)))) { |
| 1646 |
WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg version "+this.agentVersion+", activating countermeasures for file renaming bug.\n"); |
1654 |
Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg version "+this.agentVersion+", activating countermeasures for file renaming bug.\n"); |
| 1647 |
exitCode = 0; |
1655 |
exitCode = 0; |
| 1648 |
} |
1656 |
} |
| 1649 |
} |
1657 |
} |
|
Lines 4773-4779
function signKeyCallback(inputData, keyE
Link Here
|
| 4773 |
} |
4781 |
} |
| 4774 |
else if (keyEdit.doCheck(GET_LINE, "sign_uid.class" )) { |
4782 |
else if (keyEdit.doCheck(GET_LINE, "sign_uid.class" )) { |
| 4775 |
ret.exitCode = 0; |
4783 |
ret.exitCode = 0; |
| 4776 |
ret.writeTxt = inputData.trustLevel; |
4784 |
ret.writeTxt = new String(inputData.trustLevel); |
| 4777 |
} |
4785 |
} |
| 4778 |
else if (keyEdit.doCheck(GET_HIDDEN, "passphrase.adminpin.ask")) { |
4786 |
else if (keyEdit.doCheck(GET_HIDDEN, "passphrase.adminpin.ask")) { |
| 4779 |
GetPin(inputData.parent, Ec.getString("enterAdminPin"), ret); |
4787 |
GetPin(inputData.parent, Ec.getString("enterAdminPin"), ret); |
|
Lines 4798-4804
function keyTrustCallback(inputData, key
Link Here
|
| 4798 |
|
4806 |
|
| 4799 |
if (keyEdit.doCheck(GET_LINE, "edit_ownertrust.value" )) { |
4807 |
if (keyEdit.doCheck(GET_LINE, "edit_ownertrust.value" )) { |
| 4800 |
ret.exitCode = 0; |
4808 |
ret.exitCode = 0; |
| 4801 |
ret.writeTxt = inputData.trustLevel; |
4809 |
ret.writeTxt = new String(inputData.trustLevel); |
| 4802 |
} |
4810 |
} |
| 4803 |
else if (keyEdit.doCheck(GET_BOOL, "edit_ownertrust.set_ultimate.okay")) { |
4811 |
else if (keyEdit.doCheck(GET_BOOL, "edit_ownertrust.set_ultimate.okay")) { |
| 4804 |
ret.exitCode = 0; |
4812 |
ret.exitCode = 0; |
|
Lines 4883-4889
function revokeCertCallback(inputData, k
Link Here
|
| 4883 |
|
4891 |
|
| 4884 |
if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.code" )) { |
4892 |
if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.code" )) { |
| 4885 |
ret.exitCode = 0; |
4893 |
ret.exitCode = 0; |
| 4886 |
ret.writeTxt = inputData.reasonCode; |
4894 |
ret.writeTxt = new String(inputData.reasonCode); |
| 4887 |
} |
4895 |
} |
| 4888 |
else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.text" )) { |
4896 |
else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.text" )) { |
| 4889 |
ret.exitCode = 0; |
4897 |
ret.exitCode = 0; |
|
Lines 4949-4955
function revokeSubkeyCallback(inputData,
Link Here
|
| 4949 |
} |
4957 |
} |
| 4950 |
else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.code" )) { |
4958 |
else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.code" )) { |
| 4951 |
ret.exitCode = 0; |
4959 |
ret.exitCode = 0; |
| 4952 |
ret.writeTxt = inputData.reasonCode; |
4960 |
ret.writeTxt = new String(inputData.reasonCode); |
| 4953 |
} |
4961 |
} |
| 4954 |
else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.text" )) { |
4962 |
else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.text" )) { |
| 4955 |
ret.exitCode = 0; |
4963 |
ret.exitCode = 0; |
|
Lines 5225-5231
function genCardKeyCallback(inputData, k
Link Here
|
| 5225 |
else if (keyEdit.doCheck(GET_LINE, "cardedit.genkeys.backup_enc") || |
5233 |
else if (keyEdit.doCheck(GET_LINE, "cardedit.genkeys.backup_enc") || |
| 5226 |
keyEdit.doCheck(GET_BOOL, "cardedit.genkeys.backup_enc")) { |
5234 |
keyEdit.doCheck(GET_BOOL, "cardedit.genkeys.backup_enc")) { |
| 5227 |
ret.exitCode = 0; |
5235 |
ret.exitCode = 0; |
| 5228 |
ret.writeTxt = inputData.backupKey; |
5236 |
ret.writeTxt = new String(inputData.backupKey); |
| 5229 |
} |
5237 |
} |
| 5230 |
else if (keyEdit.doCheck(GET_BOOL, "cardedit.genkeys.replace_keys")) { |
5238 |
else if (keyEdit.doCheck(GET_BOOL, "cardedit.genkeys.replace_keys")) { |
| 5231 |
ret.exitCode = 0; |
5239 |
ret.exitCode = 0; |
|
Lines 5243-5249
function genCardKeyCallback(inputData, k
Link Here
|
| 5243 |
} |
5251 |
} |
| 5244 |
else if (keyEdit.doCheck(GET_LINE, "keygen.valid")) { |
5252 |
else if (keyEdit.doCheck(GET_LINE, "keygen.valid")) { |
| 5245 |
ret.exitCode = 0; |
5253 |
ret.exitCode = 0; |
| 5246 |
ret.writeTxt = inputData.expiry; |
5254 |
ret.writeTxt = new String(inputData.expiry); |
| 5247 |
} |
5255 |
} |
| 5248 |
else if (keyEdit.doCheck(GET_LINE, "cardedit.genkeys.size")) { |
5256 |
else if (keyEdit.doCheck(GET_LINE, "cardedit.genkeys.size")) { |
| 5249 |
ret.exitCode = 0; |
5257 |
ret.exitCode = 0; |
