diff options
author | Matthew Miller <matthew@millerti.me> | 2022-11-11 15:46:06 -0800 |
---|---|---|
committer | Matthew Miller <matthew@millerti.me> | 2022-11-11 15:46:06 -0800 |
commit | 0c0c09687b3308dd1c680bb18f37393a6f6d616c (patch) | |
tree | fd26d8c9428b41427352b5bdb95c1b8d430cec63 /packages/server/src/helpers | |
parent | 248bd4c205d873bcf31d6374034d8d04f94496e5 (diff) |
Replace some more references to Buffer
Diffstat (limited to 'packages/server/src/helpers')
-rw-r--r-- | packages/server/src/helpers/__mocks__/generateChallenge.ts | 4 | ||||
-rw-r--r-- | packages/server/src/helpers/getCertificateInfo.ts | 2 | ||||
-rw-r--r-- | packages/server/src/helpers/isCertRevoked.ts | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/packages/server/src/helpers/__mocks__/generateChallenge.ts b/packages/server/src/helpers/__mocks__/generateChallenge.ts index a339e56..d9d866e 100644 --- a/packages/server/src/helpers/__mocks__/generateChallenge.ts +++ b/packages/server/src/helpers/__mocks__/generateChallenge.ts @@ -1,3 +1,3 @@ -export function generateChallenge(): Buffer { - return Buffer.from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]); +export function generateChallenge(): Uint8Array { + return Uint8Array.from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]); } diff --git a/packages/server/src/helpers/getCertificateInfo.ts b/packages/server/src/helpers/getCertificateInfo.ts index 02183c5..e503f70 100644 --- a/packages/server/src/helpers/getCertificateInfo.ts +++ b/packages/server/src/helpers/getCertificateInfo.ts @@ -36,7 +36,7 @@ const issuerSubjectIDKey: { [key: string]: 'C' | 'O' | 'OU' | 'CN' } = { * * @param pemCertificate Result from call to `convertASN1toPEM(x5c[0])` */ -export function getCertificateInfo(leafCertBuffer: Buffer): CertificateInfo { +export function getCertificateInfo(leafCertBuffer: Uint8Array): CertificateInfo { const asnx509 = AsnParser.parse(leafCertBuffer, Certificate); const parsedCert = asnx509.tbsCertificate; diff --git a/packages/server/src/helpers/isCertRevoked.ts b/packages/server/src/helpers/isCertRevoked.ts index cc8c3f1..4ea3dda 100644 --- a/packages/server/src/helpers/isCertRevoked.ts +++ b/packages/server/src/helpers/isCertRevoked.ts @@ -4,6 +4,7 @@ import { AsnParser } from '@peculiar/asn1-schema'; import { CertificateList } from '@peculiar/asn1-x509'; import { convertCertBufferToPEM } from './convertCertBufferToPEM'; +import * as uint8Array from './uint8Array'; /** * A cache of revoked cert serial numbers by Authority Key ID @@ -68,7 +69,7 @@ export async function isCertRevoked(cert: X509): Promise<boolean> { return false; } - const data = AsnParser.parse(Buffer.from(crlCert.hex, 'hex'), CertificateList); + const data = AsnParser.parse(uint8Array.fromHex(crlCert.hex), CertificateList); const newCached: CAAuthorityInfo = { revokedCerts: [], @@ -85,7 +86,7 @@ export async function isCertRevoked(cert: X509): Promise<boolean> { if (revokedCerts) { for (const cert of revokedCerts) { - const revokedHex = Buffer.from(cert.userCertificate).toString('hex'); + const revokedHex = uint8Array.toHex(new Uint8Array(cert.userCertificate)); newCached.revokedCerts.push(revokedHex); } |