From 64588de74853594b73d9ef499fef6ebfda2ec71a Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 11 May 2015 14:33:24 +0200 Subject: [PATCH] Another fix for FS symmetric key --- BuildFiles/Building/ccnet.config | 1 - BuildFiles/Packaging/scripts/repackage-one | 2 +- Site5/Pages/v5/Public/Initialize.aspx.cs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/BuildFiles/Building/ccnet.config b/BuildFiles/Building/ccnet.config index 6a049eea..91342393 100644 --- a/BuildFiles/Building/ccnet.config +++ b/BuildFiles/Building/ccnet.config @@ -144,7 +144,6 @@ - diff --git a/BuildFiles/Packaging/scripts/repackage-one b/BuildFiles/Packaging/scripts/repackage-one index 8ad047f1..e07b95fd 100755 --- a/BuildFiles/Packaging/scripts/repackage-one +++ b/BuildFiles/Packaging/scripts/repackage-one @@ -104,7 +104,7 @@ if [ "$COPYFILES" == "yes" ]; then mkdir -p etc/swarmops mv $DEPLOYDIR/$TARGETDIR/machineKey.config etc/swarmops/. sed -i 's/\"machineKey.config\"/\"..\/..\/..\/..\/etc\/swarmops\/machineKey.config\"/g' $DEPLOYDIR/$TARGETDIR/web.config - cat "UNINITIALIZED" > etc/swarmops/symmetricKey.config + echo "UNINITIALIZED" > etc/swarmops/symmetricKey.config fi fi diff --git a/Site5/Pages/v5/Public/Initialize.aspx.cs b/Site5/Pages/v5/Public/Initialize.aspx.cs index 1912eda1..bb354703 100644 --- a/Site5/Pages/v5/Public/Initialize.aspx.cs +++ b/Site5/Pages/v5/Public/Initialize.aspx.cs @@ -375,7 +375,7 @@ namespace Swarmops.Frontend.Pages.v5.Public // SECURITY: Initialize encryption keys Authentication.InitializeSymmetricDatabaseKey(); - // Authentication.InitializeSymmetricFileSystemKey(); + Authentication.InitializeSymmetricFileSystemKey(); // Start an async thread that does all the initialization work, then return