diff options
Diffstat (limited to 'packages/server/src')
4 files changed, 8 insertions, 8 deletions
diff --git a/packages/server/src/helpers/convertPublicKeyToPEM.ts b/packages/server/src/helpers/convertPublicKeyToPEM.ts index 1775801..0ba7d73 100644 --- a/packages/server/src/helpers/convertPublicKeyToPEM.ts +++ b/packages/server/src/helpers/convertPublicKeyToPEM.ts @@ -1,12 +1,12 @@ -import cbor from 'cbor'; import jwkToPem from 'jwk-to-pem'; import { COSEKEYS, COSEKTY, COSECRV } from './convertCOSEtoPKCS'; +import { decodeCborFirst } from './decodeCbor'; export function convertPublicKeyToPEM(publicKey: Uint8Array): string { let struct; try { - struct = cbor.decodeAllSync(publicKey)[0]; + struct = decodeCborFirst(publicKey); } catch (err) { const _err = err as Error; throw new Error(`Error decoding public key while converting to PEM: ${_err.message}`); diff --git a/packages/server/src/helpers/decodeAttestationObject.ts b/packages/server/src/helpers/decodeAttestationObject.ts index 5385106..bab6ced 100644 --- a/packages/server/src/helpers/decodeAttestationObject.ts +++ b/packages/server/src/helpers/decodeAttestationObject.ts @@ -1,4 +1,4 @@ -import cbor from 'cbor'; +import { decodeCborFirst } from './decodeCbor'; /** * Convert an AttestationObject buffer to a proper object @@ -6,7 +6,7 @@ import cbor from 'cbor'; * @param base64AttestationObject Attestation Object buffer */ export function decodeAttestationObject(attestationObject: Buffer): AttestationObject { - const toCBOR: AttestationObject = cbor.decodeAllSync(attestationObject)[0]; + const toCBOR: AttestationObject = decodeCborFirst(attestationObject); return toCBOR; } diff --git a/packages/server/src/helpers/decodeAuthenticatorExtensions.ts b/packages/server/src/helpers/decodeAuthenticatorExtensions.ts index 738fa37..b34fdc3 100644 --- a/packages/server/src/helpers/decodeAuthenticatorExtensions.ts +++ b/packages/server/src/helpers/decodeAuthenticatorExtensions.ts @@ -1,4 +1,4 @@ -import cbor from 'cbor'; +import { decodeCborFirst } from './decodeCbor'; /** * Convert authenticator extension data buffer to a proper object @@ -10,7 +10,7 @@ export function decodeAuthenticatorExtensions( ): AuthenticationExtensionsAuthenticatorOutputs | undefined { let toCBOR: AuthenticationExtensionsAuthenticatorOutputs | undefined; try { - toCBOR = cbor.decodeAllSync(extensionData)[0]; + toCBOR = decodeCborFirst(extensionData); } catch (err) { const _err = err as Error; throw new Error(`Error decoding authenticator extensions: ${_err.message}`); diff --git a/packages/server/src/helpers/verifySignature.ts b/packages/server/src/helpers/verifySignature.ts index 627a711..3401cf6 100644 --- a/packages/server/src/helpers/verifySignature.ts +++ b/packages/server/src/helpers/verifySignature.ts @@ -1,10 +1,10 @@ import crypto from 'crypto'; -import cbor from 'cbor'; import { verify as ed25519Verify } from '@noble/ed25519'; import { COSEKEYS, COSEKTY } from './convertCOSEtoPKCS'; import { convertCertBufferToPEM } from './convertCertBufferToPEM'; import { convertPublicKeyToPEM } from './convertPublicKeyToPEM'; +import { decodeCborFirst } from './decodeCbor'; type VerifySignatureOptsLeafCert = { signature: Uint8Array; @@ -51,7 +51,7 @@ export async function verifySignature( // Decode CBOR to COSE let struct; try { - struct = cbor.decodeAllSync(credentialPublicKey)[0]; + struct = decodeCborFirst(credentialPublicKey); } catch (err) { const _err = err as Error; throw new Error(`Error decoding public key while converting to PEM: ${_err.message}`); |