summaryrefslogtreecommitdiffhomepage
path: root/packages/server/src
diff options
context:
space:
mode:
authorMatthew Miller <matthew@millerti.me>2023-08-16 16:17:24 -0700
committerMatthew Miller <matthew@millerti.me>2023-08-16 16:17:24 -0700
commit52f509275e0c5445822346b6795d51e86b7980dc (patch)
treee336a5a87abf0200ec4d01b6a913c27ea3db263b /packages/server/src
parentc52e58d71787cd9844415a4c9e17f8d70ac530e8 (diff)
Move @peculiar libs to deps.ts
Diffstat (limited to 'packages/server/src')
-rw-r--r--packages/server/src/deps.ts29
-rw-r--r--packages/server/src/helpers/convertX509PublicKeyToCOSE.ts14
-rw-r--r--packages/server/src/helpers/getCertificateInfo.ts3
-rw-r--r--packages/server/src/helpers/isCertRevoked.ts7
-rw-r--r--packages/server/src/helpers/iso/isoCrypto/unwrapEC2Signature.ts4
-rw-r--r--packages/server/src/helpers/validateCertificatePath.ts3
-rw-r--r--packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts6
-rw-r--r--packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts6
-rw-r--r--packages/server/src/registration/verifications/verifyAttestationApple.ts5
9 files changed, 48 insertions, 29 deletions
diff --git a/packages/server/src/deps.ts b/packages/server/src/deps.ts
index 3d32709..773452b 100644
--- a/packages/server/src/deps.ts
+++ b/packages/server/src/deps.ts
@@ -27,3 +27,32 @@ export { default as fetch } from 'npm:cross-fetch';
// NPM: debug
export { default as debug, Debugger } from 'npm:debug';
+
+// NPM: @peculiar libraries
+export { AsnParser, AsnSerializer } from 'npm:@peculiar/asn1-schema@^2.3.3';
+export {
+ AuthorityKeyIdentifier,
+ BasicConstraints,
+ Certificate,
+ CertificateList,
+ CRLDistributionPoints,
+ ExtendedKeyUsage,
+ id_ce_authorityKeyIdentifier,
+ id_ce_basicConstraints,
+ id_ce_cRLDistributionPoints,
+ id_ce_extKeyUsage,
+ id_ce_subjectAltName,
+ id_ce_subjectKeyIdentifier,
+ Name,
+ SubjectAlternativeName,
+ SubjectKeyIdentifier,
+} from 'npm:@peculiar/asn1-x509@^2.3.4';
+export {
+ ECDSASigValue,
+ ECParameters,
+ id_ecPublicKey,
+ id_secp256r1,
+ id_secp384r1,
+} from 'npm:@peculiar/asn1-ecc@^2.3.4';
+export { RSAPublicKey } from 'npm:@peculiar/asn1-rsa@^2.3.4';
+export { KeyDescription, id_ce_keyDescription } from 'npm:@peculiar/asn1-android@^2.3.3';
diff --git a/packages/server/src/helpers/convertX509PublicKeyToCOSE.ts b/packages/server/src/helpers/convertX509PublicKeyToCOSE.ts
index 8f38206..b003c67 100644
--- a/packages/server/src/helpers/convertX509PublicKeyToCOSE.ts
+++ b/packages/server/src/helpers/convertX509PublicKeyToCOSE.ts
@@ -1,8 +1,12 @@
-import { AsnParser } from '@peculiar/asn1-schema';
-import { Certificate } from '@peculiar/asn1-x509';
-import { ECParameters, id_ecPublicKey, id_secp256r1, id_secp384r1 } from '@peculiar/asn1-ecc';
-import { RSAPublicKey } from '@peculiar/asn1-rsa';
-
+import {
+ AsnParser,
+ Certificate,
+ ECParameters,
+ RSAPublicKey,
+ id_ecPublicKey,
+ id_secp256r1,
+ id_secp384r1,
+} from '../deps.ts';
import {
COSEPublicKey,
COSEKTY,
diff --git a/packages/server/src/helpers/getCertificateInfo.ts b/packages/server/src/helpers/getCertificateInfo.ts
index 7ec6eba..27ff6c9 100644
--- a/packages/server/src/helpers/getCertificateInfo.ts
+++ b/packages/server/src/helpers/getCertificateInfo.ts
@@ -1,5 +1,4 @@
-import { AsnParser } from '@peculiar/asn1-schema';
-import { Certificate, BasicConstraints, id_ce_basicConstraints } from '@peculiar/asn1-x509';
+import { AsnParser, Certificate, BasicConstraints, id_ce_basicConstraints } from '../deps.ts';
export type CertificateInfo = {
issuer: Issuer;
diff --git a/packages/server/src/helpers/isCertRevoked.ts b/packages/server/src/helpers/isCertRevoked.ts
index 8b53e83..2021f37 100644
--- a/packages/server/src/helpers/isCertRevoked.ts
+++ b/packages/server/src/helpers/isCertRevoked.ts
@@ -1,6 +1,6 @@
-import { fetch } from '../deps.ts';
-import { AsnParser } from '@peculiar/asn1-schema';
import {
+ fetch,
+ AsnParser,
CertificateList,
Certificate,
AuthorityKeyIdentifier,
@@ -9,8 +9,7 @@ import {
id_ce_subjectKeyIdentifier,
id_ce_cRLDistributionPoints,
CRLDistributionPoints,
-} from '@peculiar/asn1-x509';
-
+} from '../deps.ts';
import { isoUint8Array } from './iso/index.ts';
/**
diff --git a/packages/server/src/helpers/iso/isoCrypto/unwrapEC2Signature.ts b/packages/server/src/helpers/iso/isoCrypto/unwrapEC2Signature.ts
index d3acc15..7b7eeec 100644
--- a/packages/server/src/helpers/iso/isoCrypto/unwrapEC2Signature.ts
+++ b/packages/server/src/helpers/iso/isoCrypto/unwrapEC2Signature.ts
@@ -1,6 +1,4 @@
-import { ECDSASigValue } from '@peculiar/asn1-ecc';
-import { AsnParser } from '@peculiar/asn1-schema';
-
+import { ECDSASigValue, AsnParser } from '../../../deps.ts';
import { isoUint8Array } from '../index.ts';
/**
diff --git a/packages/server/src/helpers/validateCertificatePath.ts b/packages/server/src/helpers/validateCertificatePath.ts
index ec14c78..a5c22c5 100644
--- a/packages/server/src/helpers/validateCertificatePath.ts
+++ b/packages/server/src/helpers/validateCertificatePath.ts
@@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
-import { AsnSerializer } from '@peculiar/asn1-schema';
-
+import { AsnSerializer } from '../deps.ts';
import { isCertRevoked } from './isCertRevoked.ts';
import { verifySignature } from './verifySignature.ts';
import { mapX509SignatureAlgToCOSEAlg } from './mapX509SignatureAlgToCOSEAlg.ts';
diff --git a/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts b/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts
index ae277fe..ddb2e81 100644
--- a/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts
+++ b/packages/server/src/registration/verifications/tpm/verifyAttestationTPM.ts
@@ -1,15 +1,13 @@
-import { AsnParser } from '@peculiar/asn1-schema';
import {
+ AsnParser,
Certificate,
id_ce_subjectAltName,
SubjectAlternativeName,
id_ce_extKeyUsage,
ExtendedKeyUsage,
Name,
-} from '@peculiar/asn1-x509';
-
+} from '../../../deps.ts';
import type { AttestationFormatVerifierOpts } from '../../verifyRegistrationResponse.ts';
-
import { decodeCredentialPublicKey } from '../../../helpers/decodeCredentialPublicKey.ts';
import {
COSEKEYS,
diff --git a/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts b/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts
index 3271f58..7ad5b39 100644
--- a/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts
+++ b/packages/server/src/registration/verifications/verifyAttestationAndroidKey.ts
@@ -1,9 +1,5 @@
-import { AsnParser } from '@peculiar/asn1-schema';
-import { Certificate } from '@peculiar/asn1-x509';
-import { KeyDescription, id_ce_keyDescription } from '@peculiar/asn1-android';
-
+import { AsnParser, Certificate, KeyDescription, id_ce_keyDescription } from '../../deps.ts';
import type { AttestationFormatVerifierOpts } from '../verifyRegistrationResponse.ts';
-
import { convertCertBufferToPEM } from '../../helpers/convertCertBufferToPEM.ts';
import { validateCertificatePath } from '../../helpers/validateCertificatePath.ts';
import { verifySignature } from '../../helpers/verifySignature.ts';
diff --git a/packages/server/src/registration/verifications/verifyAttestationApple.ts b/packages/server/src/registration/verifications/verifyAttestationApple.ts
index bcfe9c8..5652cdd 100644
--- a/packages/server/src/registration/verifications/verifyAttestationApple.ts
+++ b/packages/server/src/registration/verifications/verifyAttestationApple.ts
@@ -1,8 +1,5 @@
-import { AsnParser } from '@peculiar/asn1-schema';
-import { Certificate } from '@peculiar/asn1-x509';
-
+import { AsnParser, Certificate } from '../../deps.ts';
import type { AttestationFormatVerifierOpts } from '../verifyRegistrationResponse.ts';
-
import { validateCertificatePath } from '../../helpers/validateCertificatePath.ts';
import { convertCertBufferToPEM } from '../../helpers/convertCertBufferToPEM.ts';
import { toHash } from '../../helpers/toHash.ts';