diff -up thunderbird-78.7.0/comm/mail/extensions/openpgp/content/modules/RNPLib.jsm.seq-pgp thunderbird-78.7.0/comm/mail/extensions/openpgp/content/modules/RNPLib.jsm --- thunderbird-78.7.0/comm/mail/extensions/openpgp/content/modules/RNPLib.jsm.seq-pgp 2021-02-05 10:53:04.159797183 +0100 +++ thunderbird-78.7.0/comm/mail/extensions/openpgp/content/modules/RNPLib.jsm 2021-02-05 11:12:39.837691933 +0100 @@ -56,6 +56,20 @@ function tryLoadRNP(name, suffix) { } function loadExternalRNPLib() { + var useSequoia = Services.prefs.getBoolPref("mail.openpgp.enable-sequoia", false); + if (useSequoia) { + if (!librnp) { + // Try loading librnp.so, librnp.dylib, or rnp.dll first + console.log("Loading libsequoia_octopus_librnp.so instead of librnp.so..."); + tryLoadRNP("sequoia_octopus_librnp", ""); + } + if (!librnp) { + console.error("Unable to load libsequoia_octopus_librnp.so, fallback to librnp.so."); + } + } else { + console.log("Loading librnp instead of libsequoia_octopus_librnp.so. Set mail.openpgp.enable-sequoia to true if you want to use it instead of botan."); + } + if (!librnp) { // Try loading librnp.so, librnp.dylib, or rnp.dll first tryLoadRNP("rnp", "");