summaryrefslogtreecommitdiffhomepage
path: root/packages/server/src
diff options
context:
space:
mode:
authorMatthew Miller <matthew@millerti.me>2020-07-12 12:19:03 -0700
committerMatthew Miller <matthew@millerti.me>2020-07-12 12:19:03 -0700
commite69546885d0f829f2da09fc250adf8cb69d45a18 (patch)
treebef3a6c02a713c354e93fbb50b8c7c37ba5ca539 /packages/server/src
parent7df5c6750ab0b20cb35a8d3b20cfc6d48af7c4d6 (diff)
Remove parseCertificateASN1 helper
Diffstat (limited to 'packages/server/src')
-rw-r--r--packages/server/src/attestation/verifications/verifyAndroidKey.ts4
-rw-r--r--packages/server/src/helpers/parseCertificateBuffer.ts9
2 files changed, 2 insertions, 11 deletions
diff --git a/packages/server/src/attestation/verifications/verifyAndroidKey.ts b/packages/server/src/attestation/verifications/verifyAndroidKey.ts
index 849b269..989c210 100644
--- a/packages/server/src/attestation/verifications/verifyAndroidKey.ts
+++ b/packages/server/src/attestation/verifications/verifyAndroidKey.ts
@@ -1,11 +1,11 @@
import { AsnParser } from '@peculiar/asn1-schema';
+import { Certificate } from '@peculiar/asn1-x509';
import { KeyDescription, id_ce_keyDescription } from '@peculiar/asn1-android';
import type { AttestationStatement } from '../../helpers/decodeAttestationObject';
import convertASN1toPEM from '../../helpers/convertASN1toPEM';
import verifySignature from '../../helpers/verifySignature';
import convertCOSEtoPKCS, { COSEALGHASH } from '../../helpers/convertCOSEtoPKCS';
-import parseCertificateASN1 from '../../helpers/parseCertificateBuffer';
import MetadataService from '../../metadata/metadataService';
import verifyAttestationWithMetadata from '../../metadata/verifyAttestationWithMetadata';
@@ -35,7 +35,7 @@ export default async function verifyAttestationAndroidKey(options: Options): Pro
// Check that credentialPublicKey matches the public key in the attestation certificate
// Find the public cert in the certificate as PKCS
- const parsedCert = parseCertificateASN1(x5c[0]);
+ const parsedCert = AsnParser.parse(x5c[0], Certificate);
const parsedCertPubKey = Buffer.from(
parsedCert.tbsCertificate.subjectPublicKeyInfo.subjectPublicKey,
);
diff --git a/packages/server/src/helpers/parseCertificateBuffer.ts b/packages/server/src/helpers/parseCertificateBuffer.ts
deleted file mode 100644
index 3cda630..0000000
--- a/packages/server/src/helpers/parseCertificateBuffer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { AsnParser } from '@peculiar/asn1-schema';
-import { Certificate } from '@peculiar/asn1-x509';
-
-/**
- * Parse a certificate buffer ASN.1 data structure into something more friendly
- */
-export default function parseCertificateASN1(certificate: Buffer): Certificate {
- return AsnParser.parse(certificate, Certificate);
-}