From 017bda025e8bba32f0b685b48f84ca6fd8f3dd85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Wed, 19 Jul 2017 19:12:56 +0200
Subject: [PATCH] Some comment and copyright updates

---
 chrome_addon/lib/misc.js           |  2 +-
 firefox_webextension/background.js |  5 +++--
 server/conf.php                    | 14 ++++++--------
 server/functions.php               |  2 +-
 server/index.php                   |  2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/chrome_addon/lib/misc.js b/chrome_addon/lib/misc.js
index 73f9ac8..9d4fcb2 100644
--- a/chrome_addon/lib/misc.js
+++ b/chrome_addon/lib/misc.js
@@ -50,7 +50,7 @@ function str2ab2(str) {
 }
 
 function str2ab(str) {
-    var buf = new ArrayBuffer(str.length); // 2 bytes for each char
+    var buf = new ArrayBuffer(str.length);
     // var buf = new ArrayBuffer(str.length*2); // 2 bytes for each char
     var bufView = new Uint8Array(buf);
     for (var i=0, strLen=str.length; i < strLen; i++) {
diff --git a/firefox_webextension/background.js b/firefox_webextension/background.js
index 03068dc..1a027ec 100644
--- a/firefox_webextension/background.js
+++ b/firefox_webextension/background.js
@@ -1,5 +1,6 @@
 function url_block_callback(details)
 {
+    //console.log(details);
     if (details.requestBody)
     {
 	if (details.requestBody.formData)
@@ -57,7 +58,7 @@ browser.runtime.onMessage.addListener(
 	    	    {
 	    		browser.webRequest.onBeforeRequest.addListener(
 	    		    url_block_callback,
-	    		    {urls:[request.options.url],
+	    		    {"urls":[request.options.url],
 	    		     "types":["main_frame"],
 	    		     "tabId":tab.id,
 	    		     "windowId":tab.windowId
@@ -68,7 +69,7 @@ browser.runtime.onMessage.addListener(
 	    	    {
 			browser.webRequest.onBeforeRequest.addListener(
 			    url_block_callback,
-			    {urls:[request.options.url], types:["main_frame"]},
+			    {"urls":[request.options.url], "types":["main_frame"]},
 			    ["blocking", "requestBody"]);
 		    }		    
 		});
diff --git a/server/conf.php b/server/conf.php
index a7381ea..527b07b 100644
--- a/server/conf.php
+++ b/server/conf.php
@@ -1,6 +1,6 @@
 <?php
 /*
-  Copyright (C) 2013-2015 Grégory Soutadé
+  Copyright (C) 2013-2017 Grégory Soutadé
   
   This file is part of gPass.
   
@@ -48,25 +48,23 @@ $PBKDF2_LEVEL=1000;
   (to generate a unique PBKDF2 derivation) that result in an access tokens.
   With this access token, user has the right to get
   encrypted login/password values and remove them.
-  It's a kind of challenge.
+  It's a kind of challenge but requires more cpu bandwidth
+  (one derivation + two decryption for each password !).
 
   This option is backward compatible with old version < 0.6
-
-  For now it's deactivated because it requires high cpu bandwidth
-  (one derivation + two decryption for each password !). When
-  standard crypto API will be stable it will be enabled by default.
 */
 $USE_SHADOW_LOGINS=1;
 
 /*
   Protection against DDoS.
-  Each request can contains multiple password combination
+  Each request can contains multiple password combinations
   (to support wildcards for example) and multiple names.
   Currently only two passwords are sent from addon :
       www.example.com
       *.example.com
   But, on future we may also consider 'www.example.*', '*.example.*' and lower case username.
-  For maximum security, you can set it to 2.
+  For maximum security, you can set it to 2 or 4 if you want to be backward compatible
+  with addons/extions <= 0.7.
  */
 $MAX_PASSWORDS_PER_REQUEST=10;
 
diff --git a/server/functions.php b/server/functions.php
index 696b968..cc70774 100755
--- a/server/functions.php
+++ b/server/functions.php
@@ -1,6 +1,6 @@
 <?php
 /*
-  Copyright (C) 2013 Grégory Soutadé
+  Copyright (C) 2013-2017 Grégory Soutadé
   
   This file is part of gPass.
   
diff --git a/server/index.php b/server/index.php
index 7ae897d..d8b0146 100644
--- a/server/index.php
+++ b/server/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-  Copyright (C) 2013-2014 Grégory Soutadé
+  Copyright (C) 2013-2017 Grégory Soutadé
   
   This file is part of gPass.