Update supported configurations

Author: martinthomson

nodejs/test.js

@@ -4,8 +4,6 @@ var crypto = require('crypto');
 var ece = require('./ece.js');
 var base64 = require('urlsafe-base64');
 var assert = require('assert');
-var fs = require('fs');
-
 
 // Usage: node test.js [args]
 // If args contains a version (e.g., aes128gcm), filter on versions.
@@ -37,7 +35,6 @@ if (process.argv.length >= 3) {
   } else {
     plaintext = new Buffer(process.argv[2], 'ascii');
   }
-  dump = ( process.argv.indexOf('dump') != -1)
 }
 function filterTests(fullList) {
   var filtered = fullList.filter(function(t) {
@@ -62,16 +59,12 @@ function logbuf(msg, buf) {
   }
 }
 
-// Validate that the encryption function only accepts Buffers
 function validate() {
   ['hello', null, 1, NaN, [], {}].forEach(function(v) {
     try {
-      ece.encrypt(v, {});
-    } catch (e) {
-      if (e.toString() != "Error: buffer argument must be a Buffer") {
-        throw new Error("encrypt failed to reject " + JSON.stringify(v));
-      }
-    }
+      encrypt('hello', {});
+      throw new Error('should insist on a buffer');
+    } catch (e) {}
   });
 }
 
@@ -111,21 +104,6 @@ function encryptDecrypt(input, encryptParams, decryptParams) {
   logbuf('Encrypted', encrypted);
   var decrypted = ece.decrypt(encrypted, decryptParams);
   logbuf('Decrypted', decrypted);
-  if (dump) {
-    var data = {
-      version: version,
-      input: base64.encode(input),
-      encrypted: base64.encode(encrypted),
-      params: {
-        encrypted: encryptParams,
-        decrypt: decryptParams,
-      }
-    };
-    if (keyData) {
-      data.keys = keyData;
-    }
-    dumpData(data);
-  }
   assert.equal(Buffer.compare(input, decrypted), 0);
   log('----- OK');
 }
@@ -177,7 +155,7 @@ function detectTruncation(version) {
   logbuf('Encrypted', encrypted);
   var ok = false;
   try {
-    ece.decrypt(encrypted, params, params, version);
+    ece.decrypt(encrypted, params);
   } catch (e) {
     log('----- OK: ' + e);
     ok = true;
@@ -304,4 +282,4 @@ filterTests([ 'aesgcm128', 'aesgcm', 'aes128gcm' ])
   });
 checkExamples();
 
-log('All tests passed.');
+log('All tests passed.');

python/setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='http_ece',
-    version='0.6.0',
+    version='0.6.1',
     author='Martin Thomson',
     author_email='martin.thomson@gmail.com',
     scripts=[],
@@ -22,6 +22,7 @@
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
     keywords='crypto http',
     install_requires=[