Yet another dumbfix

This commit is contained in:
Rick Falkvinge
2015-06-04 12:57:40 +02:00
parent aa5d602cc0
commit 12ecd5d04b
+7 -5
View File
@@ -363,11 +363,6 @@ namespace Swarmops.Frontend.Pages.v5.Public
File.WriteAllText ("/etc/swarmops/machineKey.config", machineKeyXml, Encoding.GetEncoding (1252));
}
// SECURITY: Initialize encryption keys
Authentication.InitializeSymmetricDatabaseKey();
Authentication.InitializeSymmetricFileSystemKey();
// Start an async thread that does all the initialization work, then return
Thread initThread = new Thread (InitDatabaseThread);
@@ -409,6 +404,13 @@ namespace Swarmops.Frontend.Pages.v5.Public
DatabaseMaintenance.UpgradeSchemata();
Thread.Sleep (100);
// SECURITY: With schemata to hold them in place, initialize the encryption keys
Authentication.InitializeSymmetricDatabaseKey();
Authentication.InitializeSymmetricFileSystemKey();
_initProgress = 5;
_initMessage = "Getting list of countries from Swarmops servers...";
Thread.Sleep (100);