From 1dc1e0a01733cdae143e2cebd3669fd1cc909c36 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 7 May 2014 10:31:57 -0300 Subject: [PATCH 1/2] move passphrase config --- js/models/core/Passphrase.js | 2 +- js/services/passphrase.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/models/core/Passphrase.js b/js/models/core/Passphrase.js index 12a9edf17..e8a0bbd3e 100644 --- a/js/models/core/Passphrase.js +++ b/js/models/core/Passphrase.js @@ -2,7 +2,7 @@ function Passphrase(config) { config = config || {}; - this.salt = config.storageSalt || 'mjuBtGybi/4='; + this.salt = config.salt || 'mjuBtGybi/4='; this.iterations = config.iterations || 1000; }; diff --git a/js/services/passphrase.js b/js/services/passphrase.js index 2ea188869..12043a3be 100644 --- a/js/services/passphrase.js +++ b/js/services/passphrase.js @@ -2,6 +2,6 @@ var passphrase; angular.module('copay.passphrase').factory('Passphrase', function($rootScope) { - passphrase = passphrase || new copay.Passphrase(config); + passphrase = passphrase || new copay.Passphrase(config.passphrase); return passphrase; }); From eda1b5f0f516d2e124de4c9dce9c280543eaeb49 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 7 May 2014 10:34:05 -0300 Subject: [PATCH 2/2] modify template --- config.template.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config.template.js b/config.template.js index c5ae95546..d100063bc 100644 --- a/config.template.js +++ b/config.template.js @@ -97,10 +97,12 @@ var config = { host: 'test.insight.is', port: 3001 }, - verbose: 1, + passphrase: { + iterations: 1, + storageSalt: 'mjuBtGybi/4=', + }, themes: ['default'], - iterations: 1000, - storageSalt: 'mjuBtGybi/4=', // choose your own salt (base64) + verbose: 1, }; var log = function() {