Bug 1604377 - followup to also update cert8.db to cert9.db (and change remaining references). r=bustage-fix DONTBUILD
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Wed, 18 Dec 2019 12:33:36 +0200
changeset 37771 52d423a8101275328230384a5c5158203b285c79
parent 37770 2e35cc63542c54351208c96013e7bbd3cfa7342b
child 37772 bc449b862ba612f5ce0346c7d32264c67a231233
push id397
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:16:13 +0000
reviewersbustage-fix
bugs1604377
Bug 1604377 - followup to also update cert8.db to cert9.db (and change remaining references). r=bustage-fix DONTBUILD
mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
mailnews/compose/test/unit/test_longLines.js
mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js
mailnews/test/data/db-tinderbox-invalid/cert8.db
mailnews/test/data/db-tinderbox-invalid/cert9.db
--- a/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -23,18 +23,18 @@
 #define NEWS_DIR_50_NAME NS_LITERAL_STRING("News")
 
 ///////////////////////////////////////////////////////////////////////////////
 // nsSeamonkeyProfileMigrator
 #define FILE_NAME_JUNKTRAINING NS_LITERAL_STRING("training.dat")
 #define FILE_NAME_PERSONALDICTIONARY NS_LITERAL_STRING("persdict.dat")
 #define FILE_NAME_PERSONAL_ADDRESSBOOK NS_LITERAL_STRING("abook.mab")
 #define FILE_NAME_MAILVIEWS NS_LITERAL_STRING("mailviews.dat")
-#define FILE_NAME_CERT8DB NS_LITERAL_STRING("cert8.db")
-#define FILE_NAME_KEY3DB NS_LITERAL_STRING("key3.db")
+#define FILE_NAME_CERT9DB NS_LITERAL_STRING("cert9.db")
+#define FILE_NAME_KEY4DB NS_LITERAL_STRING("key4.db")
 #define FILE_NAME_SECMODDB NS_LITERAL_STRING("secmod.db")
 #define FILE_NAME_PREFS NS_LITERAL_STRING("prefs.js")
 #define FILE_NAME_USER_PREFS NS_LITERAL_STRING("user.js")
 
 struct PrefBranchStruct {
   char* prefName;
   int32_t type;
   union {
@@ -559,21 +559,21 @@ nsresult nsSeamonkeyProfileMigrator::Cop
     rv = tmp;
   }
   tmp = CopyFile(FILE_NAME_USER_PREFS, FILE_NAME_USER_PREFS);
   if (NS_FAILED(tmp)) {
     rv = tmp;
   }
 
   // Security Stuff
-  tmp = CopyFile(FILE_NAME_CERT8DB, FILE_NAME_CERT8DB);
+  tmp = CopyFile(FILE_NAME_CERT9DB, FILE_NAME_CERT9DB);
   if (NS_FAILED(tmp)) {
     rv = tmp;
   }
-  tmp = CopyFile(FILE_NAME_KEY3DB, FILE_NAME_KEY3DB);
+  tmp = CopyFile(FILE_NAME_KEY4DB, FILE_NAME_KEY4DB);
   if (NS_FAILED(tmp)) {
     rv = tmp;
   }
   tmp = CopyFile(FILE_NAME_SECMODDB, FILE_NAME_SECMODDB);
   if (NS_FAILED(tmp)) {
     rv = tmp;
   }
 
--- a/mailnews/compose/test/unit/test_longLines.js
+++ b/mailnews/compose/test/unit/test_longLines.js
@@ -26,16 +26,22 @@ function checkDraftHeadersAndBody(
   charset = "UTF-8"
 ) {
   let msgData = mailTestUtils.loadMessageToString(
     gDraftFolder,
     mailTestUtils.firstMsgHdr(gDraftFolder)
   );
   checkMessageHeaders(msgData, expectedHeaders);
 
+  if (!expectedBody.endsWith("\r\n")) {
+    // The compose code will enforce an ending \r\n, so we will expect that
+    // go get added if it's not there already.
+    expectedBody += "\r\n";
+  }
+
   // Get the message body, decode from base64 and check.
   let endOfHeaders = msgData.indexOf("\r\n\r\n");
   let body = msgData.slice(endOfHeaders + 4);
   let endOfBody = body.indexOf("\r\n\r\n");
 
   if (endOfBody > 0) {
     body = body.slice(0, endOfBody);
   } else {
--- a/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js
+++ b/mailnews/db/gloda/test/unit/test_smime_mimemsg_representation.js
@@ -23,17 +23,17 @@ var msgGen = (gMessageGenerator = new Me
 var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 var { MsgHdrToMimeMessage } = ChromeUtils.import(
   "resource:///modules/gloda/mimemsg.js"
 );
 
 function initNSS() {
   // Copy the NSS database files over.
   let profile = FileUtils.getDir("ProfD", []);
-  let files = ["cert8.db", "key4.db", "secmod.db"];
+  let files = ["cert9.db", "key4.db", "secmod.db"];
   let directory = do_get_file("../../../../data/db-tinderbox-invalid");
   for (let f of files) {
     let keydb = directory.clone();
     keydb.append(f);
     keydb.copyTo(profile, f);
   }
 
   // Ensure NSS is initialized.
deleted file mode 100644
index 94ccb070d10771d8a294f3641da3ab8060c715dc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..162e60adb721914a04d054007b8f5125254691ab
GIT binary patch
literal 36864
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