Merge pull request #18 from marco-c/support_firefox_intermediate_standard

Support Firefox intermediate standard

Author: martinthomson

nodejs/ece.js

@@ -142,8 +142,13 @@ function deriveKeyAndNonce(params, mode) {
   var keyInfo;
   var nonceInfo;
   if (padSize === 1) {
-    keyInfo = 'Content-Encoding: aesgcm128';
-    nonceInfo = 'Content-Encoding: nonce';
+    if (params.authSecret) {
+      keyInfo = info('aesgcm128', s.context);
+      nonceInfo = info('nonce', s.context);
+    } else {
+      keyInfo = 'Content-Encoding: aesgcm128';
+      nonceInfo = 'Content-Encoding: nonce';
+    }
   } else if (padSize === 2) {
     keyInfo = info('aesgcm', s.context);
     nonceInfo = info('nonce', s.context);

nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "http_ece",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Encrypted Content-Encoding for HTTP",
   "homepage": "https://github.com/martinthomson/encrypted-content-encoding",
   "bugs": "https://github.com/martinthomson/encrypted-content-encoding/issues",

python/http_ece/__init__.py

@@ -67,8 +67,12 @@ def lengthPrefix(key):
         keyinfo = buildInfo(b"aesgcm", context)
         nonceinfo = buildInfo(b"nonce", context)
     elif padSize == 1:
-        keyinfo = b"Content-Encoding: aesgcm128"
-        nonceinfo = b"Content-Encoding: nonce"
+        if authSecret is not None:
+            keyinfo = buildInfo(b"aesgcm128", context)
+            nonceinfo = buildInfo(b"nonce", context)
+        else:
+            keyinfo = b"Content-Encoding: aesgcm128"
+            nonceinfo = b"Content-Encoding: nonce"
     else:
         raise Exception(u"unable to set context for padSize=" + str(padSize))
 

python/setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='http_ece',
-    version='0.4.4',
+    version='0.4.5',
     author='Martin Thomson',
     author_email='martin.thomson@gmail.com',
     scripts=[],