diff options
Diffstat (limited to 'packages/server/src')
7 files changed, 19 insertions, 19 deletions
diff --git a/packages/server/src/helpers/validateCertificatePath.ts b/packages/server/src/helpers/validateCertificatePath.ts index c05087c..69b8aa9 100644 --- a/packages/server/src/helpers/validateCertificatePath.ts +++ b/packages/server/src/helpers/validateCertificatePath.ts @@ -125,8 +125,8 @@ async function _validatePath(certificates: string[]): Promise<boolean> { const verified = await verifySignature({ data: new Uint8Array(data), signature: new Uint8Array(signature), - leafCertificate: issuerCertBytes, - attestationHashAlgorithm: signatureAlgorithm, + x509Certificate: issuerCertBytes, + hashAlgorithm: signatureAlgorithm, }); if (!verified) { diff --git a/packages/server/src/helpers/verifySignature.ts b/packages/server/src/helpers/verifySignature.ts index ff4e73b..00ada70 100644 --- a/packages/server/src/helpers/verifySignature.ts +++ b/packages/server/src/helpers/verifySignature.ts @@ -10,16 +10,16 @@ export async function verifySignature(opts: { signature: Uint8Array; data: Uint8Array; credentialPublicKey?: Uint8Array; - leafCertificate?: Uint8Array; - attestationHashAlgorithm?: COSEALG; + x509Certificate?: Uint8Array; + hashAlgorithm?: COSEALG; }): Promise<boolean> { - const { signature, data, credentialPublicKey, leafCertificate, attestationHashAlgorithm } = opts; + const { signature, data, credentialPublicKey, x509Certificate, hashAlgorithm } = opts; - if (!leafCertificate && !credentialPublicKey) { + if (!x509Certificate && !credentialPublicKey) { throw new Error('Must declare either "leafCert" or "credentialPublicKey"'); } - if (leafCertificate && credentialPublicKey) { + if (x509Certificate && credentialPublicKey) { throw new Error('Must not declare both "leafCert" and "credentialPublicKey"'); } @@ -27,14 +27,14 @@ export async function verifySignature(opts: { if (credentialPublicKey) { cosePublicKey = decodeCredentialPublicKey(credentialPublicKey); - } else if (leafCertificate) { - cosePublicKey = convertX509PublicKeyToCOSE(leafCertificate); + } else if (x509Certificate) { + cosePublicKey = convertX509PublicKeyToCOSE(x509Certificate); } return isoCrypto.verify({ cosePublicKey, signature, data, - shaHashOverride: attestationHashAlgorithm, + shaHashOverride: hashAlgorithm, }); } diff --git a/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts b/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts index c665be3..5d9b136 100644 --- a/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts +++ b/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts @@ -316,8 +316,8 @@ export async function verifyAttestationTPM( return verifySignature({ signature: sig, data: certInfo, - leafCertificate: x5c[0], - attestationHashAlgorithm: alg, + x509Certificate: x5c[0], + hashAlgorithm: alg, }); } diff --git a/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts b/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts index 1f3eb83..0128c09 100644 --- a/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts +++ b/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts @@ -111,7 +111,7 @@ export async function verifyAttestationAndroidKey( return verifySignature({ signature: sig, data: signatureBase, - leafCertificate: x5c[0], - attestationHashAlgorithm: alg, + x509Certificate: x5c[0], + hashAlgorithm: alg, }); } diff --git a/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts b/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts index d47dd70..40fcca2 100644 --- a/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts +++ b/packages/server/src/registration/verifications/verifyAttestationAndroidSafetyNet.ts @@ -129,7 +129,7 @@ export async function verifyAttestationAndroidSafetyNet( const verified = await verifySignature({ signature: signatureBuffer, data: signatureBaseBuffer, - leafCertificate: leafCertBuffer, + x509Certificate: leafCertBuffer, }); /** * END Verify Signature diff --git a/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts b/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts index e271e48..2674502 100644 --- a/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts +++ b/packages/server/src/registration/verifications/verifyAttestationFIDOU2F.ts @@ -62,7 +62,7 @@ export async function verifyAttestationFIDOU2F( return verifySignature({ signature: sig, data: signatureBase, - leafCertificate: x5c[0], - attestationHashAlgorithm: COSEALG.ES256, + x509Certificate: x5c[0], + hashAlgorithm: COSEALG.ES256, }); } diff --git a/packages/server/src/registration/verifications/verifyAttestationPacked.ts b/packages/server/src/registration/verifications/verifyAttestationPacked.ts index a57bf13..2780764 100644 --- a/packages/server/src/registration/verifications/verifyAttestationPacked.ts +++ b/packages/server/src/registration/verifications/verifyAttestationPacked.ts @@ -115,14 +115,14 @@ export async function verifyAttestationPacked( verified = await verifySignature({ signature: sig, data: signatureBase, - leafCertificate: x5c[0], + x509Certificate: x5c[0], }); } else { verified = await verifySignature({ signature: sig, data: signatureBase, credentialPublicKey, - attestationHashAlgorithm: alg, + hashAlgorithm: alg, }); } |