diff -Nru thunderbird-78.4.0+build1/browser/config/version_display.txt thunderbird-78.4.2+build1/browser/config/version_display.txt
--- thunderbird-78.4.0+build1/browser/config/version_display.txt 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/browser/config/version_display.txt 2020-11-10 09:04:27.000000000 +0000
@@ -1 +1 @@
-78.4.0esr
+78.4.1esr
diff -Nru thunderbird-78.4.0+build1/browser/config/version.txt thunderbird-78.4.2+build1/browser/config/version.txt
--- thunderbird-78.4.0+build1/browser/config/version.txt 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/browser/config/version.txt 2020-11-10 09:04:27.000000000 +0000
@@ -1 +1 @@
-78.4.0
+78.4.1
diff -Nru thunderbird-78.4.0+build1/BUILDID thunderbird-78.4.2+build1/BUILDID
--- thunderbird-78.4.0+build1/BUILDID 2020-10-28 15:36:33.000000000 +0000
+++ thunderbird-78.4.2+build1/BUILDID 2020-11-10 09:16:58.000000000 +0000
@@ -1 +1 @@
-20201019003438
\ No newline at end of file
+20201108203418
\ No newline at end of file
diff -Nru thunderbird-78.4.0+build1/comm/.gecko_rev.yml thunderbird-78.4.2+build1/comm/.gecko_rev.yml
--- thunderbird-78.4.0+build1/comm/.gecko_rev.yml 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/.gecko_rev.yml 2020-11-10 09:06:03.000000000 +0000
@@ -1,8 +1,8 @@
---
GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-esr78
-GECKO_HEAD_REF: FIREFOX_78_4_0esr_BUILD2
-GECKO_HEAD_REV: 35408d78e4eed57838117d7a38e9a6b2b0bd3420
+GECKO_HEAD_REF: FIREFOX_ESR_78_4_X_RELBRANCH
+GECKO_HEAD_REV: 22b8bef3c436a4d36b586804f342928e1ab11e51
### For comm-central
# GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
diff -Nru thunderbird-78.4.0+build1/comm/mail/base/content/mailCommands.js thunderbird-78.4.2+build1/comm/mail/base/content/mailCommands.js
--- thunderbird-78.4.0+build1/comm/mail/base/content/mailCommands.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/base/content/mailCommands.js 2020-11-10 09:06:03.000000000 +0000
@@ -253,7 +253,12 @@
let useCatchAll = false;
// Check if we are using catchAll on any identity. If current
// folder has some customIdentity set, ignore catchAll settings.
- if (hdr.folder && !hdr.folder.customIdentity) {
+ // CatchAll is not applicable to news (and doesn't work, bug 545365).
+ if (
+ hdr.folder &&
+ hdr.folder.server.type != "nntp" &&
+ !hdr.folder.customIdentity
+ ) {
useCatchAll = MailServices.accounts.allIdentities.some(
identity => identity.catchAll
);
diff -Nru thunderbird-78.4.0+build1/comm/mail/base/content/mailWidgets.js thunderbird-78.4.2+build1/comm/mail/base/content/mailWidgets.js
--- thunderbird-78.4.0+build1/comm/mail/base/content/mailWidgets.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/base/content/mailWidgets.js 2020-11-10 09:06:03.000000000 +0000
@@ -2003,10 +2003,13 @@
let addresses = MailServices.headerParser.makeFromDisplayAddress(
this.emailInput.value
);
+ let row = this.closest(".address-row");
if (!addresses[0]) {
this.rowInput.focus();
this.remove();
+ // Update aria labels of all pills in the row, as pill count changed.
+ udpateAriaLabelsOfAddressRow(row);
onRecipientsChanged();
return;
}
@@ -2023,6 +2026,18 @@
this.emailInput.attachController();
this.resetPill();
+
+ // Update the aria label of edited pill only, as pill count didn't change.
+ // Unfortunately, we still need to get the row's pills for counting once.
+ let pills = row.querySelectorAll("mail-address-pill");
+ this.setAttribute(
+ "aria-label",
+ l10nCompose.formatValueSync("pill-aria-label", {
+ email: this.fullAddress,
+ count: pills.length,
+ })
+ );
+
onRecipientsChanged();
}
@@ -2924,7 +2939,9 @@
focusElement.focus();
calculateHeaderHeight();
- udpateAddressingInputAriaLabel(rowInput.closest(".address-row"));
+ // Update aria labels for all rows as we allow cross-row pill removal.
+ // This may not yet be micro-performance optimized; see bug 1671261.
+ updateAriaLabelsAndTooltipsOfAllAddressRows();
// Don't call onRecipientsChanged() if the pills were removed
// automatically during the move to another addressing widget.
diff -Nru thunderbird-78.4.0+build1/comm/mail/base/content/mailWindowOverlay.js thunderbird-78.4.2+build1/comm/mail/base/content/mailWindowOverlay.js
--- thunderbird-78.4.0+build1/comm/mail/base/content/mailWindowOverlay.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/base/content/mailWindowOverlay.js 2020-11-10 09:06:03.000000000 +0000
@@ -816,7 +816,7 @@
Ci.nsMsgFolderFlags.Templates
);
- // Initialize the Open Message menuitem
+ // Initialize the Open Message menuitem.
let winType = document.documentElement.getAttribute("windowtype");
if (winType == "mail:3pane") {
document.getElementById(
@@ -824,14 +824,16 @@
).hidden = isFeed;
}
- // Initialize the Open Feed Message handler menu
+ // Initialize the Open Feed Message handler menu.
const openFeedView = document
.getElementById("appMenu-messageOpenFeedView")
.querySelector(".panel-subview-body");
- openFeedView.children.forEach(node => node.removeAttribute("checked"));
- let index = FeedMessageHandler.onOpenPref;
- openFeedView.children[index].setAttribute("checked", true);
+ openFeedView.childNodes.forEach(node => node.removeAttribute("checked"));
+ openFeedView.childNodes[FeedMessageHandler.onOpenPref].setAttribute(
+ "checked",
+ true
+ );
let openRssMenu = document.getElementById("appmenu_openFeedMessage");
openRssMenu.hidden = !isFeed;
@@ -3893,7 +3895,12 @@
"chrome://messenger/content/SearchDialog.xhtml",
"_blank",
"chrome,resizable,status,centerscreen,dialog=no",
- { folder: aFolder || gFolderDisplay.displayedFolder }
+ {
+ folder:
+ aFolder ||
+ gFolderDisplay.displayedFolder ||
+ gFolderTreeView.getSelectedFolders()[0],
+ }
);
}
diff -Nru thunderbird-78.4.0+build1/comm/mail/base/content/msgMail3PaneWindow.js thunderbird-78.4.2+build1/comm/mail/base/content/msgMail3PaneWindow.js
--- thunderbird-78.4.0+build1/comm/mail/base/content/msgMail3PaneWindow.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/base/content/msgMail3PaneWindow.js 2020-11-10 09:06:03.000000000 +0000
@@ -474,6 +474,47 @@
};
/**
+ * Theme observer to deal with the ui.systemUsesDarkTheme preferences when
+ * switching between default, light, and dark theme.
+ */
+var ThemePrefObserver = {
+ observe(subject, topic, prefName) {
+ // Verify that we're changing the correct pref.
+ if (topic == "nsPref:changed" && prefName == "extensions.activeThemeID") {
+ // We need to force a light theme before removing the pref in order to
+ // deal with the issue of the Default Theme not triggering any color
+ // update. We remove the pref to run our conditions on a clean state.
+ Services.prefs.setIntPref("ui.systemUsesDarkTheme", 0);
+ Services.prefs.clearUserPref("ui.systemUsesDarkTheme");
+
+ // Bail out if we're not on Linux and the current Thunderbird theme is not
+ // the default, to allow the OS theme to properly handle the color scheme.
+ if (
+ AppConstants.platform != "linux" &&
+ Services.prefs.getCharPref("extensions.activeThemeID") ==
+ "default-theme@mozilla.org"
+ ) {
+ return;
+ }
+
+ let mainWindow = document.getElementById("messengerWindow");
+ if (!mainWindow) {
+ return;
+ }
+
+ if (mainWindow.getAttribute("lwt-tree-brighttext") == "true") {
+ // The theme requires a light text, so we trigger the dark mode.
+ Services.prefs.setIntPref("ui.systemUsesDarkTheme", 1);
+ return;
+ }
+
+ // The theme doesn't require light text, so we keep trigger a light mode.
+ Services.prefs.setIntPref("ui.systemUsesDarkTheme", 0);
+ }
+ },
+};
+
+/**
* Called on startup if there are no accounts.
*/
function AutoConfigWizard(okCallback) {
@@ -581,6 +622,7 @@
Services.prefs.addObserver("mail.pane_config.dynamic", MailPrefObserver);
Services.prefs.addObserver("mail.showCondensedAddresses", MailPrefObserver);
Services.prefs.addObserver("mail.openpgp.enable", MailPrefObserver);
+ Services.prefs.addObserver("extensions.activeThemeID", ThemePrefObserver);
MailOfflineMgr.init();
CreateMailWindowGlobals();
@@ -962,6 +1004,7 @@
MailPrefObserver
);
Services.prefs.removeObserver("mail.openpgp.enable", MailPrefObserver);
+ Services.prefs.removeObserver("extensions.activeThemeID", ThemePrefObserver);
if (gRightMouseButtonSavedSelection) {
// Avoid possible cycle leaks.
diff -Nru thunderbird-78.4.0+build1/comm/mail/base/content/toolbarIconColor.js thunderbird-78.4.2+build1/comm/mail/base/content/toolbarIconColor.js
--- thunderbird-78.4.0+build1/comm/mail/base/content/toolbarIconColor.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/base/content/toolbarIconColor.js 2020-11-10 09:06:03.000000000 +0000
@@ -9,21 +9,26 @@
"resource://gre/modules/AppConstants.jsm"
);
-var kCurrentColor = null;
-
var ToolbarIconColor = {
+ _windowState: {
+ active: false,
+ fullscreen: false,
+ tabsintitlebar: false,
+ },
+
init() {
this._initialized = true;
window.addEventListener("activate", this);
window.addEventListener("deactivate", this);
- Services.obs.addObserver(this, "lightweight-theme-styling-update");
+ window.addEventListener("toolbarvisibilitychange", this);
+ window.addEventListener("windowlwthemeupdate", this);
// If the window isn't active now, we assume that it has never been active
// before and will soon become active such that inferFromText will be
// called from the initial activate event.
if (Services.focus.activeWindow == window) {
- this.inferFromText();
+ this.inferFromText("activate");
}
},
@@ -32,66 +37,85 @@
window.removeEventListener("activate", this);
window.removeEventListener("deactivate", this);
- Services.obs.removeObserver(this, "lightweight-theme-styling-update");
+ window.removeEventListener("toolbarvisibilitychange", this);
+ window.removeEventListener("windowlwthemeupdate", this);
},
handleEvent(event) {
switch (event.type) {
case "activate":
case "deactivate":
- this.inferFromText();
+ case "windowlwthemeupdate":
+ this.inferFromText(event.type);
break;
- }
- },
-
- observe(aSubject, aTopic, aData) {
- switch (aTopic) {
- case "lightweight-theme-styling-update":
- // inferFromText needs to run after LightweightThemeConsumer.jsm's
- // lightweight-theme-styling-update observer.
- setTimeout(() => {
- this.inferFromText();
- }, 0);
+ case "toolbarvisibilitychange":
+ this.inferFromText(event.type, event.visible);
break;
}
},
- inferFromText() {
- if (!this._initialized) {
- return;
- }
-
- // Interrupt if no toolbar is currently present, meaning we don't have any
- // toolbar to update.
- let toolbox = document.querySelector("toolbox");
- if (!toolbox) {
- return;
- }
+ // A cache of luminance values for each toolbar to avoid unnecessary calls to
+ // getComputedStyle().
+ _toolbarLuminanceCache: new Map(),
- // Interrupt if the toolbox color didn't change from the previous iteration.
- let color = getComputedStyle(toolbox).color;
- if (kCurrentColor && kCurrentColor == color) {
+ inferFromText(reason, reasonValue) {
+ if (!this._initialized) {
return;
}
- // Store the current color variable for future reference.
- kCurrentColor = color;
-
function parseRGB(aColorString) {
let rgb = aColorString.match(/^rgba?\((\d+), (\d+), (\d+)/);
rgb.shift();
return rgb.map(x => parseInt(x));
}
+ switch (reason) {
+ case "activate": // falls through.
+ case "deactivate":
+ this._windowState.active = reason === "activate";
+ break;
+ case "fullscreen":
+ this._windowState.fullscreen = reasonValue;
+ break;
+ case "windowlwthemeupdate":
+ // Theme change, we'll need to recalculate all color values.
+ this._toolbarLuminanceCache.clear();
+ break;
+ case "toolbarvisibilitychange":
+ // Toolbar changes dont require reset of the cached color values.
+ break;
+ case "tabsintitlebar":
+ this._windowState.tabsintitlebar = reasonValue;
+ break;
+ }
+
let toolbarSelector = "toolbox > toolbar:not([collapsed=true])";
if (AppConstants.platform == "macosx") {
toolbarSelector += ":not([type=menubar])";
}
toolbarSelector += ", .toolbar";
+ // The getComputedStyle calls and setting the brighttext are separated in
+ // two loops to avoid flushing layout and making it dirty repeatedly.
+ let cachedLuminances = this._toolbarLuminanceCache;
+ let luminances = new Map();
for (let toolbar of document.querySelectorAll(toolbarSelector)) {
- let [r, g, b] = parseRGB(getComputedStyle(toolbar).color);
- let luminance = 0.2125 * r + 0.7154 * g + 0.0721 * b;
+ // Toolbars *should* all have ids, but guard anyway to avoid blowing up.
+ let cacheKey =
+ toolbar.id && toolbar.id + JSON.stringify(this._windowState);
+ // Lookup cached luminance value for this toolbar in this window state.
+ let luminance = cacheKey && cachedLuminances.get(cacheKey);
+ if (isNaN(luminance)) {
+ let [r, g, b] = parseRGB(getComputedStyle(toolbar).color);
+ luminance = 0.2125 * r + 0.7154 * g + 0.0721 * b;
+ if (cacheKey) {
+ cachedLuminances.set(cacheKey, luminance);
+ }
+ }
+ luminances.set(toolbar, luminance);
+ }
+
+ for (let [toolbar, luminance] of luminances) {
if (luminance <= 110) {
toolbar.removeAttribute("brighttext");
} else {
diff -Nru thunderbird-78.4.0+build1/comm/mail/base/modules/ThemeVariableMap.jsm thunderbird-78.4.2+build1/comm/mail/base/modules/ThemeVariableMap.jsm
--- thunderbird-78.4.0+build1/comm/mail/base/modules/ThemeVariableMap.jsm 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/base/modules/ThemeVariableMap.jsm 2020-11-10 09:06:03.000000000 +0000
@@ -2,17 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { AppConstants } = ChromeUtils.import(
- "resource://gre/modules/AppConstants.jsm"
-);
-
var EXPORTED_SYMBOLS = ["ThemeVariableMap", "ThemeContentPropertyList"];
-function _isTextColorDark(r, g, b) {
- return 0.2125 * r + 0.7154 * g + 0.0721 * b <= 110;
-}
-
const ThemeVariableMap = [
[
"--lwt-accent-color-inactive",
@@ -165,68 +156,24 @@
{
lwtProperty: "sidebar_text",
processColor(rgbaChannels, element) {
- // Delete the ui.systemUsesDarkTheme pref if we're not on Linux and the
- // current Thunderbird theme is not the default, to allow the OS theme
- // to properly handle the color scheme.
- let ignoreDarkThemePref;
- if (
- AppConstants.platform != "linux" &&
- Services.prefs.getCharPref("extensions.activeThemeID") ==
- "default-theme@mozilla.org"
- ) {
- Services.prefs.deleteBranch("ui.systemUsesDarkTheme");
- ignoreDarkThemePref = true;
- }
-
if (!rgbaChannels) {
element.removeAttribute("lwt-tree");
-
- // We use the #tabmail element to determine the color contrast.
- // If the element is not present, it means a dialog or an unkown tab
- // is currently opened, and we shouldn't do anything.
- let tabmail = element.ownerDocument.getElementById("tabmail");
- if (!tabmail) {
- return null;
- }
-
- let rgb = tabmail.ownerGlobal
- .getComputedStyle(tabmail)
- .color.match(/^rgba?\((\d+), (\d+), (\d+)/);
- rgb.shift();
- let [r, g, b] = rgb.map(x => parseInt(x));
-
- if (!_isTextColorDark(r, g, b)) {
- element.setAttribute("lwt-tree-brighttext", "true");
- if (!ignoreDarkThemePref) {
- Services.prefs.setIntPref("ui.systemUsesDarkTheme", 1);
- }
-
- return `rgba(${r}, ${g}, ${b}, 1)`;
- }
-
- element.removeAttribute("lwt-tree-brighttext");
- if (!ignoreDarkThemePref) {
- Services.prefs.setIntPref("ui.systemUsesDarkTheme", 0);
- }
-
return null;
}
+ const { r, g, b } = rgbaChannels;
+ let luminance = 0.2125 * r + 0.7154 * g + 0.0721 * b;
+
element.setAttribute("lwt-tree", "true");
- let { r, g, b, a } = rgbaChannels;
- if (!_isTextColorDark(r, g, b)) {
- element.setAttribute("lwt-tree-brighttext", "true");
- if (!ignoreDarkThemePref) {
- Services.prefs.setIntPref("ui.systemUsesDarkTheme", 1);
- }
- } else {
+
+ if (luminance <= 110) {
element.removeAttribute("lwt-tree-brighttext");
- if (!ignoreDarkThemePref) {
- Services.prefs.setIntPref("ui.systemUsesDarkTheme", 0);
- }
+ } else {
+ element.setAttribute("lwt-tree-brighttext", "true");
}
- return `rgba(${r}, ${g}, ${b}, ${a})`;
+ // Drop alpha channel.
+ return `rgb(${r}, ${g}, ${b})`;
},
},
],
@@ -250,4 +197,11 @@
],
];
-const ThemeContentPropertyList = [];
+const ThemeContentPropertyList = [
+ "ntp_background",
+ "ntp_text",
+ "sidebar",
+ "sidebar_highlight",
+ "sidebar_highlight_text",
+ "sidebar_text",
+];
diff -Nru thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/abCommon.js thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/abCommon.js
--- thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/abCommon.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/abCommon.js 2020-11-10 09:06:03.000000000 +0000
@@ -570,7 +570,7 @@
}
}
-function AbNewMessage() {
+function AbNewMessage(address) {
let params = Cc[
"@mozilla.org/messengercompose/composeparams;1"
].createInstance(Ci.nsIMsgComposeParams);
@@ -580,7 +580,9 @@
"@mozilla.org/messengercompose/composefields;1"
].createInstance(Ci.nsIMsgCompFields);
- if (DirPaneHasFocus()) {
+ if (address) {
+ params.composeFields.to = address;
+ } else if (DirPaneHasFocus()) {
let selectedDir = getSelectedDirectory();
let hidesRecipients = false;
try {
@@ -889,7 +891,7 @@
let directory = GetDirectoryFromURI(card.mailListURI);
email = directory.description || card.displayName;
} else {
- email = card.primaryEmail;
+ email = card.primaryEmail || card.getProperty("SecondEmail", "");
}
return MailServices.headerParser.makeMimeAddress(card.displayName, email);
}
diff -Nru thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/abSearchDialog.js thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/abSearchDialog.js
--- thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/abSearchDialog.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/abSearchDialog.js 2020-11-10 09:06:03.000000000 +0000
@@ -129,26 +129,27 @@
}
function SelectDirectory(aURI) {
- var selectedAB = aURI;
-
- if (!selectedAB) {
- selectedAB = kPersonalAddressbookURI;
- }
-
// set popup with address book names
- var abPopup = document.getElementById("abPopup");
+ let abPopup = document.getElementById("abPopup");
if (abPopup) {
- abPopup.value = selectedAB;
+ if (aURI) {
+ abPopup.value = aURI;
+ } else {
+ abPopup.selectedIndex = 0;
+ }
}
- setSearchScope(GetScopeForDirectoryURI(selectedAB));
+ setSearchScope(GetScopeForDirectoryURI(aURI));
}
function GetScopeForDirectoryURI(aURI) {
- var directory = MailServices.ab.getDirectory(aURI);
- var booleanAnd = gSearchBooleanRadiogroup.selectedItem.value == "and";
+ let directory;
+ if (aURI && aURI != "moz-abdirectory://?") {
+ directory = MailServices.ab.getDirectory(aURI);
+ }
+ let booleanAnd = gSearchBooleanRadiogroup.selectedItem.value == "and";
- if (directory.isRemote) {
+ if (directory?.isRemote) {
if (booleanAnd) {
return nsMsgSearchScope.LDAPAnd;
}
@@ -187,7 +188,7 @@
gSearchSession.addDirectoryScopeTerm(GetScopeForDirectoryURI(currentAbURI));
saveSearchTerms(gSearchSession.searchTerms, gSearchSession);
- var searchUri = currentAbURI + "?(";
+ let searchUri = "?(";
for (let i = 0; i < gSearchSession.searchTerms.length; i++) {
let searchTerm = gSearchSession.searchTerms.queryElementAt(
i,
@@ -334,7 +335,7 @@
}
searchUri += ")";
- SetAbView(searchUri);
+ SetAbView(currentAbURI, searchUri);
}
// used to toggle functionality for Search/Stop button.
diff -Nru thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/addressbook.js thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/addressbook.js
--- thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/addressbook.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/addressbook.js 2020-11-10 09:06:03.000000000 +0000
@@ -338,6 +338,76 @@
function ResultsPaneSelectionChanged() {
UpdateCardView();
+
+ let contextSingle = document.getElementById(
+ "abResultsTreeContext-newmessage"
+ );
+ if (!contextSingle) {
+ // Give up, this isn't the main address book window.
+ return;
+ }
+ let contextMultiple = document.getElementById(
+ "abResultsTreeContext-newmessageMultiple"
+ );
+ let menuSingle = document.getElementById("menu_newMessage");
+ let menuMultiple = document.getElementById("menu_newMessageMultiple");
+ let toolbarButton = document.getElementById("button-newmessage");
+
+ let selectedCards = GetSelectedAbCards();
+ if (selectedCards.length == 1) {
+ let first = selectedCards[0].primaryEmail;
+ let second = selectedCards[0].getProperty("SecondEmail", "");
+ if (first && second) {
+ // Set the menus and toolbar button to display a list of addresses.
+ contextSingle.hidden = true;
+ contextMultiple.hidden = false;
+ menuSingle.hidden = true;
+ menuMultiple.hidden = false;
+ toolbarButton.setAttribute("type", "menu");
+
+ while (contextMultiple.menupopup.lastChild) {
+ contextMultiple.menupopup.lastChild.remove();
+ }
+ while (menuMultiple.menupopup.lastChild) {
+ menuMultiple.menupopup.lastChild.remove();
+ }
+ while (toolbarButton.menupopup.lastChild) {
+ toolbarButton.menupopup.lastChild.remove();
+ }
+
+ for (let address of [first, second]) {
+ let callAbNewMessage = function(event) {
+ AbNewMessage(
+ MailServices.headerParser.makeMimeAddress(
+ selectedCards[0].displayName,
+ address
+ )
+ );
+ event.stopPropagation();
+ };
+
+ let menuitem = contextMultiple.menupopup.appendChild(
+ document.createXULElement("menuitem")
+ );
+ menuitem.label = address;
+ menuitem.addEventListener("command", callAbNewMessage);
+ menuMultiple.menupopup
+ .appendChild(menuitem.cloneNode(false))
+ .addEventListener("command", callAbNewMessage);
+ toolbarButton.menupopup
+ .appendChild(menuitem.cloneNode(false))
+ .addEventListener("command", callAbNewMessage);
+ }
+ return;
+ }
+ }
+
+ // Set the menus and toolbar button to start a new message.
+ contextSingle.hidden = false;
+ contextMultiple.hidden = true;
+ menuSingle.hidden = false;
+ menuMultiple.hidden = true;
+ toolbarButton.removeAttribute("type");
}
function UpdateCardView() {
diff -Nru thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/addressbook.xhtml thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/addressbook.xhtml
--- thunderbird-78.4.0+build1/comm/mail/components/addrbook/content/addressbook.xhtml 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/components/addrbook/content/addressbook.xhtml 2020-11-10 09:06:03.000000000 +0000
@@ -240,6 +240,13 @@
label="&newmsgButton.label;"
accesskey="&newmsgButton.accesskey;"
command="cmd_newMessage"/>
+
+
@@ -660,7 +674,14 @@
valueAddressBookTooltipText="&editAbPropertiesButton.tooltip;"
valueContactTooltipText="&editContactPropertiesButton.tooltip;"
valueMailingListTooltipText="&editMailingListPropertiesButton.tooltip;"/>
-
+
+
+
+
+
@@ -4148,38 +4148,49 @@
}
/**
- * Update the translatable string of every recipient row
- * with the properly formatted values.
+ * Update the aria labels of all non-custom address inputs and all pills in the
+ * addressing area. Also update the tooltips of the close labels of all address
+ * rows, including custom header fields.
*/
-function updateStringsOfAddressingFields() {
- for (let row of document.querySelectorAll(".address-row")) {
- udpateAddressingInputAriaLabel(row);
- updateTooltipsOfAddressingFields(row);
+function updateAriaLabelsAndTooltipsOfAllAddressRows() {
+ for (let row of document
+ .getElementById("recipientsContainer")
+ .querySelectorAll(".address-row")) {
+ udpateAriaLabelsOfAddressRow(row);
+ updateTooltipsOfAddressRow(row);
}
}
/**
- * Update the aria-label of the autocomplete input field.
+ * Update the aria labels of the address input and all pills of an address row.
+ * This is needed whenever a pill gets added or removed, because the aria label
+ * of each pill contains the current count of all pills in that row ("1 of n").
*
- * @param {Element} row - The recipient address-row.
+ * @param {Element} row - The address row.
*/
-function udpateAddressingInputAriaLabel(row) {
- let type = row.querySelector(".address-label-container > label").value;
- let pills = row.querySelectorAll("mail-address-pill");
+function udpateAriaLabelsOfAddressRow(row) {
+ // Get the input of a normal address row with pills, or null if custom header.
+ // Use [is="autocomplete-input"] to prevent selecting a custom header input.
+ // Use [recipienttype] to prevent selecting an input for editing a pill.
let input = row.querySelector(
`input[is="autocomplete-input"][recipienttype]`
);
- // For custom header input, pills are disabled.
- if (input) {
- input.setAttribute(
- "aria-label",
- l10nCompose.formatValueSync("address-input-type-aria-label", {
- type,
- count: pills.length,
- })
- );
+ // Bail out for custom header input where pills are disabled.
+ if (!input) {
+ return;
}
+ let type = row.querySelector(".address-label-container > label").value;
+ let pills = row.querySelectorAll("mail-address-pill");
+
+ input.setAttribute(
+ "aria-label",
+ l10nCompose.formatValueSync("address-input-type-aria-label", {
+ type,
+ count: pills.length,
+ })
+ );
+
for (let pill of pills) {
pill.setAttribute(
"aria-label",
@@ -4192,11 +4203,11 @@
}
/**
- * Update the close label of the recipient row.
+ * Update the tooltip of the close label of an address row.
*
- * @param {Element} row - The recipient address-row.
+ * @param {Element} row - The address row.
*/
-function updateTooltipsOfAddressingFields(row) {
+function updateTooltipsOfAddressRow(row) {
let type = row.querySelector(".address-label-container > label").value;
let tooltip = l10nCompose.formatValueSync("remove-address-row-type", {
type,
diff -Nru thunderbird-78.4.0+build1/comm/mail/components/customizableui/content/panelUI.js thunderbird-78.4.2+build1/comm/mail/components/customizableui/content/panelUI.js
--- thunderbird-78.4.0+build1/comm/mail/components/customizableui/content/panelUI.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/components/customizableui/content/panelUI.js 2020-11-10 09:06:03.000000000 +0000
@@ -307,7 +307,7 @@
// This works for now, but in the long run, if we're showing badges etc.
// then the current menuButton needs to be set when the app's view/tab
// changes, not just when the menu is toggled.
- this.menuButton = event.target;
+ this.menuButton = event.originalTarget;
this._ensureEventListenersAdded();
if (this.panel.state == "open") {
@@ -341,7 +341,12 @@
domEvent = aEvent;
}
- let anchor = this._getPanelAnchor(this.menuButton);
+ // We try to use the event.originalTarget to account for clicks triggered
+ // from the #button-chat-appmenu. In case the opening of the menu isn't
+ // triggered by a click event, fallback to the main menu button as anchor.
+ let anchor = this._getPanelAnchor(
+ aEvent ? aEvent.originalTarget : this.menuButton
+ );
await PanelMultiView.openPopup(this.panel, anchor, {
triggerEvent: domEvent,
});
diff -Nru thunderbird-78.4.0+build1/comm/mail/components/customizableui/CustomizableUI.jsm thunderbird-78.4.2+build1/comm/mail/components/customizableui/CustomizableUI.jsm
--- thunderbird-78.4.0+build1/comm/mail/components/customizableui/CustomizableUI.jsm 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/components/customizableui/CustomizableUI.jsm 2020-11-10 09:06:03.000000000 +0000
@@ -2031,9 +2031,13 @@
? closemenuVal
: "auto";
}
- // Break out of the loop immediately for disabled items, as we need to
- // keep the menu open in that case.
- if (target.getAttribute("disabled") == "true") {
+
+ // Keep the menu open and break out of the loop if the click happened on
+ // the ShadowRoot or a disabled menu item.
+ if (
+ target.nodeType == target.DOCUMENT_FRAGMENT_NODE ||
+ target.getAttribute("disabled") == "true"
+ ) {
return true;
}
diff -Nru thunderbird-78.4.0+build1/comm/mail/config/version_display.txt thunderbird-78.4.2+build1/comm/mail/config/version_display.txt
--- thunderbird-78.4.0+build1/comm/mail/config/version_display.txt 2020-10-28 15:20:51.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/config/version_display.txt 2020-11-10 09:06:06.000000000 +0000
@@ -1 +1 @@
-78.4.0
+78.4.2
diff -Nru thunderbird-78.4.0+build1/comm/mail/config/version.txt thunderbird-78.4.2+build1/comm/mail/config/version.txt
--- thunderbird-78.4.0+build1/comm/mail/config/version.txt 2020-10-28 15:20:51.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/config/version.txt 2020-11-10 09:06:06.000000000 +0000
@@ -1 +1 @@
-78.4.0
+78.4.2
diff -Nru thunderbird-78.4.0+build1/comm/mail/extensions/openpgp/content/modules/mimeDecrypt.jsm thunderbird-78.4.2+build1/comm/mail/extensions/openpgp/content/modules/mimeDecrypt.jsm
--- thunderbird-78.4.0+build1/comm/mail/extensions/openpgp/content/modules/mimeDecrypt.jsm 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/extensions/openpgp/content/modules/mimeDecrypt.jsm 2020-11-10 09:06:03.000000000 +0000
@@ -799,11 +799,11 @@
proto = EnigmailMime.getProtocol(ct);
}
- try {
- if (
- proto &&
- proto.search(/application\/(pgp|pkcs7|x-pkcs7)-signature/i) >= 0
- ) {
+ if (
+ proto &&
+ proto.search(/application\/(pgp|pkcs7|x-pkcs7)-signature/i) >= 0
+ ) {
+ try {
EnigmailLog.DEBUG(
"mimeDecrypt.jsm: returnData: using direct verification\n"
);
@@ -815,15 +815,23 @@
veri.onStartRequest(this.mimeSvc, this.uri);
veri.onTextData(data);
veri.onStopRequest(null, 0);
- } else {
+ } catch (ex) {
+ console.debug(ex);
+ EnigmailLog.ERROR(
+ "mimeDecrypt.jsm: returnData(): mimeSvc.onDataAvailable failed:\n" +
+ ex.toString()
+ );
+ }
+ } else {
+ try {
this.mimeSvc.outputDecryptedData(data, data.length);
+ } catch (ex) {
+ console.debug(ex);
+ EnigmailLog.ERROR(
+ "mimeDecrypt.jsm: returnData(): cannot send decrypted data to MIME processing:\n" +
+ ex.toString()
+ );
}
- } catch (ex) {
- console.debug(ex);
- EnigmailLog.ERROR(
- "mimeDecrypt.jsm: returnData(): mimeSvc.onDataAvailable failed:\n" +
- ex.toString()
- );
}
},
diff -Nru thunderbird-78.4.0+build1/comm/mail/extensions/openpgp/content/modules/mimeVerify.jsm thunderbird-78.4.2+build1/comm/mail/extensions/openpgp/content/modules/mimeVerify.jsm
--- thunderbird-78.4.0+build1/comm/mail/extensions/openpgp/content/modules/mimeVerify.jsm 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/extensions/openpgp/content/modules/mimeVerify.jsm 2020-11-10 09:06:03.000000000 +0000
@@ -562,15 +562,20 @@
}
this.returnStatus = cApi.sync(cApi.verifyMime(this.signedData, options));
- this.exitCode = this.returnStatus.exitCode;
- this.returnStatus.statusFlags |= EnigmailConstants.PGP_MIME_SIGNED;
+ if (!this.returnStatus) {
+ this.exitCode = -1;
+ } else {
+ this.exitCode = this.returnStatus.exitCode;
- if (this.partiallySigned) {
- this.returnStatus.statusFlags |= EnigmailConstants.PARTIALLY_PGP;
- }
+ this.returnStatus.statusFlags |= EnigmailConstants.PGP_MIME_SIGNED;
+
+ if (this.partiallySigned) {
+ this.returnStatus.statusFlags |= EnigmailConstants.PARTIALLY_PGP;
+ }
- this.displayStatus();
+ this.displayStatus();
+ }
if (this.sigFile) {
this.sigFile.remove(false);
diff -Nru thunderbird-78.4.0+build1/comm/mail/extensions/openpgp/content/ui/enigmailMsgComposeOverlay.js thunderbird-78.4.2+build1/comm/mail/extensions/openpgp/content/ui/enigmailMsgComposeOverlay.js
--- thunderbird-78.4.0+build1/comm/mail/extensions/openpgp/content/ui/enigmailMsgComposeOverlay.js 2020-10-28 15:20:48.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/extensions/openpgp/content/ui/enigmailMsgComposeOverlay.js 2020-11-10 09:06:03.000000000 +0000
@@ -445,10 +445,10 @@
obtainedDraftFlagsObj.value = true;
}
if (self.draftSubjectEncrypted) {
- self.setOriginalSubject(msgHdr.subject, false);
+ self.setOriginalSubject(msgHdr.subject, msgHdr.flags, false);
}
} else if (EnigmailURIs.isEncryptedUri(msgUri)) {
- self.setOriginalSubject(msgHdr.subject, false);
+ self.setOriginalSubject(msgHdr.subject, msgHdr.flags, false);
}
}
} catch (ex) {
@@ -528,10 +528,22 @@
return true;
},
- setOriginalSubject(subject, forceSetting) {
+ /**
+ * Updates the subject displayed in the #msgSubject element of the compose
+ * window. Sets prefixes such as "Re" depending on the value gMsgCompose.type.
+ *
+ * @param {string} subject The subject for the message.
+ * @param {number} flags The nsIMsgHdr flags for the message, used to detect
+ * HasRe on drafts.
+ * @param {boolean} forceSetting If true, the subject is always updated
+ * otherwise it is only updated for the following nsIMsgCompTypes: Draft,
+ * Template,EditTemplate,ForwardInline,ForwardAttachement or EditAsNew.
+ */
+ setOriginalSubject(subject, flags, forceSetting) {
const CT = Ci.nsIMsgCompType;
let subjElem = document.getElementById("msgSubject");
let prefix = "";
+ let isReply = false;
if (!subjElem) {
return;
@@ -542,15 +554,22 @@
case CT.ForwardAsAttachment:
prefix = this.getMailPref("mail.forward_subject_prefix") + ": ";
break;
+ case CT.Draft:
+ isReply = Boolean(flags & Ci.nsMsgMessageFlags.HasRe);
+ break;
case CT.Reply:
case CT.ReplyAll:
case CT.ReplyToSender:
case CT.ReplyToGroup:
case CT.ReplyToSenderAndGroup:
case CT.ReplyToList:
- if (!subject.startsWith("Re: ")) {
- prefix = "Re: ";
- }
+ isReply = true;
+ }
+
+ if (isReply) {
+ if (!subject.startsWith("Re: ")) {
+ prefix = "Re: ";
+ }
}
let doSetSubject = forceSetting;
@@ -3275,7 +3294,7 @@
let msgHdr = Enigmail.msg.getMsgHdr();
if (msgHdr) {
- Enigmail.msg.setOriginalSubject(msgHdr.subject, true);
+ Enigmail.msg.setOriginalSubject(msgHdr.subject, msgHdr.flags, true);
}
Enigmail.msg.fixMessageSubject();
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/browser.ini thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/browser.ini
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/browser.ini 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/browser.ini 2020-11-10 09:06:03.000000000 +0000
@@ -9,4 +9,6 @@
subsuite = thunderbird
support-files = data/**
+[browser_openPGPDrafts.js]
[browser_viewMessage.js]
+
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/browser_openPGPDrafts.js thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/browser_openPGPDrafts.js
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/browser_openPGPDrafts.js 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/browser_openPGPDrafts.js 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,159 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+ open_message_from_file,
+ be_in_folder,
+ get_special_folder,
+ select_click_row,
+ open_selected_message,
+} = ChromeUtils.import(
+ "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
+);
+const { close_window } = ChromeUtils.import(
+ "resource://testing-common/mozmill/WindowHelpers.jsm"
+);
+const { OpenPGPTestUtils } = ChromeUtils.import(
+ "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
+);
+const { FileUtils } = ChromeUtils.import(
+ "resource://gre/modules/FileUtils.jsm"
+);
+const { MailServices } = ChromeUtils.import(
+ "resource:///modules/MailServices.jsm"
+);
+const { toXPCOMArray } = ChromeUtils.import(
+ "resource:///modules/iteratorUtils.jsm"
+);
+
+function waitForComposeWindow() {
+ return BrowserTestUtils.domWindowOpened(null, async win => {
+ await BrowserTestUtils.waitForEvent(win, "load");
+ return (
+ win.document.documentURI ===
+ "chrome://messenger/content/messengercompose/messengercompose.xhtml"
+ );
+ });
+}
+
+let aliceAcct;
+let aliceIdentity;
+let initialKeyIdPref = "";
+
+/**
+ * Setup a mail account with a private key and an imported public key for an
+ * address we can send messages to.
+ */
+add_task(async function setUp() {
+ aliceAcct = MailServices.accounts.createAccount();
+ aliceAcct.incomingServer = MailServices.accounts.createIncomingServer(
+ "alice",
+ "openpgp.example",
+ "imap"
+ );
+ aliceIdentity = MailServices.accounts.createIdentity();
+ aliceIdentity.email = "alice@openpgp.example";
+ aliceAcct.addIdentity(aliceIdentity);
+
+ let [id] = await OpenPGPTestUtils.importPrivateKey(
+ window,
+ new FileUtils.File(
+ getTestFilePath(
+ "data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc"
+ )
+ )
+ );
+
+ Assert.ok(id, "private key id received");
+
+ initialKeyIdPref = aliceIdentity.getUnicharAttribute("openpgp_key_id");
+ aliceIdentity.setUnicharAttribute("openpgp_key_id", id.split("0x").join(""));
+
+ await OpenPGPTestUtils.importPublicKey(
+ window,
+ new FileUtils.File(
+ getTestFilePath(
+ "data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc"
+ )
+ )
+ );
+});
+
+/**
+ * Test the "Re:" prefix remains in the compose window when opening a draft
+ * reply for an encrypted message. See bug 1661510.
+ */
+add_task(async function testDraftReplyToEncryptedMessageKeepsRePrefix() {
+ let draftsFolder = get_special_folder(
+ Ci.nsMsgFolderFlags.Drafts,
+ true,
+ aliceAcct.incomingServer.localFoldersServer
+ );
+
+ be_in_folder(draftsFolder);
+
+ // Delete the messages we saved to drafts.
+ registerCleanupFunction(
+ async () =>
+ new Promise(resolve => {
+ let msgs = [...draftsFolder.msgDatabase.EnumerateMessages()];
+
+ draftsFolder.deleteMessages(
+ toXPCOMArray(msgs, Ci.nsIMutableArray),
+ null,
+ true,
+ false,
+ { OnStopCopy: resolve },
+ false
+ );
+ })
+ );
+
+ // Test signed-encrypted and unsigned-encrypted messages.
+ let msgFiles = [
+ "data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml",
+ "data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml",
+ ];
+
+ for (let msg of msgFiles) {
+ let mc = await open_message_from_file(
+ new FileUtils.File(getTestFilePath(msg))
+ );
+
+ let replyWindowPromise = waitForComposeWindow();
+ mc.window.document.querySelector("#hdrReplyButton").click();
+ close_window(mc);
+
+ let replyWindow = await replyWindowPromise;
+ await BrowserTestUtils.waitForEvent(replyWindow, "focus", true);
+ replyWindow.document.querySelector("#button-save").click();
+ replyWindow.close();
+
+ await TestUtils.waitForCondition(
+ () => draftsFolder.getTotalMessages(true) > 0,
+ "message saved to drafts folder"
+ );
+
+ let draftWindowPromise = waitForComposeWindow();
+ select_click_row(0);
+ open_selected_message();
+
+ let draftWindow = await draftWindowPromise;
+ await BrowserTestUtils.waitForEvent(draftWindow, "focus", true);
+
+ Assert.ok(
+ draftWindow.document.querySelector("#msgSubject").value.startsWith("Re:"),
+ "the Re: prefix is applied"
+ );
+
+ draftWindow.close();
+ }
+});
+
+registerCleanupFunction(function tearDown() {
+ aliceIdentity.setUnicharAttribute("openpgp_key_id", initialKeyIdPref);
+ MailServices.accounts.removeIncomingServer(aliceAcct.incomingServer, true);
+});
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/browser_viewMessage.js thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/browser_viewMessage.js
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/browser_viewMessage.js 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/browser_viewMessage.js 2020-11-10 09:06:03.000000000 +0000
@@ -44,11 +44,11 @@
aliceAcct = MailServices.accounts.createAccount();
aliceAcct.incomingServer = MailServices.accounts.createIncomingServer(
"alice",
- "example.com",
+ "openpgp.example",
"pop3"
);
aliceIdentity = MailServices.accounts.createIdentity();
- aliceIdentity.email = "alice@example.com";
+ aliceIdentity.email = "alice@openpgp.example";
aliceAcct.addIdentity(aliceIdentity);
// Set up the alice's private key.
@@ -56,7 +56,7 @@
window,
new FileUtils.File(
getTestFilePath(
- "data/keys/alice@example.com-0xf2823b8f6c9a7553-secret.asc"
+ "data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc"
)
)
);
@@ -68,7 +68,9 @@
await OpenPGPTestUtils.importPublicKey(
window,
new FileUtils.File(
- getTestFilePath("data/keys/bob@example.com-0x4b6454a0c3cb51d0-pub.asc")
+ getTestFilePath(
+ "data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc"
+ )
)
);
});
@@ -102,7 +104,7 @@
let mc = await open_message_from_file(
new FileUtils.File(
getTestFilePath(
- "data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted.eml"
+ "data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml"
)
)
);
@@ -126,7 +128,7 @@
let mc = await open_message_from_file(
new FileUtils.File(
getTestFilePath(
- "data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0.eml"
+ "data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml"
)
)
);
@@ -150,7 +152,7 @@
let mc = await open_message_from_file(
new FileUtils.File(
getTestFilePath(
- "data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553.eml"
+ "data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml"
)
)
);
@@ -174,7 +176,7 @@
let mc = await open_message_from_file(
new FileUtils.File(
getTestFilePath(
- "data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted.eml"
+ "data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml"
)
)
);
@@ -198,7 +200,7 @@
let mc = await open_message_from_file(
new FileUtils.File(
getTestFilePath(
- "data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f.eml"
+ "data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml"
)
)
);
@@ -223,7 +225,7 @@
let mc = await open_message_from_file(
new FileUtils.File(
getTestFilePath(
- "data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553.eml"
+ "data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml"
)
)
);
@@ -249,7 +251,7 @@
let mc = await open_message_from_file(
new FileUtils.File(
getTestFilePath(
- "data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted.eml"
+ "data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml"
)
)
);
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,78 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol
+Message-ID: <1241106f-5ef5-ae8a-36ed-02d6f8f84d62@example.com>
+Date: Wed, 14 Oct 2020 14:29:03 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcFMA7L9So5P9bk9AQ//X7sl/QCVhaLmJVnPaF35yxDXmW5ACOdtKmyAAn0uaVKNRTdLontNFHRy
+DFeKhfDkl7ia6Emf4T1cP45/ViEJ4UphUwB550Anrzkhpqbmz3Sst0IuOxIrlQ+SDADzaMJIpsB4
+g2tsq7BNlfahe0J3h0CoVUZ+IBIZrj/d5nn1iLAJWwd4A8pMVBZ7lpPsalLDuzfJnWNJzD0atGYl
+GURSnrYWtK8df+tWmkSMlZIAqPQiH28r+seHmWdr8h7Q7zRPB0M7ElbDrJVl8bEeAlWogMXo3BP3
+55EfncyxWmShK16Rw6xrQ8Tgxu1s+zmw5LhhLA2poWXaeXWiYS0joKcFiEzvlplb+N7Wbvxr0D6w
+pKpJPG8fYCe4jSkuw4yHVSYkQVhMHsOfvULfHCffDR60DlcHrPTQLdvsaNJeKyhK1F0HNTaA4I5S
+bavbPMyxqhBLHw05CD27jLIK0slVPTTBhPUjsoGs44sGrpB9jz+IbeN085oEbtczm/crd2zh30Ip
+b14Y5BJae1Wzh5b/fTHF0KpKIc8OetwnoyBVE5eGtGFfJyTBXXbp9GsSS4rCI3aKPPnDJYNVMwEa
+qFPJpJJjWxUVcekLFOTeFhJtWrOmtNOVzt7tCHG/q8Kr+UvryoP5QdYBstGfizkTH88+WMsFVddm
+uju5rw4pM+Adu7yJgT7BXgNHZva51fIethIBB0D5OnsPEPF1mMxPEGZyMfNY60RBItwGlQd6sqi7
+GHOJBTDzPAoWQifXA/qk0nDqC3ikKFIypRnnYWXS0yiO8Qi7fCYh05NUBdwwJYgfy8cZYSDSxrgB
+k2FqB3EGXqcsrPW225CkmfGGrUeYosnUUsXdrChTxK/cfAW9f4N3kr0MA9R0VkD7BF6Lmir0Veum
+AcCkBVqrXPOu6os6N2Tl2ZOU+yq4JQJAgnndhGA2U4+TyFYs90BI3ifpr397t7HSKgQCb1F/QW4i
+KACweORJE3Rx2x0ispkZ4wfosOmT4JT9F7ykdkIN6JLtCoLXIokoUiW6R1eQkwFE8gEb+smlZ+PJ
+uS3HoTaE3FB6GbccYwAg/5H1oMT92nlx2x+tI/ocD136HOnVOPQv/vOa42O2Ipw77fKdZRQg40jq
+ZsB9poO6irjb4tjUDoeVil+MjwffqrytoJS9x/EQ2XTCG+FYyk9iP62N4LVbcMQCObKllGjL/fCb
+EzZcJyEKuQcW914PnZ4vXk8HpUaMdjACNWgDbPwvX7toeb7M09bZR+2MtDCtJFlhUq+fZDXRNGYT
+4wKNQxVCEX/AfuJkcy2uPmzo6yRyrmfaIdug+ypRMMenD3mf/do+rmqZsRL1O13YjH+X2Q6YreKN
+rSShWhHOdZlWuE2X9vyHqbdV6MH4IuypNVtIPdiC339/qeQgCBev10eHQPikdCA0JXgjdSTptUcy
+RRafRK0+FcguBcmsH8O1EIsflAtSCcqPA6y5omYj4uQ3xvwU7aXyzan0ZiYxhMj/ZPYremLSpFTh
+D6s1fO5jprvkZCD4V/Ix5YysOmldJ0X7uZ3wBPCheXNGu/q0qR9ksaWc2V3+Tt7UAPYPPINr7UUF
+69pbU1K2PGaUpSFZpDmrakCF8PgLzcEJpFaNAkstdA7/70w57GHWYu1QgU7dVeb5MXuKerPW5vr0
+scbDXGAWo2wXWvEYQhnPwq6PNwU65M6+5+Wvsfvb6nYIlEEIgeBzzcyHbYPVL004pxWUL582bzkL
+9U9dNMNfldzOr0riziblNxBdO4Fd7L38HAK/Ce8CEHuoorC80GU1CZGYacxuysBnFZnJo5iLSYjE
+XcIsjqRMYk+ZnlkGv5m6hj9zb61PLWVdepnKFmeDVqu97V4kqUR3KLCFJoyZ9UG3F3tz75xhV25F
+lusX9tQ3ddpOqOQH3wZVtdNFSzD3y8xem83aAe128at5jCPlGecKcmqLoA3tJwjst5BVhvcw7+7Z
+aDUDf4bNrli+l//UqoxslWP2TLfH6ZcdI4wdTpEhYQ21vKoavNq0i8k15GN6ENeK4+KFQXOuKzLW
+c7DDZOtgJ7aX2F2j2/FCgS1wjmhthMr3pWgEmg4KdDpnhrVpxzz6/rEYQdU2KTmKy4pTp9nvgTxI
+FBWRT1llRSoQLpSbD/2EHyIJAgf0GpEoQaEavyMN2oIvtDYOJqSGtBCXq7z4mI9qteUUIu8f7eMF
+NGxxFXjst70kYK+SMuT96h9to0TZUQQFtdymiIEVwke4T1a//jN/vkXa9VN3Y45ZuVlA2Y/ORhXK
+n+PaeXR3dNKLpiQUCdHoaJL0vOqXf+TbfQTauCF6jcLMJ4OsVauKBXLzUsadWhZuro6tiHpQL/J0
+ftco43xUFOFMcSjYFZXoKhjUt9I6jdLivG8CuxZebpbwV7TmW8XXKfVDnjHavSj4IpJgA2jS6K0H
+pBK4on+iH7FtehMK8tSVLzUNXy8MvZnvklC2b6XEfNUOq/H1m4VKM9bZhNsba0us5F3lOtX6vS1M
+k9krC8FFvwT8HDYxbBHUFO99FxlIqyVLbhFT7j008NcJv4QNBTmziHY/yZTNUp2/Rlcz5kSRFCNo
+LB+iLx5tawWYaGLT0O9mQpG73zd3cK1oTc4c9uJ2/AtMZOt+nYv5GaUqGPFazxCcZ0HlR6c1TCTZ
+gn7Pe2UgRlCYsAl3768WOxVCcMl/8mCQ0QBzm9tR1mS2JFmQgNhUpjshJkVTJeVaZPOfUNmONfYt
+LEXZ8aLqRqkQIOTcY9uBr3f55WaBDSKpO8VBn442EGn8uIE1FQOEJmmjFnJ5VyU/H1IumyLhvt9o
+EgPBQd8W0+3uyKBhC5sILPru41STAMV6n1+dcxxPpOkUMwoD3RQjrOtpQNk9KMr6wIgfIvPSskMO
+72amqSpq7Bmqf3RNQL4hZuqS0XfYIWD7gAzWHyIPXngp3UXmMDANOsRbPPDyrdm7U0Gwt33ub5DM
+Y9woXbDDZKvk7W0uwlCzJZ2bn4EpK56Yh80laN/V3Rn5fZVP9quN3+3+/lRVeaGGi8Us30MKXYHN
+StHU0DMonSyt/Ef2+aIiVEJp5vuTJiH9dkM4sVg+jQ8/LtwLnAZtRvVCNvZagX/ZPm9J1eH5E6aH
+NKcukVY3iTMQpLkeyZXhJnw+TYJSkpefPLxvCNwD/qewjN7+VcLtXDkrRsrwnjhu4TU2EQK61xK1
+aaVbH91T4GMLZsP4IO8TocnmBHuuyL8LBOcOWeOqiCFLEKHK/4jDWWcQMW9zqqKB+P82JYkEt+gT
++0sOTWHgQjOn4wHrrvCUbQaDQRYwpAsINVQ8N4fFazbUGw/xXdh7MKrfE/azHzcWB6d1XT5rSgtu
+kOQyLfxPJVevYf/JTG8/jtGDHQeb6p2GuIhCBn9m
+=d8b2
+-----END PGP MESSAGE-----
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,187 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol
+Autocrypt: addr=carol@example.com; keydata=
+ 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
+ meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
+Message-ID: <8a0f64bf-41b6-f20e-6caa-eae0fb5d32e8@example.com>
+Date: Wed, 14 Oct 2020 14:33:24 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="faEswfPorznMRhd02nPybB0ktMdKqd8R7"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--faEswfPorznMRhd02nPybB0ktMdKqd8R7
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--faEswfPorznMRhd02nPybB0ktMdKqd8R7
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+z+Dcu+E=
+=MZd0
+-----END PGP MESSAGE-----
+
+--faEswfPorznMRhd02nPybB0ktMdKqd8R7--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Carol
-Autocrypt: addr=carol@example.com; keydata=
- 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
- meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
-Message-ID: <6bfdfcfa-1f95-6060-58b6-372bb585dede@example.com>
-Date: Wed, 26 Aug 2020 15:59:09 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="snZm0r6lQ6hrV54hWwooQtQu9cVqLu3B8"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---snZm0r6lQ6hrV54hWwooQtQu9cVqLu3B8
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---snZm0r6lQ6hrV54hWwooQtQu9cVqLu3B8
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-=DuIN
------END PGP MESSAGE-----
-
---snZm0r6lQ6hrV54hWwooQtQu9cVqLu3B8--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf2823b8f6c9a7553.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Carol
-Message-ID: <79495c22-c496-3179-997e-ec2dc9c6c82e@example.com>
-Date: Wed, 26 Aug 2020 16:03:33 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="dCfsh32NTh4T7yOu3u1ekbGQsuNdfeOvC"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---dCfsh32NTh4T7yOu3u1ekbGQsuNdfeOvC
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---dCfsh32NTh4T7yOu3u1ekbGQsuNdfeOvC
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-EQ==
-=awui
------END PGP MESSAGE-----
-
---dCfsh32NTh4T7yOu3u1ekbGQsuNdfeOvC--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,57 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol
+Subject: Signed Unencrypted
+Message-ID:
+Date: Wed, 14 Oct 2020 14:36:08 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh
+Content-Type: multipart/mixed; boundary="oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk";
+ protected-headers="v1"
+From: Carol
+To: alice@openpgp.example
+Message-ID:
+Subject: Signed Unencrypted
+
+--oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
+
+
+--oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk--
+
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsF5BAABCAAjFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl+HRRgFAwAAAAAACgkQMJn/EjiFK59T
+xRAAoG7+tqzXKQH2S511jRudl0HaKs+AE7kfyqbqBpWsCzcuxWIvCY3cX9ypIEhLllYWTs15aQq+
+f0GCXIK6PFGukhoQ/m49MmiGh4D7oGYxmPQyn9yZVcijqmzF5f4s7oiSKVl9/4y8H0JCHaWuelkN
+fizcAyXUWdPdefL8pIQkng+EtBM1sZ25HBJYFU6du88u0LuA3A7SNRPcRc+LhrGticIPBsDcRntm
+41bcf9QKo36EnltJjSGv3Rtp/PacyMqsmlR/UDHzVP7yWNvPboPCIB2CHVN9J1URxE2S3hjfrbY0
+fuNTgA3TlJ7crTCztIrqugZT4RxhyP3orDhp5TKYLO8q9bof6C1Zo8VbvGzVrl4eVgP0YRNN19vm
+mPeH7rF7wTPhvht0sLKcFMFTXU458SokWZW94EpTBIGNWjCKlzE8TtQPyhViVpo1RUpJQx/tr6Pb
+9r81aKJ0hnrAcDqL+PMd4UWSAONCpr9YpOEY6hj4ppqI09b0HGnBDMvLwsm+PdZ1cLsRlqzCsYfj
+tsU9QpMBV4lJoAnMkGM7pqucovyHSNcgXU/z+OLH1LmPOfPeG3kCGlbRyaQPOt2ZhQZH2f0C6Dnh
+wvmVUqGG8GWDnfVP4hzKzMQQOyWHa/F+J1nwFlbdEBH640jxPdz80/uACXwkhdn+rssEfCeB7SDP
+Cfc=
+=Q8yQ
+-----END PGP SIGNATURE-----
+
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,197 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol
+Subject: Signed Unencrypted With Key
+Autocrypt: addr=carol@example.com; keydata=
+ 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
+ meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
+Message-ID:
+Date: Wed, 14 Oct 2020 14:38:44 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw
+Content-Type: multipart/mixed; boundary="hZdstSX9kVVgqQC8ECJGhlR1aVjuEMpuI";
+ protected-headers="v1"
+From: Carol
+To: alice@openpgp.example
+Message-ID:
+Subject: Signed Unencrypted With Key
+
+--hZdstSX9kVVgqQC8ECJGhlR1aVjuEMpuI
+Content-Type: multipart/mixed;
+ boundary="------------83F8BA9FCE9C945124B915CA"
+Content-Language: en-US
+
+This is a multi-part message in MIME format.
+--------------83F8BA9FCE9C945124B915CA
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+
+Sundays are nothing without callaloo.
+
+
+--------------83F8BA9FCE9C945124B915CA
+Content-Type: application/pgp-keys;
+ name="OpenPGP_0x3099FF1238852B9F.asc"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment;
+ filename="OpenPGP_0x3099FF1238852B9F.asc"
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsFNBF9GZTQBEACjK8Db1095rU74k/RwLhmp9rmFBZR6qyEHANlHSVwqARxa4aJPaNoLbqNPe=
+fuF
+g9ib3J0rKcZfqgnqC4usPVSTdmC4w0MdmHvh+1tUoXcxnrjYNRRbP+lC7zaLRRnEEioimC0Mk=
+h+o
+w1u4F2QFBjwcV9bD7i0T1DRfR5k5kh3kcaYFnGnwMjwjJzLtvu3OZbXYsofCw7890TP4LkqLE=
+QVO
+w1OrxBnRd5QNBVojcQi6rnKOQ7AUBGRKSXI3QVrbP+x1oImXpQSqIyaRFbtx57QafDdkyHBEf=
+ChO
+9X96BtMndyry8XgYtcgmwKKWg8Js4TJgghus6Sng5dA7/87nRf/9//NptXh9mdW3AiHsqb+tB=
+u7N
+JGk6pAPL4fUjXILjcm5ZXdlUeFVLmYmqTiOJcGFbqHEBGcwLKPoba2JsBEpnRj0ZEmo2khT+9=
+tXJ
+K3FUANc4w/QfxTXMwV17yYvocDPEBkoKcbxE8b2sSK/L7Vi+h21XX6fA6B3zKFQ3hetFvOjEG=
+TCk
+hFD9asL8KnwQdJmYo4Bd45AVoMZFxBxpmuo9MxPdiF2AGbKHgrKpqDw2pUfelFwMZIVQ4Ya1w=
+dtL
+e8gEJAMq6YnuuQcq+jjGKubNRywld7xXIsxJCpHtqbCQM9P+gqp1VDBnbsk4xGX0HgILXF2Jf=
+yce
+GMGy1Lku0QA+ywARAQABzRlDYXJvbCA8Y2Fyb2xAZXhhbXBsZS5jb20+wsGJBBMBCAAzFiEEu=
+PL2
+9L060/gtxEaDMJn/EjiFK58FAl9GZTUCGwMFCwkIBwIGFQgJCgsCBRYCAwEAAAoJEDCZ/xI4h=
+Suf
+jB0P/0+yaZknO8dS5o7Gp1ZuJwh6+vgTGWrTxcBtsU1JR4BFobPKtMmw45FKsNIiK+AQ7ExCt=
+qum
+GoTJ6hlclBFMlDQyyCxJG/ZpPdrFUFyg6JUVf05/LWsd4Fwy/hQY1ha8R81QinSHqv9DJk6fK=
+ZG2
+rz7YUE47LFfjugbwUj9y8naTxj823Vm6v36J2wgl/1/PHoZTwi3vQRA70SoIDt4tSjqBzuclt=
+2k/
+zlkJmOpBYtQb+xGwpfnh2gBJdYurLwJO9rQlzYjy/+1qB0CZsE95WlkTrqQw8V5S6ULcnyACb=
+ETd
+F5HF/geHL367p/iWULD907E4DJlQBOWjY6fdsJIBj96NfQiG+cXYTNGqaB/FgW8jyoS9vyg4P=
+DOr
+0nGHLvzPw7xTDUkuoJiWXMJ9kDYTZ+MsWreA885i1JSE32CsqqP3+kI7XQD3d3T3pIPhKOo0/=
+bzb
+LY6yWBXh809Ovi9fMxaZkrlrmA3lFcY+FbzDjZB+UYOXDB6TRu1jvISVMiXnYf4X21xWyl8AW=
+v1q
+ANMSXFKUwBSR88I06QZiJBmm9wHcyVtK/Hb6pgH10LydZvIfRDLrDBc2z31rswjNj9UhNp0Qf=
+GdN
+z/gXdxc8HP7Pf4kHkjIxLrWUNlDpYddX+iz1Z//VY9h2XTmSail5pMyyXdiGm90AGfVhIcaOo=
+eKK
+9UslzsFNBF9GZTUBEADWPef8E4OUoxU+vhwCxy/4nDfxzV4ZMFYkqp8QgpLzTVgTv6xGVHFx/=
+waN
+jwR6G34tD0aYhkDrumv9QsMdiQnMw9pLAoc3bnIkL8LkXnS8fVeiuzkXd4lgvpxFlce7KYuXo=
+s9E
+w7Nm2tOx4ovoygFikjliFTKn+QOVJoTr4pxJL9RdzYQ/pV/DI/fc2cmRWy0uivP+F+LBtYW6Z=
+OMY
+1aXzsJEvun2i5ZxV2jqNDhXpD3m6/Y/28WItKbmT80hvTivxO2DSQ1kqNcwB8Z0XWZJoz6iyY=
+Uu2
+7dKB0L4S/x4UASlC6J2Db8bIL3Tdhuy+N0BN8sS1TDWb7Oi1Ad8huVxfrRSyOYj4fkksvAEgD=
+EDH
+6JEvJBU3CGQtfXCoX6d64db2cGp85GDfNHTREJ0mbRjLAKL1RKrcKOG1790OZU2veF5qiN2eN=
+08O
+LfJURL8+P4+mDWbaOcZasqNrg3YhYcPX3ZZzKfEIvvTOdqMk00JU3zaUZhJvGOR9tJ27NBTrC=
+EIO
+Hz7yzOJltTDjdfNZNLqSYFp08+vR/IjSDv8hl6PRjkomkbfdPdwPczKS0dG9Cf8cU+NZQrEgE=
+0Un
+4tvb7p55j9R5OVgHUACLFTlDIRV4veD5RnM2hUFRtBONymXEDjoPGZXaHhv16MckFpZ1IEAkM=
+IZ3
+Ti/NIZcS7IA9jRgBUQARAQABwsF2BBgBCAAgFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl9GZ=
+TYC
+GwwACgkQMJn/EjiFK5/Q3hAAmzMu7EOeWG0xAHAQ4b/ocCSlZqg/MSf6kJIkzUxdnX9T/ylEm=
+rS8
+cEg5mdJMQMVvCecyDpNK9MgJPV7MTnR6x/4qgdVUTtknd6W7RrQ7Oai150nMH5U9M8GrFtbQj=
+c/f
+Ow17agoT06ZGV4umIK41IIGwQZ2/Z/cElHkQZll9//hYS8/E8xOBlweVxsMZhfcLFrbx2hC2o=
+sRt
+0vMlGnYSnv29ligVG+2PwwnHXB6Tn7eslzoowY78ANCTvA6Rc6zR+RIs/CIiaDNgWCRBJcueZ=
+VpA
++JkyL6KmC+JiiF6Hsm07DDDjgLVJ0s660GNe8sWw4IZ8wpvYq1goqXLu+CMqbCsBrEDwfguCl=
+xGS
+QnLwAUIVxuyKprToLJ6hmuubsVcv9fzf/GoYFnT9hge1YZpptKi/zrQqy2CZuSZEHWpUZcwPE=
+3Ow
+qbHKty3UhZPJU50kmEOd/UQNJYNWxxxx5593X96jLLDOxm5M5jNNRvGZPgn8RbA1e7VC2XFgV=
+2KG
+JHq/gxCpwkWs8+0sYUtcFuu+RQWTKbJpFcxfAIEDKS+fyLRAFdYqUA3yQIA1UYco10l8RYPLY=
+0+I
+XiArqjql8+k8PBT0U4P59lfcKlY2GaJe4aoWLPOdNZAJgLzoxd5zgnz0vI3sn+3vmeCtpxz2P=
+oYB
+JfxGPEzu9xTLV6k9wSVTCgE=3D
+=3Dt/qV
+-----END PGP PUBLIC KEY BLOCK-----
+
+--------------83F8BA9FCE9C945124B915CA--
+
+--hZdstSX9kVVgqQC8ECJGhlR1aVjuEMpuI--
+
+--vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsF5BAABCAAjFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl+HRbQFAwAAAAAACgkQMJn/EjiFK58u
+hhAAmMd8eBmmgXm/qLv1XrOsVOrV5wV39BgdrP0KNHN1Rd0jJmr5HWS81DbV4Yk3UPiOH0Ncj/Cg
+1EFwio+QLnn4SUMTijClTb9V9MyNPIx3IL9Vuh4VOtJb7Yk3skuTqYTk5uExwlwRxRiU40N7pO3z
+nvu/YKPHJZzndWP+p0PuEql8t+Hy5Qm/ibz/364TreLpL3lAKOS11LDQqV4HnzI4YznSlqA8E8LE
+aYJPNJb/ycWyyNohJcMqbNmPxA+V5razCeLlFJyaXw8kykctKOfvFJ2K8WtOBYfAP2/echKGeVQ9
+v0Z2/XH1Ons5vJvc+IB466CYIMAkwHS+1Yq5O/esAAvt/FVY3YBGQIOowZOy1396lykrXhKkKKoG
+Mcp1jU0Bvhyv95sqRbpRfQixGZjvmPnIcpcX8jJz+/mvKpqcFTWjDrxJX3bbeuw0nGQ9ncJD10sZ
+XB77OUyT9ye0iNxvrj6EJ4LWs96Ofq6V4Szdcn+iUHHMXdkLXoONDoF3CIt13BrIWs3p8h+hxfo3
++9gMPREXS8P9yHOX4rNT2I6hIQMNXXa7U4AV5+hn46fvgRdYLz7YHmIdD6QDhFKRujD9TqdgyYSP
+kaQTxLw0WsVXbh6mBlfyvoMREhHpCszoCFls+eIkFfxQilY5EwQffFqVDR72yTE8+AkQCw8/Es1h
+LBU=
+=dmTh
+-----END PGP SIGNATURE-----
+
+--vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Carol
-Subject: Signed Unencrypted Autocrypt
-Autocrypt: addr=carol@example.com; keydata=
- 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
- meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
-Message-ID: <18d4c94f-3ea7-f395-473c-8ec5194988cc@example.com>
-Date: Wed, 26 Aug 2020 16:06:22 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Content-Type: multipart/signed; micalg=pgp-sha256;
- protocol="application/pgp-signature";
- boundary="QMjI7ej1epbqHMDeowTnNtIMNu8p1QOU5"
-
-This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
---QMjI7ej1epbqHMDeowTnNtIMNu8p1QOU5
-Content-Type: multipart/mixed; boundary="v409QAVEbp4pNmR8ygSpOTQzwKAa5hx1l";
- protected-headers="v1"
-From: Carol
-To: alice@example.com
-Message-ID: <18d4c94f-3ea7-f395-473c-8ec5194988cc@example.com>
-Subject: Signed Unencrypted Autocrypt
-
---v409QAVEbp4pNmR8ygSpOTQzwKAa5hx1l
-Content-Type: multipart/mixed;
- boundary="------------A24D0192B07AAD52D8F1DCB1"
-Content-Language: en-US
-
-This is a multi-part message in MIME format.
---------------A24D0192B07AAD52D8F1DCB1
-Content-Type: text/plain; charset=UTF-8; format=flowed
-Content-Transfer-Encoding: quoted-printable
-
-Sundays are nothing without callaloo.
-
-
---------------A24D0192B07AAD52D8F1DCB1
-Content-Type: application/pgp-keys;
- name="OpenPGP_0x3099FF1238852B9F.asc"
-Content-Transfer-Encoding: quoted-printable
-Content-Disposition: attachment;
- filename="OpenPGP_0x3099FF1238852B9F.asc"
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBF9GZTQBEACjK8Db1095rU74k/RwLhmp9rmFBZR6qyEHANlHSVwqARxa4aJPaNoLbqNPe=
-fuF
-g9ib3J0rKcZfqgnqC4usPVSTdmC4w0MdmHvh+1tUoXcxnrjYNRRbP+lC7zaLRRnEEioimC0Mk=
-h+o
-w1u4F2QFBjwcV9bD7i0T1DRfR5k5kh3kcaYFnGnwMjwjJzLtvu3OZbXYsofCw7890TP4LkqLE=
-QVO
-w1OrxBnRd5QNBVojcQi6rnKOQ7AUBGRKSXI3QVrbP+x1oImXpQSqIyaRFbtx57QafDdkyHBEf=
-ChO
-9X96BtMndyry8XgYtcgmwKKWg8Js4TJgghus6Sng5dA7/87nRf/9//NptXh9mdW3AiHsqb+tB=
-u7N
-JGk6pAPL4fUjXILjcm5ZXdlUeFVLmYmqTiOJcGFbqHEBGcwLKPoba2JsBEpnRj0ZEmo2khT+9=
-tXJ
-K3FUANc4w/QfxTXMwV17yYvocDPEBkoKcbxE8b2sSK/L7Vi+h21XX6fA6B3zKFQ3hetFvOjEG=
-TCk
-hFD9asL8KnwQdJmYo4Bd45AVoMZFxBxpmuo9MxPdiF2AGbKHgrKpqDw2pUfelFwMZIVQ4Ya1w=
-dtL
-e8gEJAMq6YnuuQcq+jjGKubNRywld7xXIsxJCpHtqbCQM9P+gqp1VDBnbsk4xGX0HgILXF2Jf=
-yce
-GMGy1Lku0QA+ywARAQABzRlDYXJvbCA8Y2Fyb2xAZXhhbXBsZS5jb20+wsGJBBMBCAAzFiEEu=
-PL2
-9L060/gtxEaDMJn/EjiFK58FAl9GZTUCGwMFCwkIBwIGFQgJCgsCBRYCAwEAAAoJEDCZ/xI4h=
-Suf
-jB0P/0+yaZknO8dS5o7Gp1ZuJwh6+vgTGWrTxcBtsU1JR4BFobPKtMmw45FKsNIiK+AQ7ExCt=
-qum
-GoTJ6hlclBFMlDQyyCxJG/ZpPdrFUFyg6JUVf05/LWsd4Fwy/hQY1ha8R81QinSHqv9DJk6fK=
-ZG2
-rz7YUE47LFfjugbwUj9y8naTxj823Vm6v36J2wgl/1/PHoZTwi3vQRA70SoIDt4tSjqBzuclt=
-2k/
-zlkJmOpBYtQb+xGwpfnh2gBJdYurLwJO9rQlzYjy/+1qB0CZsE95WlkTrqQw8V5S6ULcnyACb=
-ETd
-F5HF/geHL367p/iWULD907E4DJlQBOWjY6fdsJIBj96NfQiG+cXYTNGqaB/FgW8jyoS9vyg4P=
-DOr
-0nGHLvzPw7xTDUkuoJiWXMJ9kDYTZ+MsWreA885i1JSE32CsqqP3+kI7XQD3d3T3pIPhKOo0/=
-bzb
-LY6yWBXh809Ovi9fMxaZkrlrmA3lFcY+FbzDjZB+UYOXDB6TRu1jvISVMiXnYf4X21xWyl8AW=
-v1q
-ANMSXFKUwBSR88I06QZiJBmm9wHcyVtK/Hb6pgH10LydZvIfRDLrDBc2z31rswjNj9UhNp0Qf=
-GdN
-z/gXdxc8HP7Pf4kHkjIxLrWUNlDpYddX+iz1Z//VY9h2XTmSail5pMyyXdiGm90AGfVhIcaOo=
-eKK
-9UslzsFNBF9GZTUBEADWPef8E4OUoxU+vhwCxy/4nDfxzV4ZMFYkqp8QgpLzTVgTv6xGVHFx/=
-waN
-jwR6G34tD0aYhkDrumv9QsMdiQnMw9pLAoc3bnIkL8LkXnS8fVeiuzkXd4lgvpxFlce7KYuXo=
-s9E
-w7Nm2tOx4ovoygFikjliFTKn+QOVJoTr4pxJL9RdzYQ/pV/DI/fc2cmRWy0uivP+F+LBtYW6Z=
-OMY
-1aXzsJEvun2i5ZxV2jqNDhXpD3m6/Y/28WItKbmT80hvTivxO2DSQ1kqNcwB8Z0XWZJoz6iyY=
-Uu2
-7dKB0L4S/x4UASlC6J2Db8bIL3Tdhuy+N0BN8sS1TDWb7Oi1Ad8huVxfrRSyOYj4fkksvAEgD=
-EDH
-6JEvJBU3CGQtfXCoX6d64db2cGp85GDfNHTREJ0mbRjLAKL1RKrcKOG1790OZU2veF5qiN2eN=
-08O
-LfJURL8+P4+mDWbaOcZasqNrg3YhYcPX3ZZzKfEIvvTOdqMk00JU3zaUZhJvGOR9tJ27NBTrC=
-EIO
-Hz7yzOJltTDjdfNZNLqSYFp08+vR/IjSDv8hl6PRjkomkbfdPdwPczKS0dG9Cf8cU+NZQrEgE=
-0Un
-4tvb7p55j9R5OVgHUACLFTlDIRV4veD5RnM2hUFRtBONymXEDjoPGZXaHhv16MckFpZ1IEAkM=
-IZ3
-Ti/NIZcS7IA9jRgBUQARAQABwsF2BBgBCAAgFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl9GZ=
-TYC
-GwwACgkQMJn/EjiFK5/Q3hAAmzMu7EOeWG0xAHAQ4b/ocCSlZqg/MSf6kJIkzUxdnX9T/ylEm=
-rS8
-cEg5mdJMQMVvCecyDpNK9MgJPV7MTnR6x/4qgdVUTtknd6W7RrQ7Oai150nMH5U9M8GrFtbQj=
-c/f
-Ow17agoT06ZGV4umIK41IIGwQZ2/Z/cElHkQZll9//hYS8/E8xOBlweVxsMZhfcLFrbx2hC2o=
-sRt
-0vMlGnYSnv29ligVG+2PwwnHXB6Tn7eslzoowY78ANCTvA6Rc6zR+RIs/CIiaDNgWCRBJcueZ=
-VpA
-+JkyL6KmC+JiiF6Hsm07DDDjgLVJ0s660GNe8sWw4IZ8wpvYq1goqXLu+CMqbCsBrEDwfguCl=
-xGS
-QnLwAUIVxuyKprToLJ6hmuubsVcv9fzf/GoYFnT9hge1YZpptKi/zrQqy2CZuSZEHWpUZcwPE=
-3Ow
-qbHKty3UhZPJU50kmEOd/UQNJYNWxxxx5593X96jLLDOxm5M5jNNRvGZPgn8RbA1e7VC2XFgV=
-2KG
-JHq/gxCpwkWs8+0sYUtcFuu+RQWTKbJpFcxfAIEDKS+fyLRAFdYqUA3yQIA1UYco10l8RYPLY=
-0+I
-XiArqjql8+k8PBT0U4P59lfcKlY2GaJe4aoWLPOdNZAJgLzoxd5zgnz0vI3sn+3vmeCtpxz2P=
-oYB
-JfxGPEzu9xTLV6k9wSVTCgE=3D
-=3Dt/qV
------END PGP PUBLIC KEY BLOCK-----
-
---------------A24D0192B07AAD52D8F1DCB1--
-
---v409QAVEbp4pNmR8ygSpOTQzwKAa5hx1l--
-
---QMjI7ej1epbqHMDeowTnNtIMNu8p1QOU5
-Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
-Content-Description: OpenPGP digital signature
-Content-Disposition: attachment; filename="OpenPGP_signature"
-
------BEGIN PGP SIGNATURE-----
-
-wsF5BAABCAAjFqEEuPL29L060/gtxEaDMJn/EjiFK58Fgl9GwL4FgwAAAAAACgmQMJn/EjiFK597
-9g//X0bjOtB8xgvJ5Jf3sXw/vH0G0T+o90qNbGylDawWVLSPshPGBi8QfjlLurv0aKttLih8e2yy
-1Z5LFbQi0t6oEJe/hybo/sctZRt81HDHUKQoCzig0QHoIiAGMidGRB4nVVVTwmbhR4FxZb6/hIHf
-0E2r1MKihM4iN3NkHVNh7f1uB45TGvOSgNZpzhYefCzj8Hzh0mnfir03MExEEDtNxKxUSIFSjtaq
-P0n0/5mN/W3zgT86CBi9UFn3VQ2GMtqYc5RR90w/2a0DgKiR9Y/sE9hwCt0gVSXECwObichBPOff
-1i4Okc7dMHvm+rtc+FBeM9Mxc2O3c/cak5LKMeFnYJwnCaaXVVNbgso4sYut0ymnJj9dvD1FXGG6
-kmQqN4D/oDWgbVQ+64OEtiEkops3hbCWhUHRDlEAwGEv57G6We7knYdgrlc2jMdChpffR2gimM1f
-DCxLNQPiEUs7PeoNxehHN16c2xJVSxrtqZV9Ib2gHe9eo2RGrSK2GJT9bbCXc3vanDSefGOfd3n8
-t8zNY+jK6yyxAvM/esdjICxiS3ZGWA24a/fZNt7ZRj5O4VL1rrT3NQDMH2gPNWfZ859puquK4v+p
-IMNOVP3XeQKbwSnpV6T2faS6MOksiJP4G0rFH28s/0StD4NFmeAIYILPqPzGQ4atNUP363XoFPR7
-+Dc=
-=iUjJ
------END PGP SIGNATURE-----
-
---QMjI7ej1epbqHMDeowTnNtIMNu8p1QOU5--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf2823b8f6c9a7553-unencrypted.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Carol
-Subject: Signed Unencrypted
-Message-ID: <89d2fe51-3ab0-d74e-de75-0810b02e59f0@example.com>
-Date: Fri, 28 Aug 2020 09:28:24 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Content-Type: multipart/signed; micalg=pgp-sha256;
- protocol="application/pgp-signature";
- boundary="7Y1mFO9T0wHjfl5gKA2rtQyglX3K0sr9i"
-
-This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
---7Y1mFO9T0wHjfl5gKA2rtQyglX3K0sr9i
-Content-Type: multipart/mixed; boundary="fV9MEPibN4nejrCZSuGlk6kexiV1egE36";
- protected-headers="v1"
-From: Carol
-To: alice@example.com
-Message-ID: <89d2fe51-3ab0-d74e-de75-0810b02e59f0@example.com>
-Subject: Signed Unencrypted
-
---fV9MEPibN4nejrCZSuGlk6kexiV1egE36
-Content-Type: text/plain; charset=UTF-8; format=flowed
-Content-Transfer-Encoding: quoted-printable
-Content-Language: en-US
-
-Sundays are nothing without callaloo.
-
-
-
---fV9MEPibN4nejrCZSuGlk6kexiV1egE36--
-
---7Y1mFO9T0wHjfl5gKA2rtQyglX3K0sr9i
-Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
-Content-Description: OpenPGP digital signature
-Content-Disposition: attachment; filename="OpenPGP_signature"
-
------BEGIN PGP SIGNATURE-----
-
-wsF5BAABCAAjFqEEuPL29L060/gtxEaDMJn/EjiFK58Fgl9JBngFgwAAAAAACgmQMJn/EjiFK5/V
-rg/9Fg5bUITERWRHJIkVd6BQrLUFdxnte9Ko9fKbqq3mDawgFVUz4neRfelBFtjQULebV17XKpqE
-TOmu1FvVU1VP20E9/WXQzkbCsrf7Fu6tmO9he7vXs2/Q04Rc8eSsZcvO+yrioJg/E/IITlXYDKGw
-7Ez/VYAc53XXJSBq+ODesB6BICPgqeQBIWhecJn8kXIjqwbddX7ePq5coc5wWifARxDDXX3FuVii
-QF2+xiauio8tvUt3ky2y6u61+cM5kIQnpFNQD3QZLt8SSI50+U3LoACgGRzi5fHF+sPScr0HzQWV
-LbOzBRBHHsdu/XjQBfWgYeHUAb5xhQxnp6A7CmfTCP2zI5LSRfE05vcYCMTGtqd/3DGNNio5MTEX
-sx8KlaK/egmbIi+IZxeSrZ/Mnr8drznz6fQCDqn+a4DlW0e00eT4+lBrKJHEYxldFPP603DTrbhx
-CTzGL9rkV4ysR0iiWqkxm95z/R11XcJ39zd8f63F4pYuujD0foLpRJwx8+P7Xe8Hn00pwGSWKJoE
-OwRQbjKt2HhE4jkTZDoOx2McvJVsTEwqNeJBXu7tGsPJw/OlUfztE7jANg5ot1S/P3DXlSXkdnRr
-1PIYptwodGi4wXpj4Qs5WJT3cZCZpJ6JRbuxoXhFuK2Fp+ilZi0wqTLmcASTyitOxz+dBsiGevJ5
-Ifs=
-=QgQ+
------END PGP SIGNATURE-----
-
---7Y1mFO9T0wHjfl5gKA2rtQyglX3K0sr9i--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553-autocrypt.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Bob
-Autocrypt: addr=bob@example.com; keydata=
- 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
- ms2J6vUkrCVRfqCl5z/e4rkvKLzU7g==
-Message-ID: <5087688a-a11c-7534-b519-757db5804103@example.com>
-Date: Wed, 26 Aug 2020 15:10:27 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="9hAxUf0l24g9qBLUrqgZoagzhdFCl9vZd"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---9hAxUf0l24g9qBLUrqgZoagzhdFCl9vZd
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---9hAxUf0l24g9qBLUrqgZoagzhdFCl9vZd
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-8g+ZVSoQWv8fkE9+fRxdFQlMq2jRrRfzMUKWow==
-=33H6
------END PGP MESSAGE-----
-
---9hAxUf0l24g9qBLUrqgZoagzhdFCl9vZd--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-encrypted-to-0xf2823b8f6c9a7553.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Bob
-Message-ID:
-Date: Wed, 26 Aug 2020 15:06:04 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="8543b0eWdM942HoIYv1Ezws1mSIG3kCq0"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---8543b0eWdM942HoIYv1Ezws1mSIG3kCq0
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---8543b0eWdM942HoIYv1Ezws1mSIG3kCq0
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-=+K1D
------END PGP MESSAGE-----
-
---8543b0eWdM942HoIYv1Ezws1mSIG3kCq0--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted-autocrypt.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Bob
-Subject: Signed Unencrypted Autocrypt
-Autocrypt: addr=bob@example.com; keydata=
- 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
- ms2J6vUkrCVRfqCl5z/e4rkvKLzU7g==
-Message-ID: <1f926b04-af57-b3a4-2061-ab3a08dcf1c1@example.com>
-Date: Wed, 26 Aug 2020 15:13:31 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Content-Type: multipart/signed; micalg=pgp-sha256;
- protocol="application/pgp-signature";
- boundary="HNGJ1NMJsXRVhyphRbA0mAUZRKydNBVks"
-
-This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
---HNGJ1NMJsXRVhyphRbA0mAUZRKydNBVks
-Content-Type: multipart/mixed; boundary="mhYGj8nc0H1LpcxWhlr8ZFrRuK53hvYeq";
- protected-headers="v1"
-From: Bob
-To: alice@example.com
-Message-ID: <1f926b04-af57-b3a4-2061-ab3a08dcf1c1@example.com>
-Subject: Signed Unencrypted Autocrypt
-
---mhYGj8nc0H1LpcxWhlr8ZFrRuK53hvYeq
-Content-Type: multipart/mixed;
- boundary="------------8A363E3F87D50CC3B67C337C"
-Content-Language: en-US
-
-This is a multi-part message in MIME format.
---------------8A363E3F87D50CC3B67C337C
-Content-Type: text/plain; charset=UTF-8; format=flowed
-Content-Transfer-Encoding: quoted-printable
-
-Sundays are nothing without callaloo.
-
-
---------------8A363E3F87D50CC3B67C337C
-Content-Type: application/pgp-keys;
- name="OpenPGP_0x4B6454A0C3CB51D0.asc"
-Content-Transfer-Encoding: quoted-printable
-Content-Disposition: attachment;
- filename="OpenPGP_0x4B6454A0C3CB51D0.asc"
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBF9GZRoBEADm75RR/USXpIqgvnxAaf5lIgZSoIMy6YtlG9PWXPA90/9HSU0rSwmbfWcWP=
-AMH
-cNWO+yBHGSyDR6Yz6mFoxHZFSrbh2r9Obex+u9DHMj1KkRGf37FDM1NE63O7hFzN3X689N0A9=
-vT9
-hidAhxNOfmNp0dPUyjL3WJIEYVc9sFGCi0GCMAVEU9TDnDG+bK7PMRquoNYab0RhFezsqdFmi=
-OCg
-OWPG802QzzsgfK/v9ycE3H9GLncFYoXJ9ycTAKUSSFxtM1nENu5agwvW6OPbjQxnSTuq3ZMSv=
-7Gz
-OxX3qcjZRnVwq6nbS9wJR7obv2xgLLj2yKSVCGgxXXy6XCUPhFe/RgszaT7cAE6WmcucSNRTP=
-tCh
-P00I4TwmCx+05As0WHKVTDLVVVQOETRiVNr8tByNrrMpKxTpayfmXKyg5Jsvk5K0RE+JgyapH=
-W7+
-36jxTUiWzshpsWrPdiWZWce1ZEb7woznM2xLdL19mMMXpq4M77vF7TSN65EEzvo907bLuCkHm=
-+xk
-wsWPFy+uEMcSTyIuygvR/R74f5PT8Sf4Q6KnyqT9HstI10PSwOiZBCC5CY99MIwrEHQybrXEo=
-VRv
-B3GnUGV6GI1ryf+czDFMpPeTB0WRSZJbQw+nNiRBsLK0Ktk2aJ3jmg1nDFHVtG5QuGiRzaz8J=
-9+H
-6MaPsC73HypxrQARAQABzRVCb2IgPGJvYkBleGFtcGxlLmNvbT7CwYkEEwEIADMWIQT8EVyqB=
-rJ1
-WJvMfJpLZFSgw8tR0AUCX0ZlHAIbAwULCQgHAgYVCAkKCwIFFgIDAQAACgkQS2RUoMPLUdAju=
-w/+
-Pr75ocPNCPqMTMiVnsWsYHnpbmDp1mYCdpboPPugF2cQ/8bqxSMJDAZneH7cq3FVb8X3mu5fv=
-Wft
-s4FOq/uSpOhw6r4id0ngmhPoFvlyr6wldqMxMq1waVT9yZSyeY3PCJ8+fJf7O9PSBu/W6ySgp=
-Bb2
-hGa+EPa0kUuxm+9hkCD5ZoI6CtqvTCmVE3so5NgyRzub7qHKW31UZP4LvId+qDRqc2HUjHd+7=
-mUb
-ujm+SfIuGqM1PpPmqV5767slKjzuZ1YkWYqqgX+d5pakSY12Y22Rn49rg3AtXQQKTA+cxELRf=
-lBC
-La8txRCXdQpuOfhS51K8hSSh/7Hz/DGfFLX4T/jtOsba+rGhrpMLQ5bQ+4gWl4aw1kxh9eeA8=
-BoA
-XlnrYE7wk+ehrAuPFueZyhuWLrQjQiuHv8N2/sOrsUOlwqBEZmvq6YqJuKcTxC1eYnCAtZ8f+=
-tvg
-5HXbOWcyu7+dFNcTcNt1wb8oYXW3Nh1hCkNmsL6NosKM/QEKMOKYu3MFAFX+ydViOOsY+xElO=
-mRE
-GQQe1hX5nCtj3iXKVY+pDkPRh0fdxhDZg0xZvYkAx0iUMMrWbfd9dihLknB2QBfYLrfol18Y/=
-FQD
-zfGbH3XRfhGdgPy4tkrI7SeN+xf+9reJP42VCQgGEJVQ0jOefqc684J1rwXP8KFMMtnv8Pnqx=
-avO
-wU0EX0ZlHAEQANuDsbX1oPS/yafTVRDhlqEj0rxQ3cZxPHe3xHuEwLJKp4xvX4b9/zSVKDh6M=
-PLg
-3OTYiaLhc5V92dUEA6NGoqOd9GRoC8yQ8ZkAoPbwyTnv/AdTp1XreuRz3kA38hKsXq/TPWNW2=
-P44
-IeLxJzF6FQ62WJnDk/n5A9rGYwo3xTqqvyixrt3BNI9WfqWMKJWR/BQKPCd2UOheE1oRUEmMe=
-tkt
-Op1RrTYep/hHIckUsyitOqoaXUHGwkDknr/B5hKGGy1jGF9JTsG4BTvVN4Is9ZppG1hkmC7pd=
-9GD
-zml0ixDV6wKJgNTAWM0guZ4AlaBgWREIoNf0Ooj9tcVH4i+ivo9eM7kUHrg402G6LbdZPiwiT=
-hZG
-pfFLUEDshASoKmpsOwk3gXv6/ZzN5Z2Q0xr4djOTVVL2wcCBRumubxIQ8/t8ro4/x6ZaHUp5F=
-zS/
-diLfPfdWDOiAaJwjmZbUXg/FWpayMWtz+9yoMonD/5pLtVxA588mpJiu1lK8YBoqc2oN6BqKc=
-c+y
-idZCgIWH8PWKUROVSQpmbSkgoc09PE+JC5JO7gkjV3YtU44+EpPOWKA4exeqRAjNKnHw3NrCQ=
-OXO
-gbV6nf+n0iPzr41GDGU+nqJDuBmPloDNrJhcVDsnMbnLNldNKreVcyIomPsJ06ljd4i1o7OfB=
-06k
-lRtAVmcYmdtTABEBAAHCwXYEGAEIACAWIQT8EVyqBrJ1WJvMfJpLZFSgw8tR0AUCX0ZlHgIbD=
-AAK
-CRBLZFSgw8tR0N6gEAC6ODekbjTq+VdYULoUCiq9BseombRK/9NY0jAeN1U+hL/hkz3YE2dhz=
-8Dm
-oV21rbLm0Rrh1QuI4/wIWEjkHXRgmw+dfPQmiGNKr2enXloXV2mX16+ewBcGbyqo6F1tva+M1=
-Q/6
-O8Z4FHgp3qHkgNoS3435uZz2vjtVhWJFmHkqkIk+rGHa3BtLuwLKGW9vcfFsavPb3rftVH7B1=
-q0H
-wElBLyAN0Rsv1S95soRLATxsA93GhsNoUpxv/SyxdPlXvlKecupBwevJ8zmmXNVx0UX9n08ep=
-zIN
-aPFyaescEwbZ7XUD9m6NicHe4Feqb+pJ1LEDbhQ+Z6kurQNxEVANrHAxhc86+xeYBb3tqLCrM=
-xZ6
-7WUBCz/1mb5oALcpLxoc4p8QAMPBVldP8/y9liXkEspHuq7ylln+yynP8ZQFaCwYKhgvj0sxl=
-4zV
-i+vMVM8vJxfo0WMwLFZfljWrHgCkV8laSpuDxAEWRG46DH4MYByy8yhjzkS1nJT62kLHcYlqu=
-5Tk
-G6W0/ItUJ7hIH2eNhHMtJQkJKMxyzppsKxfPyLAisu6b0PfbpBitXFHRP7YCscWwjf0jbrLM7=
-UQx
-CoXHL+TPk5dFEXVJDRS9gybKaVVhjn9zQVW34/iFCwQwEFx3SLkOWEnY1jjgvULgms2J6vUkr=
-CVR
-fqCl5z/e4rkvKLzU7g=3D=3D
-=3DYFDj
------END PGP PUBLIC KEY BLOCK-----
-
---------------8A363E3F87D50CC3B67C337C--
-
---mhYGj8nc0H1LpcxWhlr8ZFrRuK53hvYeq--
-
---HNGJ1NMJsXRVhyphRbA0mAUZRKydNBVks
-Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
-Content-Description: OpenPGP digital signature
-Content-Disposition: attachment; filename="OpenPGP_signature"
-
------BEGIN PGP SIGNATURE-----
-
-wsF5BAABCAAjFqEE/BFcqgaydVibzHyaS2RUoMPLUdAFgl9GtFsFgwAAAAAACgmQS2RUoMPLUdAs
-ixAA173f5yTk2URlqP3iDhkjfbBN/piH4VJuppbW9j8UCVhMf/BVVmM30xpIyevJwo0dRmTHVrgY
-AT3rz6A/i6OfSBlzoKy8pdUSJ9P8bGqlutc24NmWLqNIC5XHg5RtfbePvxw7jC4ZJYVNBJv9i3aH
-4dQlvqWYgOgFvJYESi0ZRBqscXaICWdxD86Mweo8td2XiOg+JWF1nNFKUdbtkHNBrctqTqOd51O1
-oWcMzes24H4X4l64oakLUV3RhrR+NRJq2yWySU7zdH1Ly11sBdM6ceV9NZHXPLZCi8a3pRHkQuEF
-eDtUI9EVvsdYIaR6tiLZtini/oXQoKdWsFWxVUvhVwz1wlMjWAkJyeBnTO0WXdybPId59aZ6OqSH
-DueIShcH5fNVRf8HvlYzvs2buGUKzDbbPGfdN6VM7NJuCO3m7VvahXca85utCA+nUgqUbFn/z8Z7
-2nxSToXGEUGLQRZKZjr1JkmX7FEb6KWRC+GOqtLvzfRkRnGhylGzTL0w+iC1Enmz0a13gQKvtrWD
-JHSvfJFbRiK17LLI1H2xLX0W0bBPtVH5hrJHU6hsLtib86QWrpALcpnMwipAzxZ+9PzpEVOZbrHb
-gDi8FoEw0bFzQ26CEDWwEQK6SocrHDV98LlQ1Mmt/pcaNccayfugKwif5yWPCJDfZ14mvxVv+SSZ
-Yuo=
-=4U04
------END PGP SIGNATURE-----
-
---HNGJ1NMJsXRVhyphRbA0mAUZRKydNBVks--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0x4b6454a0c3cb51d0-to-0xf2823b8f6c9a7553-unencrypted.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Bob
-Subject: Signed Unencrypted
-Message-ID: <395b55ba-48e1-1ab9-0b0d-f7bdd62bdc27@example.com>
-Date: Wed, 26 Aug 2020 15:12:28 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Content-Type: multipart/signed; micalg=pgp-sha256;
- protocol="application/pgp-signature";
- boundary="PaduxavryIPfiUYByCeVE2oysYZqtwUb8"
-
-This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
---PaduxavryIPfiUYByCeVE2oysYZqtwUb8
-Content-Type: multipart/mixed; boundary="j6PIJNeVR5JwKRYlTTjdukBW60Q0tIl0l";
- protected-headers="v1"
-From: Bob
-To: alice@example.com
-Message-ID: <395b55ba-48e1-1ab9-0b0d-f7bdd62bdc27@example.com>
-Subject: Signed Unencrypted
-
---j6PIJNeVR5JwKRYlTTjdukBW60Q0tIl0l
-Content-Type: text/plain; charset=UTF-8; format=flowed
-Content-Transfer-Encoding: quoted-printable
-Content-Language: en-US
-
-Sundays are nothing without callaloo.
-
-
-
---j6PIJNeVR5JwKRYlTTjdukBW60Q0tIl0l--
-
---PaduxavryIPfiUYByCeVE2oysYZqtwUb8
-Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
-Content-Description: OpenPGP digital signature
-Content-Disposition: attachment; filename="OpenPGP_signature"
-
------BEGIN PGP SIGNATURE-----
-
-wsF5BAABCAAjFqEE/BFcqgaydVibzHyaS2RUoMPLUdAFgl9GtBwFgwAAAAAACgmQS2RUoMPLUdDc
-IhAA3lB8iSQ2xzXfAuBlaNVNNvVYZd5sZPT4fci0bQmNUDJ2DHaxOpDDrNxcorJGI+oiP8Gb4Sr3
-MU0+OwS1cEPAfsrExmg99HIO4Zh/v/QAHGppk6xf0pOS/BnkfsVUslYEwz3DSsUvjl+Cdf87C6kB
-F2D07RvIwqNDkBO9Nn/BTpGz3WvvHcvK805mOPoRXMpc0lRm2w8fzweEFPM2zzdMK9S4VUiwyNcV
-kc40EJBHgVEstl+tTVXJEOREu5cfEtgJ14UbZBpCO+xRw0nz5tHwbnKpeLYf8FdsmH5YA16tEjJ1
-sB/k+bQTlta0DL8zXYh/F9CSF2kwWXSt1BIyyLSaCx9QGMXCMX8ZrO1U2jEd19MqN0RJ85q7i82X
-NJ9YT7uN10v3NT2H3NJ6DyySFoZOP6Ke+7DeUBnBj+tTLf9ugGT2i6eCTDTU4RNpcWCYaCIH4AgA
-UbkU0e3cdV/NNdln9kV86zu2Uih0RisTo94uEI9lH8Ve9yGCgPlI5kieieMySiIXqxS0FhVBjQMt
-2ITcFEXtBALUI+wGJ4yBdJAy/PJADvoqNHPBkdR0XFeuua9MQNkAtDwtNHWiEWgGV2x83mxMd18/
-r9E70TyjY4cli/hQeuFNs9qyGgaHXmhKea/o6qHCB4oOYhRs+aWxdVnTSjoeLgXS7EX1z0uPeYVV
-hng=
-=4pIu
------END PGP SIGNATURE-----
-
---PaduxavryIPfiUYByCeVE2oysYZqtwUb8--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,73 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage
+Message-ID:
+Date: Wed, 14 Oct 2020 13:55:14 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+KvoyvWLzJj8vqyGdD8NRB24JJAQo
+=ci+H
+-----END PGP MESSAGE-----
+
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,160 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage
+Autocrypt: addr=bob@openpgp.example; keydata=
+ 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
+ NEJd3XZRzaXZE2aAMQ==
+Message-ID: <753a4ab6-3513-2755-aa8f-ead42493bd01@openpgp.example>
+Date: Wed, 14 Oct 2020 14:14:07 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=G2xi
+-----END PGP MESSAGE-----
+
+--4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,54 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage
+Subject: Signed Unencrypted
+Message-ID:
+Date: Wed, 14 Oct 2020 14:21:06 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4
+Content-Type: multipart/mixed; boundary="PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i";
+ protected-headers="v1"
+From: Bob Babbage
+To: alice@openpgp.example
+Message-ID:
+Subject: Signed Unencrypted
+
+--PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
+
+
+--PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i--
+
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsD5BAABCAAjFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl+HQZIFAwAAAAAACgkQ+/zIKgFeczBX
+Pgv8D77zOWXaX3xsREJr6KNHkD6Gj52illymZBY1Km5+WMW0JmEdt5T0UOpAoVTbxHr/1z+G7iw6
+vgoBRNdzMoFTGYHy6wqW+2A3pKiGc2CD/789GYL/c3dVEIJuBr0FzDRMO8VQhjq/56s0FnaFjm7L
+JtEUjBZzaafQaxzmbnSXjSZLfCLh1YRRmgxeOA5CcyMY1HlgsvvSfdNH32o+ZPgSG4C7s4z2iinH
+uZFE2SbQ/qvyBWnslr1+2/r8YFhtknLsK14memZb8bIAtrh8Hxq9BRg3A4+spD4uR7C+1hcLbWRD
+x5b46ehcULzoTcnDLmQ34/zymIANCzSdww7Ofmhw7c/5sK9BL/fjgiT4qKxFOr/12/Ym6cXqtUgN
+Eh9XsQt10ZP707BodH9ga9rIR5NIZr6xYZx0iX7FPKxXw8Kf8ovxiI+ATYb4B6fv6PRxyD6yYfLx
+ZKBnZfk5UOe/GqktKFFHO2EVe3z8eYgS8k1hWXuvkKlXDb6PqDRUE42K6yAD
+=/kuV
+-----END PGP SIGNATURE-----
+
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,167 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage
+Subject: Signed Unencrypted With Key
+Autocrypt: addr=bob@openpgp.example; keydata=
+ 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
+ NEJd3XZRzaXZE2aAMQ==
+Message-ID: <62904db5-6147-c67f-502c-c24b396d5688@openpgp.example>
+Date: Wed, 14 Oct 2020 14:23:58 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="SnZKl30WhaDQBele2hNh7m1E1rjNUzy75"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--SnZKl30WhaDQBele2hNh7m1E1rjNUzy75
+Content-Type: multipart/mixed; boundary="zMuh5ZSCGRiyd3u4jmAM5Q7pZNJ1JNY0i";
+ protected-headers="v1"
+From: Bob Babbage
+To: alice@openpgp.example
+Message-ID: <62904db5-6147-c67f-502c-c24b396d5688@openpgp.example>
+Subject: Signed Unencrypted With Key
+
+--zMuh5ZSCGRiyd3u4jmAM5Q7pZNJ1JNY0i
+Content-Type: multipart/mixed;
+ boundary="------------64A7DAE7CD7D84EBF8E46B7E"
+Content-Language: en-US
+
+This is a multi-part message in MIME format.
+--------------64A7DAE7CD7D84EBF8E46B7E
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+
+Sundays are nothing without callaloo.
+
+
+--------------64A7DAE7CD7D84EBF8E46B7E
+Content-Type: application/pgp-keys;
+ name="OpenPGP_0xFBFCC82A015E7330.asc"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment;
+ filename="OpenPGP_0xFBFCC82A015E7330.asc"
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsDNBF2lnPIBDAC5cL9PQoQLTMuhjbYvb4Ncuuo0bfmgPRFywX53jPhoFf4Zg6mv/seOXpgec=
+TdO
+cVttfzC8ycIKrt3aQTiwOG/ctaR4Bk/t6ayNFfdUNxHWk4WCKzdz/56fW2O0F23qIRd8UUJp5=
+IIl
+N4RDdRCtdhVQIAuzvp2oVy/LaS2kxQoKvph/5pQ/5whqsyroEWDJoSV0yOb25B/iwk/pLUFoy=
+hDG
+9bj0kIzDxrEqW+7Ba8nocQlecMF3X5KMN5kp2zraLv9dlBBpWW43XktjcCZgMy20SouraVma8=
+Je/
+ECwUWYUiAZxLIlMv9CurEOtxUw6N3RdOtLmYZS9uEnn5y1UkF88o8Nku890uk6BrewFzJyLAx=
+5wR
+Z4F0qV/yq36UWQ0JB/AUGhHVPdFf6pl6eaxBwT5GXvbBUibtf8YI2og5RsgTWtXfU7ebSGXrl=
+5ZM
+pbA6mbfhd0R8aPxWfmDWiIOhBufhMCvUHh1sApMKVZnvIff9/0Dca3wbvLIwa3T4CyshfT0AE=
+QEA
+Ac0hQm9iIEJhYmJhZ2UgPGJvYkBvcGVucGdwLmV4YW1wbGU+wsEOBBMBCgA4AhsDBQsJCAcCB=
+hUK
+CQgLAgQWAgMBAh4BAheAFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl2lnvoACgkQ+/zIKgFec=
+zBv
+bAv/VNk90a6hG8Od9xTzXxH5YRFUSGfIA1yjPIVOnKqhMwps2U+sWE3urL+MvjyQRlyRV8oY9=
+IOh
+Q5Esm6DOZYrTnE7qVETm1ajIAP2OFChEc55uH88x/anpPOXOJY7S8jbn3naC9qad75BrZ+3g9=
+EBU
+Wiy5p8TykP05WSnSxNRt7vFKLfEB4nGkehpwHXOVF0CRNwYle42bg8lpmdXFDcCZCi+qEbafm=
+TQz
+kAqyzS3nCh3IAqq6Y0kBuaKLm2tSNUOlZbD+OHYQNZ5Jix7cZUzs6Xh4+I55NRWl5smrLq66y=
+OQo
+FPy9jot/Qxikx/wP3MsAzeGaZSEPc0fHp5G16rlGbxQ3vl8/usUV7W+TMEMljgwd5x8POR6HC=
+8Ea
+CDfVnUBCPi/Gv+egLjsIbPJZZEroiE40e6/UoCiQtlpQB5exPJYSd1Q1txCwueih99PHepsDh=
+mUQ
+KiACszNU+RRozAYau2VdHqnRJ7QYdxHDiH49jPK4NTMyb/tJh2TiIwcmsIpGzsDNBF2lnPIBD=
+ADW
+ML9cbGMrp12CtF9b2P6z9TTT74S8iyBOzaSvdGDQY/sUtZXRg21HWamXnn9sSXvIDEINOQ6A9=
+Qxd
+xoqWdCHrOuW3ofneYXoG+zeKc4dC86wa1TR2q9vW+RMXSO4uImA+Uzula/6k1DogDf28qhCxM=
+wG/
+i/m9g1c/0aApuDyKdQ1PXsHHNlgd/Dn6rrd5y2AObaifV7wIhEJnvqgFXDN2RXGjLeCOHV4Q2=
+WTY
+Pg/S4k1nMXVDwZXrvIsA0YwIMgIT86Rafp1qKlgPNbiIlC1g9RY/iFaGN2b4Ir6GDohBQSfZW=
+2+L
+XoPZuVE/wGlQ01rh827KVZW4lXvqsge+wtnWlszcselGATyzqOK9LdHPdZGzROZYI2e8c+paL=
+NDd
+VPL6vdRBUnkCaEkOtl1mr2JpQi5nTU+gTX4IeInC7E+1a9UDF/Y85ybUz8XV8rUnR76UqVC7K=
+idN
+epdHbZjjXCt8/Zo+Tec9JNbYNQB/e9ExmDntmlHEsSEQzFwzj8sxH48AEQEAAcLA9gQYAQoAI=
+BYh
+BNGmbhojsYLJmA94jPv8yCoBXnMwBQJdpZzyAhsMAAoJEPv8yCoBXnMw6f8L/26C34dkjBffT=
+zMj
+5Bdzm8MtF67OYneJ4TQMw7+41IL4rVcSKhIhk/3Ud5knaRtP2ef1+5F66h9/RPQOJ5+tvBwhB=
+AcU
+WSupKnUrdVaZQanYmtSxcVV2PL9+QEiNN3tzluhaWO//rACxJ+K/ZXQlIzwQVTpNhfGzAaMVV=
+9zp
+f3u0k14itcv6alKY8+rLZvO1wIIeRZLmU0tZDD5HtWDvUV7rIFI1WuoLb+KZgbYn3OWjCPHVd=
+Trd
+Z2CqnZbG3SXw6awH9bzRLV9EXkbhIMez0deCVdeo+wFFklh8/5VK2b0vk/+wqMJxfpa1lHvJL=
+obz
+OP9fvrswsr92MA2+k901WeISR7qEzcI0Fdg8AyFAExaEK6VyjP7SXGLwvfisw34OxuZr3qmx1=
+Suf
+u4toH3XrB7QJN8XyqqbsGxUCBqWif9RSK4xjzRTe56iPeiSJJOIciMP9i2ldI+KgLycyeDvGo=
+Bj0
+HCLO3gVaBe4ubVrj5KjhX2PVNEJd3XZRzaXZE2aAMQ=3D=3D
+=3DF9yX
+-----END PGP PUBLIC KEY BLOCK-----
+
+--------------64A7DAE7CD7D84EBF8E46B7E--
+
+--zMuh5ZSCGRiyd3u4jmAM5Q7pZNJ1JNY0i--
+
+--SnZKl30WhaDQBele2hNh7m1E1rjNUzy75
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsD5BAABCAAjFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl+HQj4FAwAAAAAACgkQ+/zIKgFeczCg
+Cwv/SjU90dImzX5R7jbdaU/VwjUfPJ8XyAfmsVIaE3UXrNxgTQ1bsDIqqHdkPSkU5FCR1k34P/Kz
+kmqXvZPpdd+3aoxuUZPPqUd7e0uVWGBRiR70IyvgLLNP5ixh6Ct/tbc+Tf6lpg0jw1w06GW9rUxm
+VpzVt3tEty70P3kD6dlf4eNpswT7PgqWuQGKNRA0xylEfDXOKRTDG8VIX+AGZI0tlpmm3FtJ3XKG
+tvvj9L2ENz4GGWNHUZBAvjLiRfkEX3uKywELX/F1wVZDZGjOEBMVHEy8m5ZkLP1F+pw4GvOVNgIa
+lUPT0q7U5kw9/P6T1NEE1nxpOcqnfNTJvXt1rOr1vDLSoDk+9JlMUn68jT95XwGEoflq6WEuXSwp
+Iu+S3MwKL4un7dLW7xRjdBkORSQD6QOVpoXlUiGzqpFQm4XQT8Jw7HcyIPWfZdVtwJJKd3+uCvGu
+tWEXqmIdXaDGRd4oHlGBjqSPaZ20PzfrWk7VqLp5locKAO32Zkm+fEBxmN/p
+=AeKW
+-----END PGP SIGNATURE-----
+
+--SnZKl30WhaDQBele2hNh7m1E1rjNUzy75--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,54 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol
+Message-ID:
+Date: Wed, 14 Oct 2020 14:57:39 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcFMA7L9So5P9bk9AQ//WTEFHnI2KYZJbgTfk8CaREcQpE/beaO1ysXdzCqpdRGWtU2UlbqmPxbu
+PmGDWg5f43qUEgO9mG2zsEvnGKlEoJmBFYaXXGhz/6+OoFY7VI+9DDtAWD5Oi8jzzKnUbyjPQO2a
+16PbLeOs/ydjt5eRNVaUVtnyTXMhp4JMLET1ISQF1FxjJJ00XRnaYzRRt/U6MHzIFLnZGBZYr+tY
+K1z+5vtsU6P0ZfWV/Hh8tFR6oqJ0Tiwji+zKwgUupKwC2QQIFy3j4GGrqJTejXiFfo5U/P4i5h4O
+X5qcnKzCX2spi7CTIJdx+uXKYAW2e9zsQIEQyIFoe8mZLgZcR0OLoH7ledfAeMBmVgS8GlM9uitj
+SWkiLa98gnudZbKiL7KXQ/e/TBLKVTPFtoorpGBmfYeJ6/YV42kQXPwK+ABHbxX52T7Tm7d12LRa
+Q27sp/SwnJYoi3hASA4NKViBi8B2gdV/DHzgsSfvHtEpMvN1LgaREolwESQ6U68yg/EDfohGdPdW
+eRiyo/p4jQ3Yo9v6n/boIxEb7xhkymhwQi2sZ9lyzU4HO18xrZ4sSpTjoMYyQV4ebA8nMqwbNpWn
+ACxWYeMtMdE4p6wJmMY232LlNtEAXkJbJbY+BDlKb9y6uMLBGHhXH4v7G9zaA3nDBWHNHAvP1cAg
+kgqURvqhxkgZqPz40cHBXgNHZva51fIethIBB0AykUD/87/8UHaKZX7MYUWr/CNBP+N68qFTgGp7
+UzMgSTAdpz+xzeC7S4BNoVh2IAg40r+ie38dJDxYJbEyvkhkr2wRhZf8A8z0/eGJczjEP/vSwW0B
+TkGuH9zZrlqH03jXZ0RUTGnA6oBq2wpGrBniHNZRJ7+ImS/cJT5D4uuITVDXl51EgTJQENxmSdyo
+YGe/lNoB4MVTxzmPfjWdOC2FqkGoc4jVzSwGaZ+OfLA/GviucholvaNz/LobZJ/AMXBvCbc3jh6y
+YvcZnjtDFFdUJHPCA4M8staEIVCz63UT5fdoXLWdr62H1NOhxWQDlyoZle+a2oM3FVEdyVKLt98b
+mTIP71YGhVXU4oRCujtiopVxQXzVugXXTEioebMw1+QLZLr663Xo1Kr+nlZlDDFBY9+NGLB7lX7g
+QqNkFUfw55jWFYWsj1N4U3/IzHplh/xGF9KH296ZKnzi66w6YRfp5QVKCT+fahOhxKWkKeTOl9Lf
+saUhPs93QMcVFRSW0igZrTh/fPZcplsgakpYchR9QcevkeHdCizk3CY5uULqMY6blUz3NU/aOMWw
+6fuLtwo1svBm1Vg0yh/mMA7HsRsIIB5xmkXEaP6PwM3WKLN4AZrcErQTwdvJ8HPGnIECCePugHOK
+EPB5JRj3aSp997Xwv+3z74bmp5GisjjtK3wFn8zYr0QI0hivRd9vz943rdh9iIMxCSAglawaqa0i
+BhUfhPIQyOfEWu5MBoIofW97oxnHaQ8/A/Bj2uvCIDUDPD2C50BHuVdtjsW9GlOmQ3ZUwj7llbuq
+O3oUeDzqaMdPgFt1QmfowXEkFAQcwRb0EbNboHX1q3F1QCXLklw3Dww/lw==
+=rZjL
+-----END PGP MESSAGE-----
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,163 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol
+Autocrypt: addr=carol@example.com; keydata=
+ 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
+ meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
+Message-ID:
+Date: Wed, 14 Oct 2020 14:59:26 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+bszxXXCea8sXQ3WQ78TLvMde
+=V84z
+-----END PGP MESSAGE-----
+
+--puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,52 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage
+Message-ID: <41b2b268-52a6-c8a6-3a9e-6222653b9338@openpgp.example>
+Date: Wed, 14 Oct 2020 14:46:19 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcDMA3wvqk35PDeyAQwAx/6/zGSIvT4IyNpRmcM00iVQhUfdfxUTL/o1hV+MdB7rKZIr+qWJEgiJ
+F7IyNPJW0ps2W4myyCkDQtIy1682ahq6D6kHCNmDFxMSpElrG5Xup4Ibf1es3g9n/OytGXx8699m
+RymR4EA5yAiLEiGYO37N+nwnWhP5BNpk8jgzDSNTD9qbOrXb7Tx32rvOwFCrBHqZsx6LbaD5BWp9
+WdeSqNjJ6c35dhBxy7MlIZWOK27y5TQArsgyoq//3645cQX3jYV0jJbJeWHuPMoMxYfdRHi8oEIm
+P3HnqjtSLUtOTwAcc7Vmp5k9/+PG0IZGLtoR0QLNqrJO607mWrCgYowXZofqt3Bs+Nrtf6cuetWd
+pBcGkfdYldCWgG55dER67jP7rKyx6QjFPgPBPbYPFl/H0lqLBH4YrwyVTQDFDcmXe11k1s9JdrlJ
+JXEqITi4gFFF9E4mj7voC97Fhy2GLPdKH+343gCgTVU5stz8+NyNX7wC2QSogtxEIcBd6FQbTj/j
+wV4DR2b2udXyHrYSAQdAJwk2G0weJUqgb4P+/9f76USsiwNpQO9m0k0FxS5OPGowdVTr0bB/bHyV
+fo2DKIkfmgYKnmoiL99VsigzSMIVh1+visa0mDW2a2oVfJBnHS/D0sF5AfHIvERSb7+yLgpMQPkk
+4cizr+7wiQ6BNbTN6FwG/yhrFbBXp+r//y3ZcTGh6G6IDlAbkAwj4VhTTnxdvBHJCpfnAj2G3AZR
+arZ3nC1IC9RLccV66K0oUOdvehgOMBF37Y+BLHXSL6RMc9PZIvtwH4gVMzATUeOQ1SYENGf5LSYq
+5zXs0sfRCXmC74FwM+PF9h4mBm0zOvEbyL6uqxTEMYDwAACkl8QzsHqhUe8VEhZTu2c1BcGhES4b
+9ajkctWgzG/bA4a8kTwyXDaREZoywIHro0iR5+gzbf3aUm+akWGlCRHCOmaF4ZcYpvFfH65tKgwv
+pRzYheCdjK367qiAOwPXh16vBYB1YOZtm7tSot/jBZ60qaIi5BP9FHXAFoR4Y+VWfx8lZYuE1ZNE
+k/VMN47PJPXgK+f8aMXDbalXuuq+sFl1XezGW3osppOkcL7reOZ/0heH1Say3wLLADnb3NyYaBg6
+ihl8FrVMdvzCFt59ytXn+H33BbrrYb2PfiEABPjzEPoeFItpQxltY5E0SGRYSOCKnpN2G7M1yoKf
+eG7/fXa0EUf1KLLzz+Pj88i4Ht6MQkkb19rwYHgxrxPKhmbV8zJfID5ne2PaE28XPa69wzRIyM2+
+DD5IF7iYLF4KcPURqrF7wYuAtTmOQTSWVv6mlHCxjz/ECeCXJhA+24W0m4/O55h0C3dG4looraOD
+JJMITsjObyRasT5sgS1y7axqlJY8NmJrEdZMn735+kjR1HPPinZiat4=
+=s0kk
+-----END PGP MESSAGE-----
+
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,139 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage
+Autocrypt: addr=bob@openpgp.example; keydata=
+ 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
+ NEJd3XZRzaXZE2aAMQ==
+Message-ID: <3e18d436-f9b8-71ed-bb0c-752146d1e80e@openpgp.example>
+Date: Wed, 14 Oct 2020 14:53:58 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=1/9V
+-----END PGP MESSAGE-----
+
+--aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f-autocrypt.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f-autocrypt.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f-autocrypt.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f-autocrypt.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Carol
-Autocrypt: addr=carol@example.com; keydata=
- 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
- meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
-Message-ID: <265588c0-13dd-d04c-14d6-be941567c0a9@example.com>
-Date: Wed, 26 Aug 2020 16:12:56 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="xlMDy8npy0NpnkCi0fQ3wZgvb9lzQz5c5"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---xlMDy8npy0NpnkCi0fQ3wZgvb9lzQz5c5
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---xlMDy8npy0NpnkCi0fQ3wZgvb9lzQz5c5
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-=GTKv
------END PGP MESSAGE-----
-
---xlMDy8npy0NpnkCi0fQ3wZgvb9lzQz5c5--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x3099ff1238852b9f.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Carol
-Message-ID:
-Date: Wed, 26 Aug 2020 16:10:43 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="GUfG7g484vmiHNLb6PwMjrSBO0i0peYs7"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---GUfG7g484vmiHNLb6PwMjrSBO0i0peYs7
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---GUfG7g484vmiHNLb6PwMjrSBO0i0peYs7
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-ezq3uaNc4xdSfNBTsYU=
-=+Jzw
------END PGP MESSAGE-----
-
---GUfG7g484vmiHNLb6PwMjrSBO0i0peYs7--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0-autocrypt.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0-autocrypt.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0-autocrypt.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0-autocrypt.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Bob
-Autocrypt: addr=bob@example.com; keydata=
- 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
- ms2J6vUkrCVRfqCl5z/e4rkvKLzU7g==
-Message-ID: <3bbdeab1-5298-f702-874b-81b0961ec168@example.com>
-Date: Wed, 26 Aug 2020 15:04:03 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="5rW8XlUoafx02rR8OXg7miHUT3lfb5wgn"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---5rW8XlUoafx02rR8OXg7miHUT3lfb5wgn
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---5rW8XlUoafx02rR8OXg7miHUT3lfb5wgn
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-=HPs/
------END PGP MESSAGE-----
-
---5rW8XlUoafx02rR8OXg7miHUT3lfb5wgn--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf2823b8f6c9a7553-from-0x4b6454a0c3cb51d0.eml 1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-X-Mozilla-Status: 0001
-X-Mozilla-Status2: 00800000
-X-Mozilla-Keys:
-To: alice@example.com
-From: Bob
-Message-ID:
-Date: Wed, 26 Aug 2020 14:12:40 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
-MIME-Version: 1.0
-Subject: ...
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="BLRpnrS0o4iJQ5ke81r6LJIwDUMOlBdJh"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---BLRpnrS0o4iJQ5ke81r6LJIwDUMOlBdJh
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---BLRpnrS0o4iJQ5ke81r6LJIwDUMOlBdJh
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-FUjBKJPEhCnCbw==
-=KfA/
------END PGP MESSAGE-----
-
---BLRpnrS0o4iJQ5ke81r6LJIwDUMOlBdJh--
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml 2020-11-10 09:06:03.000000000 +0000
@@ -1,13 +1,13 @@
X-Mozilla-Status: 0001
X-Mozilla-Status2: 00800000
X-Mozilla-Keys:
-To: alice@example.com
-From: Bob
+To: alice@openpgp.example
+From: Bob Babbage
Subject: Unsigned Unencrypted
-Message-ID: <991bd097-ed3a-7a97-0d59-f5602316e1a7@example.com>
-Date: Wed, 26 Aug 2020 15:54:15 -0400
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
- Thunderbird/82.0a1
+Message-ID: <838593be-05d6-0579-8112-30f2f82b798e@openpgp.example>
+Date: Wed, 14 Oct 2020 15:01:06 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@example.com-0xf2823b8f6c9a7553-secret.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@example.com-0xf2823b8f6c9a7553-secret.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@example.com-0xf2823b8f6c9a7553-secret.asc 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@example.com-0xf2823b8f6c9a7553-secret.asc 1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
------BEGIN PGP PRIVATE KEY BLOCK-----
-
-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
-g5LyGANB1cZjgnH1ypYE7qxjU6+g7g==
-=Exmz
------END PGP PRIVATE KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Alice's OpenPGP certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+mDMEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
+b7O1u120JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+iJAE
+ExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPy
+MVUMT0fjjgUCXaWfOgAKCRDyMVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnO
+dypvbm+QtXZqth9rvwD9HcDC0tC+PHAsO7OTh1S1TC9RiJsvawAfCPaQZoed8gK4
+OARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzgqbXCpDDYMiKRVitCsy203x3s
+E9+eviIDAQgHiHgEGBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXEcE6QIb
+DAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW4xN80fsn
+0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE=
+=iIGO
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,9 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Alice's revocation certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+iHgEIBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXaWkOwIdAAAKCRDyMVUM
+T0fjjoBlAQDA9ukZFKRFGCooVcVoDVmxTaHLUXlIg9TPh2f7zzI9KgD/SLNXUOaH
+O6TozOS7C9lwIHwwdHdAxgf5BzuhLT9iuAM=
+=Tm8h
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,17 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Comment: Alice's OpenPGP Transferable Secret Key
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+lFgEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
+b7O1u10AAP9XBeW6lzGOLx7zHH9AsUDUTb2pggYGMzd0P3ulJ2AfvQ4RtCZBbGlj
+ZSBMb3ZlbGFjZSA8YWxpY2VAb3BlbnBncC5leGFtcGxlPoiQBBMWCAA4AhsDBQsJ
+CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEE64W7X6M6deFelE5j8jFVDE9H444FAl2l
+nzoACgkQ8jFVDE9H447pKwD6A5xwUqIDprBzrHfahrImaYEZzncqb25vkLV2arYf
+a78A/R3AwtLQvjxwLDuzk4dUtUwvUYibL2sAHwj2kGaHnfICnF0EXEcE6RIKKwYB
+BAGXVQEFAQEHQEL/BiGtq0k84Km1wqQw2DIikVYrQrMttN8d7BPfnr4iAwEIBwAA
+/3/xFPG6U17rhTuq+07gmEvaFYKfxRB6sgAYiW6TMTpQEK6IeAQYFggAIBYhBOuF
+u1+jOnXhXpROY/IxVQxPR+OOBQJcRwTpAhsMAAoJEPIxVQxPR+OOWdABAMUdSzpM
+hzGs1O0RkWNQWbUzQ8nUOeD9wNbjE3zR+yfRAQDbYqvtWQKN4AQLTxVJN5X5AWyb
+Pnn+We1aTBhaGa86AQ==
+=n8OM
+-----END PGP PRIVATE KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-pub.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-pub.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-pub.asc 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-pub.asc 1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-1jjgvULgms2J6vUkrCVRfqCl5z/e4rkvKLzU7g==
-=h3Yt
------END PGP PUBLIC KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-secret.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-secret.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-secret.asc 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@example.com-0x4b6454a0c3cb51d0-secret.asc 1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
------BEGIN PGP PRIVATE KEY BLOCK-----
-
-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
-9SSsJVF+oKXnP97iuS8ovNTu
-=Qzoy
------END PGP PRIVATE KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,43 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Bob's OpenPGP certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+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
+NEJd3XZRzaXZE2aAMQ==
+=NXei
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Bob's revocation certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+iQG2BCABCgAgFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl2lnQQCHQAACgkQ+/zI
+KgFeczAIHAv/RrlGlPFKsW0BShC8sVtPfbT1N9lUqyrsgBhrUryM/i+rBtkbnSjp
+28R5araupt0og1g2L5VsCRM+ql0jf0zrZXOorKfAO70HCP3X+MlEquvztMUZGJRZ
+7TSMgIY1MeFgLmOw9pDKf3tSoouBOpPe5eVfXviEDDo2zOfdntjPyCMlxHgAcjZo
+XqMaurV+nKWoIx0zbdpNLsRy4JZcmnOSFdPw37R8U2miPi2qNyVwcyCxQy0LjN7Y
+AWadrs9vE0DrneSVP2OpBhl7g+Dj2uXJQRPVXcq6w9g5Fir6DnlhekTLsa78T5cD
+n8q7aRusMlALPAOosENOgINgsVcjuILkPN1eD+zGAgHgdiKaep1+P3pbo5n0CLki
+UCAsLnCEo8eBV9DCb/n1FlI5yhQhgQyMYlp/49H0JSc3IY9KHhv6f0zIaRWs0JuD
+ajcXTJ9AyB+SA6GBb9Q+XsNXjZ1gj75ekUD1sQ3ezTvVfovgP5bD+vPvILhSImKB
+aU6V3zld/x/1
+=mMwU
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc
--- thunderbird-78.4.0+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,83 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Comment: Bob's OpenPGP Transferable Secret Key
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+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
+=miES
+-----END PGP PRIVATE KEY BLOCK-----
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/search-window/browser.ini thunderbird-78.4.2+build1/comm/mail/test/browser/search-window/browser.ini
--- thunderbird-78.4.0+build1/comm/mail/test/browser/search-window/browser.ini 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/search-window/browser.ini 2020-11-10 09:06:03.000000000 +0000
@@ -12,3 +12,4 @@
[browser_multipleSearchWindows.js]
[browser_rightClickToOpenSearchWindow.js]
[browser_searchWindow.js]
+[browser_searchFromSyntheticView.js]
diff -Nru thunderbird-78.4.0+build1/comm/mail/test/browser/search-window/browser_searchFromSyntheticView.js thunderbird-78.4.2+build1/comm/mail/test/browser/search-window/browser_searchFromSyntheticView.js
--- thunderbird-78.4.0+build1/comm/mail/test/browser/search-window/browser_searchFromSyntheticView.js 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/test/browser/search-window/browser_searchFromSyntheticView.js 2020-11-10 09:06:03.000000000 +0000
@@ -0,0 +1,111 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+ add_sets_to_folders,
+ delete_message_set,
+ inboxFolder,
+ be_in_folder,
+ create_folder,
+ create_thread,
+} = ChromeUtils.import(
+ "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
+);
+const { SyntheticPartLeaf } = ChromeUtils.import(
+ "resource://testing-common/mailnews/MessageGenerator.jsm"
+);
+const { GlodaMsgIndexer } = ChromeUtils.import(
+ "resource:///modules/gloda/IndexMsg.jsm"
+);
+const { toXPCOMArray } = ChromeUtils.import(
+ "resource:///modules/iteratorUtils.jsm"
+);
+
+/**
+ * Tests the SearchDialog displays a folder when opened from a synthetic view.
+ * See bug 1664761 and bug 1248522.
+ */
+add_task(async function testSearchDialogFolderSelectedFromSyntheticView() {
+ let folderName = "Test Folder Name";
+ let folder = create_folder(folderName);
+ let thread = create_thread(3);
+ let term = "atermtosearchfor";
+
+ registerCleanupFunction(() => {
+ be_in_folder(inboxFolder);
+ delete_message_set(thread);
+
+ let trash = folder.rootFolder.getFolderWithFlags(Ci.nsMsgFolderFlags.Trash);
+ folder.parent.deleteSubFolders(
+ toXPCOMArray([folder], Ci.nsIMutableArray),
+ null
+ );
+ trash.emptyTrash(null, null);
+
+ let tabmail = document.querySelector("tabmail");
+ while (tabmail.tabInfo.length > 1) {
+ tabmail.closeTab(1);
+ }
+ });
+
+ for (let msg of thread.synMessages) {
+ msg.bodyPart = new SyntheticPartLeaf(term);
+ }
+
+ be_in_folder(folder);
+ add_sets_to_folders([folder], [thread]);
+
+ await new Promise(callback => {
+ GlodaMsgIndexer.indexFolder(folder, { callback, force: true });
+ });
+
+ let dbView = window.gFolderDisplay.view.dbView;
+ await TestUtils.waitForCondition(
+ () =>
+ thread.synMessages.every((_, i) =>
+ window.Gloda.isMessageIndexed(dbView.getMsgHdrAt(i))
+ ),
+ "messages were not indexed in time"
+ );
+
+ let searchInput = window.document.querySelector("#searchInput");
+ searchInput.value = term;
+ EventUtils.synthesizeMouseAtCenter(searchInput, {}, window);
+ EventUtils.synthesizeKey("VK_RETURN", {}, window);
+
+ let tab = document.querySelector(
+ "tabmail>tabbox>tabpanels>vbox[selected=true]"
+ );
+
+ let iframe = tab.querySelector("iframe");
+ await BrowserTestUtils.waitForEvent(iframe.contentWindow, "load");
+
+ let browser = iframe.contentDocument.querySelector("browser");
+ await TestUtils.waitForCondition(
+ () =>
+ browser.contentWindow.FacetContext &&
+ browser.contentWindow.FacetContext.rootWin != null,
+ "reachOutAndTouchFrame() did not run in time"
+ );
+
+ browser.contentDocument.querySelector(".message-subject").click();
+
+ let dialogPromise = BrowserTestUtils.domWindowOpened(null, async win => {
+ await BrowserTestUtils.waitForEvent(win, "load");
+ return (
+ win.document.documentURI ===
+ "chrome://messenger/content/SearchDialog.xhtml"
+ );
+ });
+ document.querySelector("#searchMailCmd").click();
+
+ let dialogWindow = await dialogPromise;
+ let selectedFolder = dialogWindow.document.querySelector("#searchableFolders")
+ .label;
+
+ Assert.ok(selectedFolder.includes(folderName), "a folder is selected");
+ dialogWindow.close();
+});
diff -Nru thunderbird-78.4.0+build1/comm/mail/themes/windows/mail/messenger.css thunderbird-78.4.2+build1/comm/mail/themes/windows/mail/messenger.css
--- thunderbird-78.4.0+build1/comm/mail/themes/windows/mail/messenger.css 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mail/themes/windows/mail/messenger.css 2020-11-10 09:06:03.000000000 +0000
@@ -388,7 +388,12 @@
}
@media (-moz-windows-default-theme: 0) {
- :root:not(:-moz-lwtheme) treechildren::-moz-tree-row(hover),
+ :root:not(:-moz-lwtheme) treechildren::-moz-tree-row(hover) {
+ border-color: HighlightText !important;
+ border-style: solid;
+ background-color: transparent !important;
+ }
+
:root:not(:-moz-lwtheme) treechildren::-moz-tree-row(dropOn),
:root:not(:-moz-lwtheme) treechildren::-moz-tree-row(selected) {
border-color: HighlightText !important;
@@ -396,7 +401,6 @@
}
:root:not(:-moz-lwtheme) treechildren::-moz-tree-twisty(selected),
- :root:not(:-moz-lwtheme) treechildren::-moz-tree-cell-text(hover),
:root:not(:-moz-lwtheme) treechildren::-moz-tree-cell-text(dropOn),
:root:not(:-moz-lwtheme) treechildren::-moz-tree-cell-text(selected) {
color: HighlightText !important;
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/addrbook/content/abResultsPane.js thunderbird-78.4.2+build1/comm/mailnews/addrbook/content/abResultsPane.js
--- thunderbird-78.4.0+build1/comm/mailnews/addrbook/content/abResultsPane.js 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/addrbook/content/abResultsPane.js 2020-11-10 09:06:03.000000000 +0000
@@ -119,7 +119,10 @@
}
function CloseAbView() {
- gAbView = gAbResultsTree.view = null;
+ gAbView = null;
+ if (gAbResultsTree) {
+ gAbResultsTree.view = null;
+ }
}
function GetOneOrMoreCardsSelected() {
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/accountUtils.js thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/accountUtils.js
--- thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/accountUtils.js 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/accountUtils.js 2020-11-10 09:06:03.000000000 +0000
@@ -294,11 +294,7 @@
// and the selected page, reload the tab and switch to the tab.
for (let tabInfo of tabmail.tabInfo) {
let tab = tabmail.getTabForBrowser(tabInfo.browser);
- if (
- tab &&
- tab.urlbar &&
- tab.urlbar.textContent == "about:accountsettings"
- ) {
+ if (tab && tab.urlbar && tab.urlbar.value == "about:accountsettings") {
tab.browser.contentDocument.documentElement.server = aServer;
tab.browser.contentDocument.documentElement.selectPage = selectPage;
tab.browser.contentWindow.onLoad();
@@ -320,11 +316,7 @@
for (let tabInfo of tabmail.tabInfo) {
let tab = tabmail.getTabForBrowser(tabInfo.browser);
- if (
- tab &&
- tab.urlbar &&
- tab.urlbar.textContent == "about:accountsettings"
- ) {
+ if (tab && tab.urlbar && tab.urlbar.value == "about:accountsettings") {
tab.tabNode.setAttribute("type", "accountManager");
break;
}
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/am-identity-edit.js thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/am-identity-edit.js
--- thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/am-identity-edit.js 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/am-identity-edit.js 2020-11-10 09:06:03.000000000 +0000
@@ -78,6 +78,10 @@
initSmtpServer(identity.smtpServerKey);
+ let servers = MailServices.accounts.getServersForIdentity(identity);
+ document.getElementById("identityCatchAllBox").hidden =
+ servers.length > 0 && servers[0].type == "nntp";
+
// This field does not exist for the default identity shown in the am-main.xhtml pane.
let idLabel = document.getElementById("identity.label");
if (idLabel) {
@@ -86,6 +90,9 @@
} else {
// We're adding an identity, use the best default we have.
initSmtpServer(gAccount.defaultIdentity.smtpServerKey);
+
+ // Hide catchAll until we know what this identitity is associated with.
+ document.getElementById("identityCatchAllBox").hidden = true;
}
setupSignatureItems();
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/am-identity-edit.xhtml thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/am-identity-edit.xhtml
--- thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/am-identity-edit.xhtml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/am-identity-edit.xhtml 2020-11-10 09:06:03.000000000 +0000
@@ -42,7 +42,7 @@
@@ -173,7 +173,7 @@
&privateData.label;
-
+
-
+
+ oncommand="onCheckItem('offline.notDownloadMin', [this.id]);"/>
+ oncommand="onCheckItem('nntp.downloadMsgMin', [this.id]);"/>
+ label="&nntpRemoveMsgBody.label;" oncommand="onCheckItem('nntp.removeBodyMin', [this.id]);"/>
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/am-prefs.js thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/am-prefs.js
--- thunderbird-78.4.0+build1/comm/mailnews/base/prefs/content/am-prefs.js 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/base/prefs/content/am-prefs.js 2020-11-10 09:06:03.000000000 +0000
@@ -82,12 +82,11 @@
* Enables/disables element (slave) according to the checked state
* of another elements (masters).
*
- * @param aChangeElementId Slave element which should be enabled
- * if all the checkElementIDs are checked.
- * Otherwise it gets disabled.
- * @param aCheckElementIds An array of IDs of the master elements.
+ * @param {string} aChangeElementId - Slave element which should be enabled
+ * if all the checkElementIDs are checked. Otherwise it gets disabled.
+ * @param {string[]} aCheckElementIds - An array of IDs of the master elements.
*
- * See bug 728681 for the pattern on how this is used.
+ * @see bug 728681 for the pattern on how this is used.
*/
function onCheckItem(aChangeElementId, aCheckElementIds) {
let elementToControl = document.getElementById(aChangeElementId);
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/compose/src/nsMsgCompUtils.cpp thunderbird-78.4.2+build1/comm/mailnews/compose/src/nsMsgCompUtils.cpp
--- thunderbird-78.4.0+build1/comm/mailnews/compose/src/nsMsgCompUtils.cpp 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/compose/src/nsMsgCompUtils.cpp 2020-11-10 09:06:03.000000000 +0000
@@ -477,8 +477,6 @@
rand_buf[10], rand_buf[11]);
}
-static char* RFC2231ParmFolding(const char* parmName, const char* parmValue);
-
static char* LegacyParmFolding(const nsCString& aCharset,
const nsCString& aFileName,
int32_t aParmFolding);
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/compose/src/nsMsgCompUtils.h thunderbird-78.4.2+build1/comm/mailnews/compose/src/nsMsgCompUtils.h
--- thunderbird-78.4.0+build1/comm/mailnews/compose/src/nsMsgCompUtils.h 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/compose/src/nsMsgCompUtils.h 2020-11-10 09:06:03.000000000 +0000
@@ -97,6 +97,8 @@
void msg_pick_real_name(nsMsgAttachmentHandler* attachment,
const char16_t* proposedName, const char* charset);
+char* RFC2231ParmFolding(const char* parmName, const char* parmValue);
+
//
// Informational calls...
//
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/compose/src/nsMsgSend.cpp thunderbird-78.4.2+build1/comm/mailnews/compose/src/nsMsgSend.cpp
--- thunderbird-78.4.0+build1/comm/mailnews/compose/src/nsMsgSend.cpp 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/compose/src/nsMsgSend.cpp 2020-11-10 09:06:03.000000000 +0000
@@ -993,9 +993,11 @@
draftInfo.AppendLiteral("; file=");
draftInfo.Append(urlSpec.get());
}
- draftInfo.AppendLiteral("; name=");
- draftInfo.Append(ma->m_realName.get());
+ char* encodedRealName = RFC2231ParmFolding("name", ma->m_realName.get());
+ draftInfo.AppendLiteral("; ");
+ draftInfo.Append(encodedRealName);
draftInfo.Append(CRLF);
+ PR_Free(encodedRealName);
part->AppendOtherHeaders(draftInfo.get());
part->SetType("application/octet-stream");
part->SetBuffer("");
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/compose/test/unit/test_messageHeaders.js thunderbird-78.4.2+build1/comm/mailnews/compose/test/unit/test_messageHeaders.js
--- thunderbird-78.4.0+build1/comm/mailnews/compose/test/unit/test_messageHeaders.js 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/compose/test/unit/test_messageHeaders.js 2020-11-10 09:06:03.000000000 +0000
@@ -468,7 +468,27 @@
"provider=akey; " +
"file=" +
cloudAttachment.url +
- "; name=attachment.html",
+ '; name="attachment.html"',
+ };
+ await richCreateMessage(fields, [cloudAttachment], identity);
+ checkDraftHeaders(cloudAttachmentHeaders, "2");
+
+ // Cloud attachment with non-ascii file name.
+ cloudAttachment = makeAttachment({
+ url: Services.io.newFileURI(do_get_file("data/test-UTF-8.txt")).spec,
+ sendViaCloud: true,
+ cloudFileAccountKey: "akey",
+ name: "ファイル.txt",
+ contentLocation: "http://localhost.invalid/",
+ });
+ cloudAttachmentHeaders = {
+ "Content-Type": "application/octet-stream",
+ "X-Mozilla-Cloud-Part":
+ "cloudFile; url=http://localhost.invalid/; " +
+ "provider=akey; " +
+ "file=" +
+ cloudAttachment.url +
+ "; name*=UTF-8''%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%2E%74%78%74",
};
await richCreateMessage(fields, [cloudAttachment], identity);
checkDraftHeaders(cloudAttachmentHeaders, "2");
@@ -630,7 +650,7 @@
{
"Content-Type": "application/octet-stream",
"X-Mozilla-Cloud-Part":
- "cloudFile; url=http://localhost.invalid/; name=attachment.html",
+ 'cloudFile; url=http://localhost.invalid/; name="attachment.html"',
},
"2"
);
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/db/gloda/modules/MimeMessage.jsm thunderbird-78.4.2+build1/comm/mailnews/db/gloda/modules/MimeMessage.jsm
--- thunderbird-78.4.0+build1/comm/mailnews/db/gloda/modules/MimeMessage.jsm 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/db/gloda/modules/MimeMessage.jsm 2020-11-10 09:06:03.000000000 +0000
@@ -118,6 +118,9 @@
// nsIStreamListener part
onDataAvailable(aRequest, aInputStream, aOffset, aCount) {
dump("this should not be happening! arrgggggh!\n");
+ console.error(
+ "Did you try to stream an nttp message? Doens't work. See bug 545365."
+ );
if (this._stream === null) {
this._stream = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(
Ci.nsIScriptableInputStream
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/extensions/dsn/dsn.js thunderbird-78.4.2+build1/comm/mailnews/extensions/dsn/dsn.js
--- thunderbird-78.4.0+build1/comm/mailnews/extensions/dsn/dsn.js 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/extensions/dsn/dsn.js 2020-11-10 09:06:03.000000000 +0000
@@ -5,5 +5,5 @@
/*
* default prefs for dsn
*/
-pref("mail.identity.default.dsn_use_custom_prefs", false); // false: Use global true: Use custom
+pref("mail.identity.default.dsn_use_custom_prefs", false); // false: Use global true: Use custom
pref("mail.identity.default.dsn_always_request_on", false);
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp thunderbird-78.4.2+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp
--- thunderbird-78.4.0+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp 2020-11-10 09:06:03.000000000 +0000
@@ -196,6 +196,7 @@
if (NS_FAILED(data->mimeDecrypt->Finish())) return -1;
+ data->mimeDecrypt->RemoveMimeCallback();
data->mimeDecrypt = nullptr;
return 0;
}
@@ -208,7 +209,13 @@
return msg;
}
-static void MimePgpe_free(void* output_closure) {}
+static void MimePgpe_free(void* output_closure) {
+ MimePgpeData* data = (MimePgpeData*)output_closure;
+ if (data->mimeDecrypt) {
+ data->mimeDecrypt->RemoveMimeCallback();
+ data->mimeDecrypt = nullptr;
+ }
+}
/* Returns a string describing the location of the part (like "2.5.3").
This is not a full URL, just a part-number.
@@ -245,7 +252,16 @@
// nsPgpMimeProxy implementation
nsPgpMimeProxy::nsPgpMimeProxy()
- : mInitialized(false), mLoadFlags(LOAD_NORMAL), mCancelStatus(NS_OK) {}
+ : mInitialized(false),
+#ifdef DEBUG
+ mOutputWasRemoved(false),
+#endif
+ mOutputFun(nullptr),
+ mOutputClosure(nullptr),
+ mLoadFlags(LOAD_NORMAL),
+ mCancelStatus(NS_OK)
+{
+}
nsPgpMimeProxy::~nsPgpMimeProxy() { Finalize(); }
@@ -270,6 +286,16 @@
}
NS_IMETHODIMP
+nsPgpMimeProxy::RemoveMimeCallback() {
+ mOutputFun = nullptr;
+ mOutputClosure = nullptr;
+#ifdef DEBUG
+ mOutputWasRemoved = true;
+#endif
+ return NS_OK;
+}
+
+NS_IMETHODIMP
nsPgpMimeProxy::Init() {
mByteBuf.Truncate();
@@ -387,6 +413,13 @@
NS_ENSURE_ARG(buf);
+#ifdef DEBUG
+ // If this assertion is hit, there might be a bug related to object
+ // lifetime, e.g. a JS MIME handler might live longer than the
+ // corresponding MIME data, e.g. bug 1665475.
+ NS_ASSERTION(!mOutputWasRemoved, "MIME data already destroyed");
+#endif
+
if (!mOutputFun) return NS_ERROR_FAILURE;
int status = mOutputFun(buf, buf_size, mOutputClosure);
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.h thunderbird-78.4.2+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.h
--- thunderbird-78.4.0+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.h 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.h 2020-11-10 09:06:03.000000000 +0000
@@ -47,6 +47,9 @@
bool mInitialized;
nsCOMPtr mDecryptor;
+#ifdef DEBUG
+ PRBool mOutputWasRemoved;
+#endif
MimeDecodeCallbackFun mOutputFun;
void* mOutputClosure;
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/mime/public/nsIPgpMimeProxy.idl thunderbird-78.4.2+build1/comm/mailnews/mime/public/nsIPgpMimeProxy.idl
--- thunderbird-78.4.0+build1/comm/mailnews/mime/public/nsIPgpMimeProxy.idl 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/mime/public/nsIPgpMimeProxy.idl 2020-11-10 09:06:03.000000000 +0000
@@ -33,6 +33,8 @@
in voidPtr outputClosure,
in nsIURI myUri);
+ [noscript] void removeMimeCallback();
+
/**
* init function
*/
diff -Nru thunderbird-78.4.0+build1/comm/mailnews/news/src/nsNewsFolder.cpp thunderbird-78.4.2+build1/comm/mailnews/news/src/nsNewsFolder.cpp
--- thunderbird-78.4.0+build1/comm/mailnews/news/src/nsNewsFolder.cpp 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/mailnews/news/src/nsNewsFolder.cpp 2020-11-10 09:06:03.000000000 +0000
@@ -704,13 +704,9 @@
// Stopgap. Build a parallel array of message headers while we complete
// removal of nsIArray usage (Bug 1583030).
- uint32_t messageCount;
- messages->GetLength(&messageCount);
+
nsTArray> msgHeaders;
- msgHeaders.SetCapacity(messageCount);
- for (uint32_t i = 0; i < messageCount; ++i) {
- msgHeaders.AppendElement(do_QueryElementAt(messages, i));
- }
+ MsgHdrsToTArray(messages, msgHeaders);
if (!isMove) {
nsCOMPtr notifier(
@@ -725,7 +721,7 @@
if (NS_SUCCEEDED(rv)) {
for (auto msgHdr : msgHeaders) {
rv = mDatabase->DeleteHeader(msgHdr, nullptr, true, true);
- if (!NS_FAILED(rv)) {
+ if (NS_FAILED(rv)) {
break;
}
}
@@ -743,7 +739,7 @@
(void)RefreshSizeOnDisk();
- return NS_OK;
+ return rv;
}
NS_IMETHODIMP nsMsgNewsFolder::CancelMessage(nsIMsgDBHdr* msgHdr,
diff -Nru thunderbird-78.4.0+build1/comm/SOURCE_CHANGESET thunderbird-78.4.2+build1/comm/SOURCE_CHANGESET
--- thunderbird-78.4.0+build1/comm/SOURCE_CHANGESET 2020-10-28 15:20:52.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/SOURCE_CHANGESET 2020-11-10 09:06:06.000000000 +0000
@@ -1 +1 @@
-d5c3faff83924f56859ea4584eb0610c68a0cafa
\ No newline at end of file
+e83160d3eb0bd3d6c1c13f32778d13833cbb4758
\ No newline at end of file
diff -Nru thunderbird-78.4.0+build1/comm/taskcluster/ci/config.yml thunderbird-78.4.2+build1/comm/taskcluster/ci/config.yml
--- thunderbird-78.4.0+build1/comm/taskcluster/ci/config.yml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/taskcluster/ci/config.yml 2020-11-10 09:06:03.000000000 +0000
@@ -195,11 +195,6 @@
implementation: generic-worker
os: macosx
worker-type: 'gecko-{alias}'
- t-osx-1014-r7-edid:
- provisioner: releng-hardware
- implementation: generic-worker
- os: macosx
- worker-type: 'gecko-{alias}'
t-win.*:
provisioner: comm-t
implementation: generic-worker
diff -Nru thunderbird-78.4.0+build1/comm/taskcluster/ci/release-balrog-submit-toplevel/kind.yml thunderbird-78.4.2+build1/comm/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
--- thunderbird-78.4.0+build1/comm/taskcluster/ci/release-balrog-submit-toplevel/kind.yml 2020-10-28 15:20:49.000000000 +0000
+++ thunderbird-78.4.2+build1/comm/taskcluster/ci/release-balrog-submit-toplevel/kind.yml 2020-11-10 09:06:03.000000000 +0000
@@ -17,7 +17,7 @@
worker-type: balrog
worker:
implementation: balrog
- balrog-action: submit-toplevel
+ balrog-action: v2-submit-toplevel
require-mirrors: true
archive-domain:
by-release-level:
diff -Nru thunderbird-78.4.0+build1/config/milestone.txt thunderbird-78.4.2+build1/config/milestone.txt
--- thunderbird-78.4.0+build1/config/milestone.txt 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/config/milestone.txt 2020-11-10 09:04:27.000000000 +0000
@@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
-78.4.0
+78.4.1
diff -Nru thunderbird-78.4.0+build1/debian/changelog thunderbird-78.4.2+build1/debian/changelog
--- thunderbird-78.4.0+build1/debian/changelog 2020-11-05 13:55:35.000000000 +0000
+++ thunderbird-78.4.2+build1/debian/changelog 2020-11-10 10:30:30.000000000 +0000
@@ -1,3 +1,9 @@
+thunderbird (1:78.4.2+build1-0ubuntu0.20.10.1) groovy; urgency=medium
+
+ * New upstream stable release (78.4.2build1)
+
+ -- Olivier Tilloy Tue, 10 Nov 2020 11:30:30 +0100
+
thunderbird (1:78.4.0+build1-0ubuntu0.20.10.1) groovy; urgency=medium
* New upstream stable release (78.4.0build1)
diff -Nru thunderbird-78.4.0+build1/js/src/jit/IonBuilder.cpp thunderbird-78.4.2+build1/js/src/jit/IonBuilder.cpp
--- thunderbird-78.4.0+build1/js/src/jit/IonBuilder.cpp 2020-10-28 15:17:42.000000000 +0000
+++ thunderbird-78.4.2+build1/js/src/jit/IonBuilder.cpp 2020-11-10 09:04:10.000000000 +0000
@@ -5210,31 +5210,18 @@
// explicit operation in the bytecode, we cannot use resumeAfter().
// Getters may not override |prototype| fetching, so this operation is
// indeed idempotent.
- // - First try an idempotent property cache.
- // - Upon failing idempotent property cache, we can't use a non-idempotent
- // cache, therefore we fallback to CallGetProperty
//
- // Note: both CallGetProperty and GetPropertyCache can trigger a GC,
- // and thus invalidation.
- MInstruction* getProto;
- if (!invalidatedIdempotentCache()) {
- MConstant* id = constant(StringValue(names().prototype));
- MGetPropertyCache* getPropCache =
- MGetPropertyCache::New(alloc(), newTarget, id,
- /* monitored = */ false);
- getPropCache->setIdempotent();
- getProto = getPropCache;
- } else {
- MCallGetProperty* callGetProp =
- MCallGetProperty::New(alloc(), newTarget, names().prototype);
- callGetProp->setIdempotent();
- getProto = callGetProp;
- }
- current->add(getProto);
+ // Note: GetPropertyCache can trigger a GC, and thus invalidation.
+ MConstant* id = constant(StringValue(names().prototype));
+ MGetPropertyCache* getPropCache =
+ MGetPropertyCache::New(alloc(), newTarget, id,
+ /* monitored = */ false);
+ getPropCache->setIdempotent();
+ current->add(getPropCache);
// Create this from prototype
MCreateThisWithProto* createThis =
- MCreateThisWithProto::New(alloc(), callee, newTarget, getProto);
+ MCreateThisWithProto::New(alloc(), callee, newTarget, getPropCache);
current->add(createThis);
return createThis;
diff -Nru thunderbird-78.4.0+build1/js/src/jit/IonIC.cpp thunderbird-78.4.2+build1/js/src/jit/IonIC.cpp
--- thunderbird-78.4.0+build1/js/src/jit/IonIC.cpp 2020-10-28 15:17:42.000000000 +0000
+++ thunderbird-78.4.2+build1/js/src/jit/IonIC.cpp 2020-11-10 09:04:10.000000000 +0000
@@ -215,6 +215,15 @@
Invalidate(cx, outerScript);
}
+ // IonBuilder::createScriptedThis does not use InvalidedIdempotentCache
+ // flag so prevent bailout-loop by disabling Ion for the script.
+ MOZ_ASSERT(ic->kind() == CacheKind::GetProp);
+ if (idVal.toString()->asAtom().asPropertyName() == cx->names().prototype) {
+ if (val.isObject() && val.toObject().is()) {
+ outerScript->disableIon();
+ }
+ }
+
// We will redo the potentially effectful lookup in Baseline.
return true;
}
diff -Nru thunderbird-78.4.0+build1/SOURCE_CHANGESET thunderbird-78.4.2+build1/SOURCE_CHANGESET
--- thunderbird-78.4.0+build1/SOURCE_CHANGESET 2020-10-28 15:20:52.000000000 +0000
+++ thunderbird-78.4.2+build1/SOURCE_CHANGESET 2020-11-10 09:06:06.000000000 +0000
@@ -1 +1 @@
-35408d78e4eed57838117d7a38e9a6b2b0bd3420
\ No newline at end of file
+22b8bef3c436a4d36b586804f342928e1ab11e51
\ No newline at end of file
diff -Nru thunderbird-78.4.0+build1/taskcluster/ci/condprof/kind.yml thunderbird-78.4.2+build1/taskcluster/ci/condprof/kind.yml
--- thunderbird-78.4.0+build1/taskcluster/ci/condprof/kind.yml 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/ci/condprof/kind.yml 2020-11-10 09:04:17.000000000 +0000
@@ -90,7 +90,7 @@
path: /builds/worker/archive
type: directory
macosx64-firefox:
- worker-type: t-osx-1014-r7-edid
+ worker-type: t-osx-1014
description: Creates or updates conditioned profiles on macOS
treeherder:
symbol: condprof(firefox)
diff -Nru thunderbird-78.4.0+build1/taskcluster/ci/config.yml thunderbird-78.4.2+build1/taskcluster/ci/config.yml
--- thunderbird-78.4.0+build1/taskcluster/ci/config.yml 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/ci/config.yml 2020-11-10 09:04:17.000000000 +0000
@@ -513,11 +513,6 @@
implementation: generic-worker
os: macosx
worker-type: 'gecko-{alias}'
- t-osx-1014-r7-edid:
- provisioner: releng-hardware
- implementation: generic-worker
- os: macosx
- worker-type: 'gecko-{alias}'
t-osx-1014-power:
provisioner: releng-hardware
implementation: generic-worker
diff -Nru thunderbird-78.4.0+build1/taskcluster/ci/iris/kind.yml thunderbird-78.4.2+build1/taskcluster/ci/iris/kind.yml
--- thunderbird-78.4.0+build1/taskcluster/ci/iris/kind.yml 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/ci/iris/kind.yml 2020-11-10 09:04:17.000000000 +0000
@@ -110,7 +110,7 @@
worker-type:
by-platform:
linux64.*: t-linux-xlarge
- osx.*: t-osx-1014-r7-edid
+ osx.*: t-osx-1014
windows10-64.*: t-win10-64
jobs:
diff -Nru thunderbird-78.4.0+build1/taskcluster/ci/release-balrog-submit-toplevel/kind.yml thunderbird-78.4.2+build1/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
--- thunderbird-78.4.0+build1/taskcluster/ci/release-balrog-submit-toplevel/kind.yml 2020-10-28 15:17:49.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/ci/release-balrog-submit-toplevel/kind.yml 2020-11-10 09:04:17.000000000 +0000
@@ -17,7 +17,7 @@
worker-type: balrog
worker:
implementation: balrog
- balrog-action: submit-toplevel
+ balrog-action: v2-submit-toplevel
require-mirrors: true
archive-domain:
by-release-level:
diff -Nru thunderbird-78.4.0+build1/taskcluster/ci/source-test/python.yml thunderbird-78.4.2+build1/taskcluster/ci/source-test/python.yml
--- thunderbird-78.4.0+build1/taskcluster/ci/source-test/python.yml 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/ci/source-test/python.yml 2020-11-10 09:04:17.000000000 +0000
@@ -8,7 +8,7 @@
worker-type:
by-platform:
linux1804-64.*: t-linux-xlarge-source
- macosx1014-64.*: t-osx-1014-r7-edid
+ macosx1014-64.*: t-osx-1014
windows10-64.*: t-win10-64-source
worker:
by-platform:
diff -Nru thunderbird-78.4.0+build1/taskcluster/ci/webrender/kind.yml thunderbird-78.4.2+build1/taskcluster/ci/webrender/kind.yml
--- thunderbird-78.4.0+build1/taskcluster/ci/webrender/kind.yml 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/ci/webrender/kind.yml 2020-11-10 09:04:17.000000000 +0000
@@ -131,7 +131,7 @@
macos-release:
description: Runs release-mode WebRender CI tests on a macOS worker
- worker-type: t-osx-1014-r7-edid
+ worker-type: t-osx-1014
worker:
# repo cloning has highly variable run time
max-run-time: 7200
@@ -192,7 +192,7 @@
macos-debug:
description: Runs debug-mode WebRender CI tests on a macOS worker
- worker-type: t-osx-1014-r7-edid
+ worker-type: t-osx-1014
worker:
max-run-time: 3600
env:
diff -Nru thunderbird-78.4.0+build1/taskcluster/taskgraph/transforms/balrog_submit.py thunderbird-78.4.2+build1/taskcluster/taskgraph/transforms/balrog_submit.py
--- thunderbird-78.4.0+build1/taskcluster/taskgraph/transforms/balrog_submit.py 2020-10-28 15:17:48.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/taskgraph/transforms/balrog_submit.py 2020-11-10 09:04:17.000000000 +0000
@@ -116,7 +116,7 @@
'worker': {
'implementation': 'balrog',
'upstream-artifacts': upstream_artifacts,
- 'balrog-action': 'submit-locale',
+ 'balrog-action': 'v2-submit-locale',
'suffixes': ['', '-No-WNP'] if job.get('update-no-wnp') else [''],
},
'dependencies': {'beetmover': dep_job.label},
diff -Nru thunderbird-78.4.0+build1/taskcluster/taskgraph/transforms/task.py thunderbird-78.4.2+build1/taskcluster/taskgraph/transforms/task.py
--- thunderbird-78.4.0+build1/taskcluster/taskgraph/transforms/task.py 2020-10-28 15:17:49.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/taskgraph/transforms/task.py 2020-11-10 09:04:17.000000000 +0000
@@ -1047,7 +1047,7 @@
if 'b' in release_config['version']:
beta_number = release_config['version'].split('b')[-1]
- if worker['balrog-action'] == 'submit-locale':
+ if worker['balrog-action'] == 'submit-locale' or worker['balrog-action'] == 'v2-submit-locale':
task_def['payload'] = {
'upstreamArtifacts': worker['upstream-artifacts'],
'suffixes': worker['suffixes'],
@@ -1074,7 +1074,8 @@
'complete-mar-bouncer-product-pattern'):
if prop in worker:
task_def['payload'][prop.replace('-', '_')] = worker[prop]
- if worker['balrog-action'] == 'submit-toplevel':
+ if worker['balrog-action'] == 'submit-toplevel' or \
+ worker['balrog-action'] == 'v2-submit-toplevel':
task_def['payload'].update({
'app_version': release_config['appVersion'],
'archive_domain': worker['archive-domain'],
diff -Nru thunderbird-78.4.0+build1/taskcluster/taskgraph/transforms/tests.py thunderbird-78.4.2+build1/taskcluster/taskgraph/transforms/tests.py
--- thunderbird-78.4.0+build1/taskcluster/taskgraph/transforms/tests.py 2020-10-28 15:18:00.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/taskgraph/transforms/tests.py 2020-11-10 09:04:17.000000000 +0000
@@ -140,7 +140,7 @@
# os x worker types keyed by test-platform
MACOSX_WORKER_TYPES = {
- 'macosx1014-64': 't-osx-1014-r7-edid',
+ 'macosx1014-64': 't-osx-1014',
'macosx1014-64-power': 't-osx-1014-power'
}
diff -Nru thunderbird-78.4.0+build1/taskcluster/taskgraph/util/scriptworker.py thunderbird-78.4.2+build1/taskcluster/taskgraph/util/scriptworker.py
--- thunderbird-78.4.0+build1/taskcluster/taskgraph/util/scriptworker.py 2020-10-28 15:17:48.000000000 +0000
+++ thunderbird-78.4.2+build1/taskcluster/taskgraph/util/scriptworker.py 2020-11-10 09:04:17.000000000 +0000
@@ -118,7 +118,13 @@
"""Known balrog actions."""
-BALROG_ACTIONS = ('submit-locale', 'submit-toplevel', 'schedule')
+BALROG_ACTIONS = (
+ 'submit-locale',
+ 'submit-toplevel',
+ 'schedule',
+ 'v2-submit-locale',
+ 'v2-submit-toplevel'
+)
"""Map balrog scope aliases to sets of projects.