Merge pull request #586 from stormpath/fix/crypto-deprecation

Fix/crypto deprecation
stormpath · Feb 4, 2017 · b9bbfc3 · b9bbfc3
2 parents deb7165 + 9ebf4dd
commit b9bbfc3
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/lib/resource/ApiKey.js b/lib/resource/ApiKey.js
@@ -47,7 +47,9 @@ ApiKey.prototype._getDecryptedSecret = function _getDecryptedSecret(callback) {
   var encryptedSecret = new Buffer(this.secret,'base64');
   var iv = encryptedSecret.slice(0,16);
   var rawEncryptedValue = encryptedSecret.slice(16);
-  crypto.pbkdf2(password,new Buffer(salt,'base64'),iterations,(keyLengthBits/8),function(err,key){
+  var saltBuf = new Buffer(salt,'base64');
+  var keyLength = keyLengthBits / 8;
+  var cryptoCallback = function(err, key){
     if(err){
       return callback(err);
     }
@@ -61,7 +63,14 @@ ApiKey.prototype._getDecryptedSecret = function _getDecryptedSecret(callback) {
       return callback(e);
     }
     callback(null,decrypted);
-  });
+  };
+
+  try {
+    crypto.pbkdf2(password,saltBuf,iterations,keyLength,'sha1',cryptoCallback);
+  } catch (e) {
+    // Node 0.10.0 support - It does not take the digest parameter, and throws
+    crypto.pbkdf2(password,saltBuf,iterations,keyLength,cryptoCallback);
+  }
 };
 
 ApiKey.prototype._setApiKeyMetaData = function _setApiKeyMetaData(obj){