Merge pull request #880 from Microsoft/toanzian/crypto-fix

Changed en/decryption cipher to aes-256-cbc to work with Electron 4+.
microsoft · Apr 17, 2019 · d13a283 · d13a283
2 parents b6f1f56 + 118786d
commit d13a283
Show file tree

Hide file tree

Showing 4 changed files with 9,268 additions and 4,796 deletions.
diff --git a/libraries/botbuilder-ai/package-lock.json b/libraries/botbuilder-ai/package-lock.json
diff --git a/libraries/botframework-config/src/encrypt.ts b/libraries/botframework-config/src/encrypt.ts
@@ -40,7 +40,7 @@ export function encryptString(plainText: string, secret: string): string {
     const ivText: string = ivBytes.toString('base64');
 
     // encrypt using aes256 iv + key + plainText = encryptedText
-    const cipher: crypto.Cipher = crypto.createCipheriv('aes256', keyBytes, ivBytes);
+    const cipher: crypto.Cipher = crypto.createCipheriv('aes-256-cbc', keyBytes, ivBytes);
     let encryptedValue: string = cipher.update(plainText, 'utf8', 'base64');
     encryptedValue += cipher.final('base64');
 
@@ -84,7 +84,7 @@ export function decryptString(encryptedValue: string, secret: string): string {
     }
 
     // decrypt using aes256 iv + key + encryptedText = decryptedText
-    const decipher: crypto.Decipher = crypto.createDecipheriv('aes256', keyBytes, ivBytes);
+    const decipher: crypto.Decipher = crypto.createDecipheriv('aes-256-cbc', keyBytes, ivBytes);
     let value: string = decipher.update(encryptedText, 'base64', 'utf8');
     value += decipher.final('utf8');