fix(amazon-cognito-identity-js): replace crypto-browserify with crypto-js

packages/amazon-cognito-identity-js/package.json

@@ -62,7 +62,7 @@
   "types": "./index.d.ts",
   "dependencies": {
     "buffer": "4.9.1",
-    "crypto-browserify": "1.0.9",
+    "crypto-js": "^3.1.9-1",
     "js-cookie": "^2.1.4"
   },
   "devDependencies": {

packages/amazon-cognito-identity-js/src/AuthenticationHelper.js

@@ -16,10 +16,11 @@
  */
 
 import { Buffer } from 'buffer/';
-import * as crypto from 'crypto-browserify';
-const createHash = crypto.createHash;
-const createHmac = crypto.createHmac;
-const randomBytes = crypto.randomBytes;
+import * as CryptoJS from 'crypto-js';
+
+const randomBytes = function(nBytes) {
+  return Buffer.from((CryptoJS.lib.WordArray.random(nBytes)).toString(), 'hex');
+}
 
 import BigInteger from './BigInteger';
 
@@ -202,7 +203,9 @@ export default class AuthenticationHelper {
    * @private
    */
   hash(buf) {
-    const hashHex = createHash('sha256').update(buf).digest('hex');
+    const str = buf instanceof Buffer ? CryptoJS.lib.WordArray.create(buf) : buf;
+    const hashHex = CryptoJS.SHA256(str).toString();
+
     return (new Array(64 - hashHex.length).join('0')) + hashHex;
   }
 
@@ -224,13 +227,18 @@ export default class AuthenticationHelper {
    * @private
    */
   computehkdf(ikm, salt) {
-    const prk = createHmac('sha256', salt).update(ikm).digest();
-    const infoBitsUpdate = Buffer.concat([
-      this.infoBits,
-      Buffer.from(String.fromCharCode(1), 'utf8'),
-    ]);
-    const hmac = createHmac('sha256', prk).update(infoBitsUpdate).digest();
-    return hmac.slice(0, 16);
+    const infoBitsWordArray = CryptoJS.lib.WordArray.create(
+      Buffer.concat([
+        this.infoBits,
+        Buffer.from(String.fromCharCode(1), 'utf8'),
+      ])
+    );
+    const ikmWordArray = ikm instanceof Buffer ? CryptoJS.lib.WordArray.create(ikm) : ikm;
+    const saltWordArray = salt instanceof Buffer ? CryptoJS.lib.WordArray.create(salt) : salt;
+
+    const prk = CryptoJS.HmacSHA256(ikmWordArray, saltWordArray);
+    const hmac = CryptoJS.HmacSHA256(infoBitsWordArray, prk);
+    return Buffer.from(hmac.toString(), 'hex').slice(0, 16);
   }
 
   /**

packages/amazon-cognito-identity-js/src/CognitoUser.js

@@ -16,9 +16,7 @@
  */
 
 import { Buffer } from 'buffer/';
-//import createHmac from 'create-hmac';
-import * as crypto from 'crypto-browserify';
-const createHmac = crypto.createHmac;
+import * as CryptoJS from 'crypto-js';
 
 import BigInteger from './BigInteger';
 import AuthenticationHelper from './AuthenticationHelper';
@@ -281,14 +279,16 @@ export default class CognitoUser {
 
             const dateNow = dateHelper.getNowString();
 
-            const signatureString = createHmac('sha256', hkdf)
-              .update(Buffer.concat([
+            const message = CryptoJS.lib.WordArray.create(
+              Buffer.concat([
                 Buffer.from(this.pool.getUserPoolId().split('_')[1], 'utf8'),
                 Buffer.from(this.username, 'utf8'),
                 Buffer.from(challengeParameters.SECRET_BLOCK, 'base64'),
                 Buffer.from(dateNow, 'utf8'),
-              ]))
-              .digest('base64');
+              ])
+            );
+            const key = CryptoJS.lib.WordArray.create(hkdf);
+            const signatureString = CryptoJS.enc.Base64.stringify(CryptoJS.HmacSHA256(message, key));
 
             const challengeResponses = {};
 
@@ -620,14 +620,16 @@ export default class CognitoUser {
 
             const dateNow = dateHelper.getNowString();
 
-            const signatureString = createHmac('sha256', hkdf)
-            .update(Buffer.concat([
-              Buffer.from(this.deviceGroupKey, 'utf8'),
-              Buffer.from(this.deviceKey, 'utf8'),
-              Buffer.from(challengeParameters.SECRET_BLOCK, 'base64'),
-              Buffer.from(dateNow, 'utf8'),
-            ]))
-            .digest('base64');
+            const message = CryptoJS.lib.WordArray.create(
+              Buffer.concat([
+                Buffer.from(this.deviceGroupKey, 'utf8'),
+                Buffer.from(this.deviceKey, 'utf8'),
+                Buffer.from(challengeParameters.SECRET_BLOCK, 'base64'),
+                Buffer.from(dateNow, 'utf8'),
+              ])
+            );
+            const key = CryptoJS.lib.WordArray.create(hkdf);
+            const signatureString = CryptoJS.enc.Base64.stringify(CryptoJS.HmacSHA256(message, key));
 
             const challengeResponses = {};