Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 96 additions & 96 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@
"vitest": "^4.0.9"
},
"dependencies": {
"@peculiar/asn1-cms": "^2.6.0",
"@peculiar/asn1-csr": "^2.6.0",
"@peculiar/asn1-ecc": "^2.6.0",
"@peculiar/asn1-pkcs9": "^2.6.0",
"@peculiar/asn1-rsa": "^2.6.0",
"@peculiar/asn1-schema": "^2.6.0",
"@peculiar/asn1-x509": "^2.6.0",
"@peculiar/asn1-x509-post-quantum": "^2.7.0",
"@peculiar/asn1-cms": "^2.8.0",
"@peculiar/asn1-csr": "^2.8.0",
"@peculiar/asn1-ecc": "^2.8.0",
"@peculiar/asn1-pkcs9": "^2.8.0",
"@peculiar/asn1-rsa": "^2.8.0",
"@peculiar/asn1-schema": "^2.8.0",
"@peculiar/asn1-x509": "^2.8.0",
"@peculiar/asn1-x509-post-quantum": "^2.8.0",
"pvtsutils": "^1.3.6",
"tslib": "^2.8.1",
"tsyringe": "^4.10.0"
Expand Down
28 changes: 22 additions & 6 deletions src/asn_data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
import {
TextConverter, TextObject, TextObjectConvertible,
} from "./text_converter";
import { ParseOptions } from "./types";

export type AsnDataStringFormat = "asn" | "text" | "hex" | "base64" | "base64url";

Expand All @@ -16,6 +17,18 @@ export abstract class AsnData<T> implements TextObjectConvertible {

#rawData!: ArrayBuffer;

/**
* ASN.1 parse options
*/
#options?: ParseOptions;

/**
* Gets the ASN.1 parse options the instance was created with
*/
protected get parseOptions(): ParseOptions | undefined {
return this.#options;
}

/**
* Gets a DER encoded buffer
*/
Expand All @@ -37,20 +50,23 @@ export abstract class AsnData<T> implements TextObjectConvertible {
* @param raw DER encoded buffer
* @param type ASN.1 convertible class for `@peculiar/asn1-schema` schema
*/
public constructor(raw: BufferSource, type: new() => T);
public constructor(raw: BufferSource, type: new() => T, options?: ParseOptions);
/**
* ASN.1 object
* @param asn
* @param options ASN.1 parse options used for nested ASN.1 payloads
*/
public constructor(asn: T);
public constructor(asn: T, options?: ParseOptions);
public constructor(...args: any[]) {
if (BufferSourceConverter.isBufferSource(args[0])) {
// raw, type
this.asn = AsnConvert.parse<T>(args[0], args[1]);
// raw, type, options?
this.#options = args[2];
this.asn = AsnConvert.parse<T>(args[0], args[1], args[2]);
this.#rawData = BufferSourceConverter.toArrayBuffer(args[0]);
this.onInit(this.asn);
} else {
// asn
// asn, options?
this.#options = args[1];
this.asn = args[0];
this.onInit(this.asn);
}
Expand All @@ -77,7 +93,7 @@ export abstract class AsnData<T> implements TextObjectConvertible {
public toString(format: AsnDataStringFormat = "text"): string {
switch (format) {
case "asn":
return AsnConvert.toString(this.rawData);
return AsnConvert.toString(this.rawData, this.#options);
case "text":
return TextConverter.serialize(this.toTextObject());
case "hex":
Expand Down
Loading