If publicKeyFingerprintType not defined defaults to pulling the publicKeyFingerprint out as a publicKey

Author: rossphelan

README.md

@@ -290,7 +290,6 @@ const config = {
   ],
   mode: "JWE",
   encryptedValueFieldName: "encryptedData",
-  publicKeyFingerprintType: "publicKey",
   encryptionCertificate: "./path/to/public.cert",
   privateKey: "./path/to/your/private.key",
 };
@@ -394,7 +393,6 @@ const config = {
   ],
   mode: "JWE",
   encryptedValueFieldName: "encryptedData",
-  publicKeyFingerprintType: "publicKey",
   encryptionCertificate: "./path/to/public.cert",
   privateKey: "./path/to/your/private.key",
 };
@@ -443,7 +441,6 @@ const config = {
   ],
   mode: "JWE",
   encryptedValueFieldName: "encryptedData",
-  publicKeyFingerprintType: "publicKey",
   encryptionCertificate: "./path/to/public.cert",
   privateKey: "./path/to/your/private.key",
 };

lib/mcapi/crypto/jwe-crypto.js

@@ -202,11 +202,17 @@ function getPrivateKey(config) {
  */
 function computePublicFingerprint(config, encryptionCertificate) {
   if (config && encryptionCertificate) {
-    return utils.computePublicFingerprint(
-      config,
-      forge.pki.certificateFromPem(encryptionCertificate),
-      config.dataEncoding
-    );
+    if(config.publicKeyFingerprintType) {
+      return utils.computePublicFingerprint(
+        config,
+        forge.pki.certificateFromPem(encryptionCertificate),
+        config.dataEncoding
+      );
+    } else {
+      return utils.publicKeyFingerprint(
+        forge.pki.certificateFromPem(encryptionCertificate)
+      );
+    }
   } else {
     return null;
   }
@@ -235,7 +241,7 @@ function validateFingerprint(config, contains) {
   const propertiesOptionalDataEncoding = ["dataEncoding"];
   const propertiesOptionalFingerprint = ["publicKeyFingerprint"];
   if (
-    !contains(propertiesOptionalFingerprint) &&
+    contains(propertiesFingerprint) &&
     config[propertiesFingerprint[0]] !== "certificate" &&
     config[propertiesFingerprint[0]] !== "publicKey"
   ) {

lib/mcapi/utils/utils.js

@@ -273,7 +273,7 @@ module.exports.computePublicFingerprint = function (
         );
         break;
       case "publicKey":
-        fingerprint = publicKeyFingerprint(encryptionCertificate);
+        fingerprint = this.publicKeyFingerprint(encryptionCertificate);
         break;
     }
   }
@@ -289,13 +289,13 @@ function publicCertificateFingerprint(publicCertificate, encoding) {
   return bytesToString(md.digest().getBytes(), encoding);
 }
 
-function publicKeyFingerprint(publicCertificate) {
+module.exports.publicKeyFingerprint = function(publicCertificate) {
   return forge.pki.getPublicKeyFingerprint(publicCertificate.publicKey, {
     type: "SubjectPublicKeyInfo",
     md: createMessageDigest("SHA-256"),
     encoding: c.HEX,
   });
-}
+};
 
 function createMessageDigest(digest) {
   switch (digest.toUpperCase()) {

test/jwe-crypto.test.js

@@ -87,15 +87,6 @@ describe("JWE Crypto", () => {
       });
     });
 
-    it("without publicKeyFingerprintType", () => {
-      const config = JSON.parse(JSON.stringify(testConfig));
-      delete config["publicKeyFingerprintType"];
-      assert.throws(
-        () => new Crypto(config),
-        /Config not valid: publicKeyFingerprintType should be: 'certificate' or 'publicKey'/
-      );
-    });
-
     it("without publicKeyFingerprintType, but providing the publicKeyFingerprint", () => {
       const config = JSON.parse(JSON.stringify(testConfig));
       delete config["publicKeyFingerprintType"];
@@ -267,5 +258,18 @@ describe("JWE Crypto", () => {
         })
       );
     });
+
+    it("compute public fingerprint: defaults to publicKey with publicKeyFingerprintType set", () => {
+      const strippedConfig = JSON.parse(JSON.stringify(testConfig));
+      delete strippedConfig["publicKeyFingerprintType"];
+      delete strippedConfig["dataEncoding"];
+
+      assert.ok(
+        "80810fc13a8319fcf0e2ec322c82a4c304b782cc3ce671176343cfe8160c2279",
+        computePublicFingerprint.call(crypto, {
+          strippedConfig
+        })
+      );
+    });
   });
 });