Index: enigmail/package/verify.jsm =================================================================== --- enigmail.orig/package/verify.jsm +++ enigmail/package/verify.jsm @@ -52,7 +52,7 @@ const EnigmailVerifyAttachment = { const detailArr = retObj.sigDetails.split(/ /); const dateTime = EnigmailTime.getDateTime(detailArr[2], true, true); const msg1 = retObj.errorMsg.split(/\n/)[0]; - const msg2 = EnigmailLocale.getString("keyAndSigDate", ["0x" + retObj.keyId.substr(-8, 8), dateTime]); + const msg2 = EnigmailLocale.getString("keyAndSigDate", ["0x" + retObj.keyId.substr(-16, 16), dateTime]); errorMsgObj.value = msg1 + "\n" + msg2; } else { Index: enigmail/ui/content/enigmailMsgHdrViewOverlay.js =================================================================== --- enigmail.orig/ui/content/enigmailMsgHdrViewOverlay.js +++ enigmail/ui/content/enigmailMsgHdrViewOverlay.js @@ -237,7 +237,7 @@ Enigmail.hdrView = { var detailArr = sigDetails.split(/ /); let dateTime = EnigmailTime.getDateTime(detailArr[2], true, true); - var txt = EnigmailLocale.getString("keyAndSigDate", [keyId.substr(-8, 8), dateTime]); + var txt = EnigmailLocale.getString("keyAndSigDate", [keyId.substr(-16, 16), dateTime]); statusArr.push(txt); statusInfo += "\n" + txt; var fpr = ""; Index: enigmail/ui/content/enigmailCommon.js =================================================================== --- enigmail.orig/ui/content/enigmailCommon.js +++ enigmail/ui/content/enigmailCommon.js @@ -514,7 +514,7 @@ function EnigRevokeKey(keyId, userId, ca if (!enigmailSvc) return false; - var userDesc = "0x" + keyId.substr(-8, 8) + " - " + userId; + var userDesc = "0x" + keyId.substr(-16, 16) + " - " + userId; if (!EnigConfirm(EnigGetString("revokeKeyQuestion", userDesc), EnigGetString("keyMan.button.revokeKey"))) return false; @@ -569,7 +569,7 @@ function EnigGetFilePath(nsFileObj) { function EnigCreateRevokeCert(keyId, userId, callbackFunc) { var defaultFileName = userId.replace(/[<\>]/g, ""); - defaultFileName += " (0x" + keyId.substr(-8, 8) + ") rev.asc"; + defaultFileName += " (0x" + keyId.substr(-16, 16) + ") rev.asc"; var outFile = EnigFilePicker(EnigGetString("saveRevokeCertAs"), "", true, "*.asc", defaultFileName, [EnigGetString("asciiArmorFile"), "*.asc"]); Index: enigmail/ui/content/enigmailEditKeyExpiryDlg.js =================================================================== --- enigmail.orig/ui/content/enigmailEditKeyExpiryDlg.js +++ enigmail/ui/content/enigmailEditKeyExpiryDlg.js @@ -132,7 +132,7 @@ function addSubkey(treeChildren, subkey, aRow.appendChild(selectCol); } aRow.appendChild(createCell(subkeyStr)); // subkey type - aRow.appendChild(createCell("0x" + subkey.keyId.substr(-8, 8))); // key id + aRow.appendChild(createCell("0x" + subkey.keyId.substr(-16, 16))); // key id aRow.appendChild(createCell(EnigmailLocale.getString("keyAlgorithm_" + subkey.algorithm))); // algorithm aRow.appendChild(createCell(subkey.keySize)); // size aRow.appendChild(createCell(subkey.created)); // created Index: enigmail/ui/content/enigmailEditKeyTrustDlg.js =================================================================== --- enigmail.orig/ui/content/enigmailEditKeyTrustDlg.js +++ enigmail/ui/content/enigmailEditKeyTrustDlg.js @@ -61,7 +61,7 @@ function onLoad() { var keyIdList = document.getElementById("keyIdList"); for (let i = 0; i < gKeyList.length; i++) { - var keyId = gKeyList[i].userId + " - 0x" + gKeyList[i].keyId.substr(-8, 8); + var keyId = gKeyList[i].userId + " - 0x" + gKeyList[i].keyId.substr(-16, 16); keyIdList.appendItem(keyId); } } Index: enigmail/ui/content/enigmailGenCardKey.js =================================================================== --- enigmail.orig/ui/content/enigmailGenCardKey.js +++ enigmail/ui/content/enigmailGenCardKey.js @@ -209,7 +209,7 @@ function startKeyGen() { if (document.getElementById("useForSigning").checked && generateObserver.keyId) { gUsedId.setBoolAttribute("enablePgp", true); gUsedId.setIntAttribute("pgpKeyMode", 1); - gUsedId.setCharAttribute("pgpkeyId", "0x" + generateObserver.keyId.substr(-8, 8)); + gUsedId.setCharAttribute("pgpkeyId", "0x" + generateObserver.keyId.substr(-16, 16)); } var msg = EnigmailLocale.getString("keygen.completed", generateObserver.keyId); Index: enigmail/ui/content/enigmailImportPhoto.js =================================================================== --- enigmail.orig/ui/content/enigmailImportPhoto.js +++ enigmail/ui/content/enigmailImportPhoto.js @@ -8,7 +8,7 @@ function onLoad() { document.getElementById("photoImage").setAttribute("src", window.arguments[0].photoUri); - document.getElementById("keyDesc").setAttribute("value", "0x" + window.arguments[0].keyId.substr(-8, 8) + + document.getElementById("keyDesc").setAttribute("value", "0x" + window.arguments[0].keyId.substr(-16, 16) + " - " + window.arguments[0].userId); } Index: enigmail/ui/content/enigmailKeyManager.js =================================================================== --- enigmail.orig/ui/content/enigmailKeyManager.js +++ enigmail/ui/content/enigmailKeyManager.js @@ -221,7 +221,7 @@ function enigUserSelCreateRow(keyObj, su if (subKeyNum < 0) { // primary key userCol.setAttribute("label", keyObj.userId); - keyCol.setAttribute("label", keyObj.keyId.substr(-8, 8)); + keyCol.setAttribute("label", keyObj.keyId.substr(-16, 16)); if (keyObj.secretAvailable) { typeCol.setAttribute("label", EnigGetString("keyType.publicAndSec")); } @@ -689,7 +689,7 @@ function enigCreateKeyMsg() { var keyAttachment = Cc["@mozilla.org/messengercompose/attachment;1"].createInstance(Ci.nsIMsgAttachment); keyAttachment.url = tmpFileURI.spec; if (keyList.length == 1) { - keyAttachment.name = "0x" + keyList[0].substr(-8, 8) + ".asc"; + keyAttachment.name = "0x" + keyList[0].substr(-16, 16) + ".asc"; } else { keyAttachment.name = "pgpkeys.asc"; @@ -869,10 +869,10 @@ function enigmailExportKeys() { defaultFileName = gKeyList[keyList[0]].userId.replace(/[<\>]/g, ""); if (exportSecretKey) { - defaultFileName = EnigGetString("specificPubSecKeyFilename", defaultFileName, gKeyList[keyList[0]].keyId.substr(-8, 8)) + ".asc"; + defaultFileName = EnigGetString("specificPubSecKeyFilename", defaultFileName, gKeyList[keyList[0]].keyId.substr(-16, 16)) + ".asc"; } else { - defaultFileName = EnigGetString("specificPubKeyFilename", defaultFileName, gKeyList[keyList[0]].keyId.substr(-8, 8)) + ".asc"; + defaultFileName = EnigGetString("specificPubKeyFilename", defaultFileName, gKeyList[keyList[0]].keyId.substr(-16, 16)) + ".asc"; } } else { @@ -1515,7 +1515,7 @@ function enigmailKeyServerAccess(accessT var keyList = []; var keyIds = []; for (var i = 0; i < selKeyList.length; i++) { - //keyList.push("0x" + gKeyList[selKeyList[i]].keyId.substr(-8, 8) + " - " + gKeyList[selKeyList[i]].userId); + //keyList.push("0x" + gKeyList[selKeyList[i]].keyId.substr(-16, 16) + " - " + gKeyList[selKeyList[i]].userId); keyIds.push(gKeyList[selKeyList[i]].keyId); } if (accessType != nsIEnigmail.REFRESH_KEY) { Index: enigmail/ui/content/enigmailKeygen.js =================================================================== --- enigmail.orig/ui/content/enigmailKeygen.js +++ enigmail/ui/content/enigmailKeygen.js @@ -133,7 +133,7 @@ function enigmailKeygenTerminate(exitCod if (gUseForSigning.checked) { curId.setBoolAttribute("enablePgp", true); curId.setIntAttribute("pgpKeyMode", 1); - curId.setCharAttribute("pgpkeyId", "0x" + gGeneratedKey.substr(-8, 8)); + curId.setCharAttribute("pgpkeyId", "0x" + gGeneratedKey.substr(-16, 16)); enigmailKeygenUpdate(false, true); @@ -204,7 +204,7 @@ function genAndSaveRevCert(keyId, uid) { function saveRevCert(inputKeyFile, keyId, uid, resolve, reject) { let defaultFileName = uid.replace(/[\\\/<\>]/g, ""); - defaultFileName += " (0x" + keyId.substr(-8, 8) + ") rev.asc"; + defaultFileName += " (0x" + keyId.substr(-16, 16) + ") rev.asc"; let outFile = EnigFilePicker(EnigGetString("saveRevokeCertAs"), "", true, "*.asc", Index: enigmail/ui/content/enigmailManageUidDlg.js =================================================================== --- enigmail.orig/ui/content/enigmailManageUidDlg.js +++ enigmail/ui/content/enigmailManageUidDlg.js @@ -23,7 +23,7 @@ var gEnigmailUid; function onLoad() { window.arguments[1].refresh = false; reloadUidList(); - var keyId = gUserId + " - 0x" + window.arguments[0].keyId.substr(-8, 8); + var keyId = gUserId + " - 0x" + window.arguments[0].keyId.substr(-16, 16); document.getElementById("keyId").value = keyId; if (!window.arguments[0].ownKey) { Index: enigmail/ui/content/enigmailMsgComposeOverlay.js =================================================================== --- enigmail.orig/ui/content/enigmailMsgComposeOverlay.js +++ enigmail/ui/content/enigmailMsgComposeOverlay.js @@ -803,7 +803,7 @@ Enigmail.msg = { var keyAttachment = Components.classes["@mozilla.org/messengercompose/attachment;1"].createInstance(Components.interfaces.nsIMsgAttachment); keyAttachment.url = tmpFileURI.spec; if ((uid.length == 1) && (uid[0].search(/^(0x)?[a-fA-F0-9]+$/) === 0)) { - keyAttachment.name = "0x" + uid[0].substr(-8, 8) + ".asc"; + keyAttachment.name = "0x" + uid[0].substr(-16, 16) + ".asc"; } else { keyAttachment.name = "pgpkeys.asc"; Index: enigmail/ui/content/enigmailSelectRule.js =================================================================== --- enigmail.orig/ui/content/enigmailSelectRule.js +++ enigmail/ui/content/enigmailSelectRule.js @@ -75,5 +75,5 @@ function createNewRuleWithKey() { function editDlgOnLoad() { enigmailDlgOnLoad(); - document.getElementById("editDialogTitle").setAttribute("value", EnigGetString("addKeyToRule", window.arguments[0].userId, "0x" + window.arguments[0].keyId.substr(-8, 8))); + document.getElementById("editDialogTitle").setAttribute("value", EnigGetString("addKeyToRule", window.arguments[0].userId, "0x" + window.arguments[0].keyId.substr(-16, 16))); } Index: enigmail/ui/content/enigmailSetupWizard.js =================================================================== --- enigmail.orig/ui/content/enigmailSetupWizard.js +++ enigmail/ui/content/enigmailSetupWizard.js @@ -728,7 +728,7 @@ function loadKeys() { cell.setAttribute('label', keyList[i].userId); cell.setAttribute('observes', "bcKeyEnabled"); cell = row.appendChild(document.createElement('treecell')); - cell.setAttribute('label', "0x" + keyList[i].keyId.substr(-8, 8)); + cell.setAttribute('label', "0x" + keyList[i].keyId.substr(-16, 16)); cell.setAttribute('observes', "bcKeyEnabled"); cell = row.appendChild(document.createElement('treecell')); cell.setAttribute('label', keyList[i].created); @@ -1146,7 +1146,7 @@ function wizardApplyId(identity, keyId) identity.setBoolAttribute("enablePgp", true); identity.setIntAttribute("pgpKeyMode", 1); - identity.setCharAttribute("pgpkeyId", "0x" + keyId.substr(-8, 8)); + identity.setCharAttribute("pgpkeyId", "0x" + keyId.substr(-16, 16)); identity.setIntAttribute("openPgpHeaderMode", 0); // process signing settings: Index: enigmail/ui/content/enigmailSignKeyDlg.js =================================================================== --- enigmail.orig/ui/content/enigmailSignKeyDlg.js +++ enigmail/ui/content/enigmailSignKeyDlg.js @@ -42,7 +42,7 @@ function onLoad() { var menulist = document.getElementById("signWithKey"); for (key of keys) { - menulist.appendItem(key.userId + " - 0x" + key.keyId.substr(-8, 8), key.keyId); + menulist.appendItem(key.userId + " - 0x" + key.keyId.substr(-16, 16), key.keyId); } if (menulist.selectedIndex == -1) { menulist.selectedIndex = 0; @@ -95,7 +95,7 @@ function onLoad() { } enigKeySelCb(); - var keyDesc = keyObj.userId + " - 0x" + keyObj.keyId.substr(-8, 8); + var keyDesc = keyObj.userId + " - 0x" + keyObj.keyId.substr(-16, 16); document.getElementById("keyId").value = keyDesc; if (keyObj.fpr && keyObj.fpr.length > 0) { document.getElementById("fingerprint").value = keyObj.fprFormatted; @@ -155,7 +155,7 @@ function onAccept() { function enigKeySelCb() { var keyToBeSigned = window.arguments[0].keyId; - var keyToBeSigned32 = keyToBeSigned.substr(-8, 8); + var keyToBeSigned32 = keyToBeSigned.substr(-16, 16); var signWithKey = document.getElementById("signWithKey"); var signWithKeyId = signWithKey.selectedItem.value; var alreadySigned = document.getElementById("alreadySigned"); Index: enigmail/ui/content/enigmailSingleRcptSettings.js =================================================================== --- enigmail.orig/ui/content/enigmailSingleRcptSettings.js +++ enigmail/ui/content/enigmailSingleRcptSettings.js @@ -244,7 +244,7 @@ function enigSetKeys(keyList) { else { let keyObj = EnigmailKeyRing.getKeyById(keyList[i]); if (keyObj) { - encryptionList.appendItem("0x" + keyObj.keyId.substr(-8, 8) + " (" + keyObj.userId + ")", keyList[i]); + encryptionList.appendItem("0x" + keyObj.keyId.substr(-16, 16) + " (" + keyObj.userId + ")", keyList[i]); } else { encryptionList.appendItem(keyList[i], keyList[i]); Index: enigmail/ui/content/keyDetailsDlg.js =================================================================== --- enigmail.orig/ui/content/keyDetailsDlg.js +++ enigmail/ui/content/keyDetailsDlg.js @@ -457,7 +457,7 @@ function createSubkeyItem(subkey) { let keyObj = { keyType: subkeyType, - keyId: "0x" + subkey.keyId.substr(-8, 8), + keyId: "0x" + subkey.keyId.substr(-16, 16), algo: EnigmailLocale.getString("keyAlgorithm_" + subkey.algorithm), size: subkey.keySize, creationDate: subkey.created, Index: enigmail/package/key.jsm =================================================================== --- enigmail.orig/package/key.jsm +++ enigmail/package/key.jsm @@ -156,7 +156,7 @@ var EnigmailKey = { let key = getKeyRing().getKeyById(keyId); if (key) { - let userId = key.userId + " - 0x" + key.keyId.substr(-8, 8); + let userId = key.userId + " - 0x" + key.keyId.substr(-16, 16); if (!getDialog().confirmDlg(null, EnigmailLocale.getString("revokeKeyQuestion", userId), EnigmailLocale.getString("keyMan.button.revokeKey"))) { Index: enigmail/package/keyRing.jsm =================================================================== --- enigmail.orig/package/keyRing.jsm +++ enigmail/package/keyRing.jsm @@ -1040,7 +1040,7 @@ var EnigmailKeyRing = { let k = gKeyListObj.keyList[i]; gKeyIndex[k.keyId] = k; gKeyIndex[k.fpr] = k; - gKeyIndex[k.keyId.substr(-8, 8)] = k; + gKeyIndex[k.keyId.substr(-16, 16)] = k; // add subkeys for (let j in k.subKeys) { @@ -1144,7 +1144,7 @@ const sortFunctions = { keyidshort: function(keyListObj, sortDirection) { return function(a, b) { - return (a.keyId.substr(-8, 8) < b.keyId.substr(-8, 8)) ? -sortDirection : sortDirection; + return (a.keyId.substr(-16, 16) < b.keyId.substr(-16, 16)) ? -sortDirection : sortDirection; }; },