diff options
Diffstat (limited to 'packages/server/src')
4 files changed, 22 insertions, 9 deletions
diff --git a/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts b/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts index c74a7fe..fd2375c 100644 --- a/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts +++ b/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts @@ -279,8 +279,12 @@ export async function verifyAttestationTPM(options: AttestationFormatVerifierOpt // Verify signature over certInfo with the public key extracted from AIK certificate. // In the wise words of Yuriy Ackermann: "Get Martini friend, you are done!" - const leafCertPEM = convertCertBufferToPEM(x5c[0]); - return verifySignature(sig, certInfo, leafCertPEM, hashAlg); + return verifySignature({ + signature: sig, + signatureBase: certInfo, + leafCert: x5c[0], + hashAlgorithm: hashAlg + }); } /** diff --git a/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts b/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts index 0930eb8..55a0612 100644 --- a/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts +++ b/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts @@ -99,8 +99,12 @@ export async function verifyAttestationAndroidKey( } const signatureBase = Buffer.concat([authData, clientDataHash]); - const leafCertPEM = convertCertBufferToPEM(x5c[0]); const hashAlg = COSEALGHASH[alg as number]; - return verifySignature(sig, signatureBase, leafCertPEM, hashAlg); + return verifySignature({ + signature: sig, + signatureBase, + leafCert: x5c[0], + hashAlgorithm: hashAlg + }); } diff --git a/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts b/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts index 4b8c31f..4c1e685 100644 --- a/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts +++ b/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts @@ -124,8 +124,11 @@ export async function verifyAttestationAndroidSafetyNet( const signatureBaseBuffer = Buffer.from(`${jwtParts[0]}.${jwtParts[1]}`); const signatureBuffer = base64url.toBuffer(SIGNATURE); - const leafCertPEM = convertCertBufferToPEM(leafCertBuffer); - const verified = verifySignature(signatureBuffer, signatureBaseBuffer, leafCertPEM); + const verified = await verifySignature({ + signature: signatureBuffer, + signatureBase: signatureBaseBuffer, + leafCert: leafCertBuffer, + }); /** * END Verify Signature */ diff --git a/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts b/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts index bd6ac8e..3c79b9e 100644 --- a/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts +++ b/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts @@ -56,7 +56,9 @@ export async function verifyAttestationFIDOU2F( throw new Error(`${_err.message} (FIDOU2F)`); } - const leafCertPEM = convertCertBufferToPEM(x5c[0]); - - return verifySignature(sig, signatureBase, leafCertPEM); + return verifySignature({ + signature: sig, + signatureBase, + leafCert: x5c[0], + }); } |