transition to GCM

Author: skadefro

OpenFlow/src/Crypt.ts

@@ -44,7 +44,7 @@ export class Crypt {
     }
     static encrypt(text: string): string {
         let iv: Buffer = crypto.randomBytes(Crypt.iv_length);
-        let cipher: crypto.Cipher = crypto.createCipheriv("aes-256-cbc", Buffer.from(Crypt.encryption_key), iv);
+        let cipher: crypto.Cipher = crypto.createCipheriv("AES-256-GCM", Buffer.from(Crypt.encryption_key), iv);
         let encrypted: Buffer = cipher.update((text as any));
         encrypted = Buffer.concat([encrypted, cipher.final()]);
         return iv.toString("hex") + ":" + encrypted.toString("hex");
@@ -53,9 +53,16 @@ export class Crypt {
         let textParts: string[] = text.split(":");
         let iv: Buffer = Buffer.from(textParts.shift(), "hex");
         let encryptedText: Buffer = Buffer.from(textParts.join(":"), "hex");
-        let decipher: crypto.Decipher = crypto.createDecipheriv("aes-256-cbc", Buffer.from(Crypt.encryption_key), iv);
-        let decrypted: Buffer = decipher.update(encryptedText);
-        decrypted = Buffer.concat([decrypted, decipher.final()]);
+        let decrypted: Buffer
+        try {
+            let decipher: crypto.Decipher = crypto.createDecipheriv("AES-256-GCM", Buffer.from(this.encryption_key), iv);
+            decrypted = decipher.update(encryptedText);
+            decrypted = Buffer.concat([decrypted, decipher.final()]);
+        } catch {
+            let decipher: crypto.Decipher = crypto.createDecipheriv("aes-256-cbc", Buffer.from(this.encryption_key), iv);
+            decrypted = decipher.update(encryptedText);
+            decrypted = Buffer.concat([decrypted, decipher.final()]);
+        }
         return decrypted.toString();
     }
     static async hash(password: string): Promise<string> {

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts

@@ -71,7 +71,7 @@ export class noderedcontribopenflowstorage {
     static encrypt(text: string): string {
         try {
             let iv: Buffer = crypto.randomBytes(this.iv_length);
-            let cipher: crypto.Cipher = crypto.createCipheriv("aes-256-cbc", Buffer.from(this.encryption_key), iv);
+            let cipher: crypto.Cipher = crypto.createCipheriv("AES-256-GCM", Buffer.from(this.encryption_key), iv);
             let encrypted: Buffer = cipher.update((text as any));
             encrypted = Buffer.concat([encrypted, cipher.final()]);
             return iv.toString("hex") + ":" + encrypted.toString("hex");
@@ -85,9 +85,16 @@ export class noderedcontribopenflowstorage {
             let textParts: string[] = text.split(":");
             let iv: Buffer = Buffer.from(textParts.shift(), "hex");
             let encryptedText: Buffer = Buffer.from(textParts.join(":"), "hex");
-            let decipher: crypto.Decipher = crypto.createDecipheriv("aes-256-cbc", Buffer.from(this.encryption_key), iv);
-            let decrypted: Buffer = decipher.update(encryptedText);
-            decrypted = Buffer.concat([decrypted, decipher.final()]);
+            let decrypted: Buffer
+            try {
+                let decipher: crypto.Decipher = crypto.createDecipheriv("AES-256-GCM", Buffer.from(this.encryption_key), iv);
+                decrypted = decipher.update(encryptedText);
+                decrypted = Buffer.concat([decrypted, decipher.final()]);
+            } catch {
+                let decipher: crypto.Decipher = crypto.createDecipheriv("aes-256-cbc", Buffer.from(this.encryption_key), iv);
+                decrypted = decipher.update(encryptedText);
+                decrypted = Buffer.concat([decrypted, decipher.final()]);
+            }
             return decrypted.toString();
         } catch (error) {
             console.error(error);

VERSION

@@ -1 +1 @@
-1.3.11
+1.3.12

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {