Merge pull request #33 from simomat/custom-iv-size added iv size par…

…ameter # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Wed Sep 16 12:21:50 2020 +0300 # # On branch master # Your branch is up to date with 'origin/master'. # # Changes to be committed: # modified: .gitignore # modified: lib/constants.js # modified: lib/crypt.js # modified: src/constants.js # modified: src/crypt.js # modified: test/test.js # modified: web/hybrid-crypto.js # modified: web/hybrid-crypto.min.js # # Changes not staged for commit: # modified: package.json #

.gitignore

@@ -57,3 +57,7 @@ typings/
 # dotenv environment variables file
 .env
 
+# IDE files
+.idea
+*.iml
+

lib/constants.js

@@ -4,5 +4,6 @@ module.exports = {
   AES_STANDARD: 'AES-CBC',
   RSA_STANDARD: 'RSA-OAEP',
   DEFAULT_MESSAGE_DIGEST: 'sha256',
-  DEFAULT_AES_KEY_SIZE: 256
+  DEFAULT_AES_KEY_SIZE: 256,
+  DEFAULT_AES_IV_SIZE: 32
 };

lib/crypt.js

@@ -22,6 +22,7 @@ var pki = forge.pki,
 var _require = require('./constants'),
     DEFAULT_MESSAGE_DIGEST = _require.DEFAULT_MESSAGE_DIGEST,
     DEFAULT_AES_KEY_SIZE = _require.DEFAULT_AES_KEY_SIZE,
+    DEFAULT_AES_IV_SIZE = _require.DEFAULT_AES_IV_SIZE,
     AES_STANDARD = _require.AES_STANDARD,
     RSA_STANDARD = _require.RSA_STANDARD;
 
@@ -36,6 +37,7 @@ function () {
     this.options = _objectSpread({
       md: DEFAULT_MESSAGE_DIGEST,
       aesKeySize: DEFAULT_AES_KEY_SIZE,
+      aesIvSize: DEFAULT_AES_IV_SIZE,
       aesStandard: AES_STANDARD,
       rsaStandard: RSA_STANDARD,
       entropy: undefined
@@ -206,7 +208,7 @@ function () {
         return typeof key === 'string' ? pki.publicKeyFromPem(key) : key;
       }); // Generate random keys
 
-      var iv = forge.random.getBytesSync(32);
+      var iv = forge.random.getBytesSync(this.options.aesIvSize);
       var key = forge.random.getBytesSync(this.options.aesKeySize / 8); // Encrypt random key with all of the public keys
 
       var encryptedKeys = {};

src/constants.js

@@ -5,4 +5,5 @@ module.exports = {
     RSA_STANDARD: 'RSA-OAEP',
     DEFAULT_MESSAGE_DIGEST: 'sha256',
     DEFAULT_AES_KEY_SIZE: 256,
+    DEFAULT_AES_IV_SIZE: 32
 };

src/crypt.js

@@ -5,13 +5,15 @@ const { pki, rsa } = forge;
 const {
     DEFAULT_MESSAGE_DIGEST,
     DEFAULT_AES_KEY_SIZE,
+    DEFAULT_AES_IV_SIZE,
     AES_STANDARD,
     RSA_STANDARD,
 } = require('./constants');
 
 type CryptProps = {
     md: string,
     aesKeySize: number,
+    aesIvSize: number,
     entropy?: string | number,
     aesStandard: string,
     rsaStandard: string,
@@ -24,6 +26,7 @@ class Crypt {
         this.options = {
             md: DEFAULT_MESSAGE_DIGEST,
             aesKeySize: DEFAULT_AES_KEY_SIZE,
+            aesIvSize: DEFAULT_AES_IV_SIZE,
             aesStandard: AES_STANDARD,
             rsaStandard: RSA_STANDARD,
             entropy: undefined,
@@ -198,7 +201,7 @@ class Crypt {
         ): Array<Object>);
 
         // Generate random keys
-        const iv = forge.random.getBytesSync(32);
+        const iv = forge.random.getBytesSync(this.options.aesIvSize);
         const key = forge.random.getBytesSync(this.options.aesKeySize / 8);
 
         // Encrypt random key with all of the public keys

test/test.js

@@ -321,6 +321,31 @@ describe('Crypt', function() {
             });
         });
     });
+
+    it('should encrypt with a default IV size of 32', function() {
+        var message = 'Hello world!';
+
+        var encrypted = crypt.encrypt(publicKey, message);
+        var iv = Buffer.from(JSON.parse(encrypted).iv, 'base64');
+
+        assert.equal(iv.length, 32);
+    })
+
+    it('should encrypt with custom IV size', function () {
+        var crypt = new Crypt({
+            aesIvSize: 16
+        });
+
+        var message = 'Hello world!';
+
+        var encrypted = crypt.encrypt(publicKey, message);
+        var decrypted = crypt.decrypt(privateKey, encrypted).message;
+        var iv = Buffer.from(JSON.parse(encrypted).iv, 'base64');
+
+        assert.equal(iv.length, 16);
+        assert.notEqual(encrypted, message);
+        assert.equal(decrypted, message);
+    });
 });
 
 describe('Helpers', function() {

web/hybrid-crypto.js

@@ -5,7 +5,8 @@ module.exports = {
   AES_STANDARD: 'AES-CBC',
   RSA_STANDARD: 'RSA-OAEP',
   DEFAULT_MESSAGE_DIGEST: 'sha256',
-  DEFAULT_AES_KEY_SIZE: 256
+  DEFAULT_AES_KEY_SIZE: 256,
+  DEFAULT_AES_IV_SIZE: 32
 };
 },{}],2:[function(require,module,exports){
 "use strict";
@@ -32,6 +33,7 @@ var pki = forge.pki,
 var _require = require('./constants'),
     DEFAULT_MESSAGE_DIGEST = _require.DEFAULT_MESSAGE_DIGEST,
     DEFAULT_AES_KEY_SIZE = _require.DEFAULT_AES_KEY_SIZE,
+    DEFAULT_AES_IV_SIZE = _require.DEFAULT_AES_IV_SIZE,
     AES_STANDARD = _require.AES_STANDARD,
     RSA_STANDARD = _require.RSA_STANDARD;
 
@@ -46,6 +48,7 @@ function () {
     this.options = _objectSpread({
       md: DEFAULT_MESSAGE_DIGEST,
       aesKeySize: DEFAULT_AES_KEY_SIZE,
+      aesIvSize: DEFAULT_AES_IV_SIZE,
       aesStandard: AES_STANDARD,
       rsaStandard: RSA_STANDARD,
       entropy: undefined
@@ -216,7 +219,7 @@ function () {
         return typeof key === 'string' ? pki.publicKeyFromPem(key) : key;
       }); // Generate random keys
 
-      var iv = forge.random.getBytesSync(32);
+      var iv = forge.random.getBytesSync(this.options.aesIvSize);
       var key = forge.random.getBytesSync(this.options.aesKeySize / 8); // Encrypt random key with all of the public keys
 
       var encryptedKeys = {};