From 12ecd5d04bd2dcfd8153345c37a71a0444f8950c Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 4 Jun 2015 12:57:40 +0200 Subject: [PATCH] Yet another dumbfix --- Site5/Pages/v5/Public/Initialize.aspx.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Site5/Pages/v5/Public/Initialize.aspx.cs b/Site5/Pages/v5/Public/Initialize.aspx.cs index 9efdaf9e..4fbddc71 100644 --- a/Site5/Pages/v5/Public/Initialize.aspx.cs +++ b/Site5/Pages/v5/Public/Initialize.aspx.cs @@ -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);