Remove dead code and clarify JWK byte serializer name

Drop three unused 'msrcryptoKdfInstance'/'msrcryptoConcatKdfInstance = null' assignments and several non-debug commented-out code snippets (jwk findUsage, rsa-base old modExp, hkdf-ctr label guard). Rename jwk keyToJwkOld to keyToJwkBytes to reflect that it returns a serialized JWK byte array (distinct from keyToJwk, which returns an object) rather than implying it is an outdated version.

Author: ljoy913

src/concat.js

@@ -53,8 +53,6 @@ var msrcryptoConcatKdf = (function () {
 
 }());
 
-var msrcryptoConcatKdfInstance = null;
-
 if (typeof operations !== "undefined") {
 
     msrcryptoConcatKdf.importKey = function (p) {

src/hkdf-ctr.js

@@ -57,10 +57,6 @@ var msrcryptoHkdfCtr = (function () {
             throw new Error("The length provided for HKDF-CTR is too large.");
         }
 
-        // if (labelBytes.length === 0) {
-        //     labelBytes = msrcryptoUtilities.getVector(hLen);
-        // }
-
         hmacContext = {
             workerid: 0,
             keyHandle: { algorithm: algorithm },

src/hkdf.js

@@ -87,8 +87,6 @@ var msrcryptoHkdf = (function() {
 
 }());
 
-var msrcryptoKdfInstance = null;
-
 if (typeof operations !== "undefined") {
 
     msrcryptoHkdf.importKey = function(p) {

src/jwk.js

@@ -104,7 +104,6 @@ var msrcryptoJwk = (function() {
             key.alg = algorithmMap[keyHandle.algorithm.name.toUpperCase()]( keyHandle.algorithm );
         }
         key.key_ops = keyHandle.usages;
-        //key.key_ops = (keyHandle.type !== "secret") ? getPublicPrivateUsage(key, keyData) : keyHandle.usages;
 
         // Using .pop to determine if a property value is an array.
         if (keyData.pop) {
@@ -125,14 +124,7 @@ var msrcryptoJwk = (function() {
         return key;
     }
 
-    // function findUsage(usage, usages) {
-    //     for (var i = 0; i < usages.length; i++) {
-    //         if (usage.toUpperCase() === usages[i].toUpperCase()) { return true; }
-    //     }
-    //     return false;
-    // }
-
-    function keyToJwkOld(keyHandle, keyData) {
+    function keyToJwkBytes(keyHandle, keyData) {
 
         var key = {};
 
@@ -178,7 +170,7 @@ var msrcryptoJwk = (function() {
     }
 
     return {
-        keyToJwkOld: keyToJwkOld,
+        keyToJwkBytes: keyToJwkBytes,
         keyToJwk: keyToJwk,
         jwkToKey: jwkToKey
     };

src/pbkdf2.js

@@ -97,8 +97,6 @@ var msrcryptoPbkdf2 = (function() {
 
 }());
 
-var msrcryptoKdfInstance = null;
-
 if (typeof operations !== "undefined") {
 
     msrcryptoPbkdf2.importKey = function(p) {

src/rsa-base.js

@@ -41,12 +41,6 @@ var msrcryptoRsaBase = function(keyStruct) {
         var base = group.createElementFromBytes(dataBytes);
         var result = group.modexp(base, exponent);
 
-        // var modulus = cryptoMath.bytesToDigits(modulusBytes);
-        // var exponent = cryptoMath.bytesToDigits(expBytes);
-        // var base = cryptoMath.bytesToDigits(dataBytes);
-
-        // var result = cryptoMath.modExp(base, exponent, modulus);
-
         return result.m_digits;
     }
 

src/wrapKey.js

@@ -28,7 +28,7 @@ var msrcryptoWrapKey = (function() {
 
         var tagLength = 128;
 
-        var keyToWrapJwk = msrcryptoJwk.keyToJwkOld(params.keyHandle, params.keyData);
+        var keyToWrapJwk = msrcryptoJwk.keyToJwkBytes(params.keyHandle, params.keyData);
 
         var jweHeader = {
             "alg": params.keyHandle1.algorithm.name.toUpperCase(),