Merge 7c68455 into 7706025

PeculiarVentures · Jun 24, 2022 · bff9d2b · bff9d2b
2 parents 7706025 + 7c68455
commit bff9d2b
Show file tree

Hide file tree

Showing 32 changed files with 1,362 additions and 1,371 deletions.
diff --git a/package.json b/package.json
@@ -6,13 +6,13 @@
   ],
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@types/node": "^17.0.33",
-    "lerna": "^4.0.0",
+    "@types/node": "^18.0.0",
+    "lerna": "^5.1.5",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
-    "ts-node": "^10.4.0",
+    "ts-node": "^10.8.1",
     "tsconfig-paths": "^4.0.0",
-    "typescript": "^4.6.4"
+    "typescript": "^4.7.4"
   },
   "scripts": {
     "test": "mocha",

diff --git a/packages/adobe-acrobat/package.json b/packages/adobe-acrobat/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/android/package.json b/packages/android/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/android/test/test.ts b/packages/android/test/test.ts
@@ -18,7 +18,7 @@ context("Android", () => {
       assert.strictEqual(kd.keymasterSecurityLevel, SecurityLevel.software);
       assert.strictEqual(kd.attestationChallenge.byteLength, 32);
       assert.strictEqual(kd.uniqueId.byteLength, 0);
-      assert.strictEqual(kd.softwareEnforced.creationDateTime, 1506793476000);
+      assert.strictEqual(kd.softwareEnforced.creationDateTime, "1506793476000");
       assert.strictEqual(kd.softwareEnforced.attestationApplicationId!.byteLength, 87);
       assert.strictEqual(kd.teeEnforced.purpose!.length, 1);
       assert.strictEqual(kd.teeEnforced.purpose![0], 2);

diff --git a/packages/cert-transparency/package.json b/packages/cert-transparency/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "pvtsutils": "^1.3.2",
     "tslib": "^2.4.0"
   }

diff --git a/packages/cms/package.json b/packages/cms/package.json
@@ -37,7 +37,7 @@
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
     "@peculiar/asn1-x509-attr": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/csr/package.json b/packages/csr/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/ecc/package.json b/packages/ecc/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/ess/package.json b/packages/ess/package.json
@@ -41,7 +41,7 @@
     "@peculiar/asn1-rsa": "^2.1.9",
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   },
   "bugs": {

diff --git a/packages/lei/package.json b/packages/lei/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/ntqwac/package.json b/packages/ntqwac/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   },
   "bugs": {

diff --git a/packages/ocsp/package.json b/packages/ocsp/package.json
@@ -38,7 +38,7 @@
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/pfx/package.json b/packages/pfx/package.json
@@ -38,7 +38,7 @@
     "@peculiar/asn1-pkcs8": "^2.1.9",
     "@peculiar/asn1-rsa": "^2.1.9",
     "@peculiar/asn1-schema": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/pkcs8/package.json b/packages/pkcs8/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/pkcs9/package.json b/packages/pkcs9/package.json
@@ -40,7 +40,7 @@
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
     "@peculiar/asn1-x509-attr": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   },
   "bugs": {

diff --git a/packages/rfc8226/package.json b/packages/rfc8226/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   },
   "bugs": {

diff --git a/packages/rsa/package.json b/packages/rsa/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@peculiar/asn1-schema": "^2.1.9",
     "@peculiar/asn1-x509": "^2.1.9",
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -38,7 +38,7 @@
     "rebuild": "npm run clear && npm run build"
   },
   "dependencies": {
-    "asn1js": "^3.0.4",
+    "asn1js": "^3.0.5",
     "pvtsutils": "^1.3.2",
     "tslib": "^2.4.0"
   },

diff --git a/packages/schema/src/converters.ts b/packages/schema/src/converters.ts
@@ -27,9 +27,9 @@ export const AsnAnyConverter: IAsnConverter<AnyConverterType> = {
 /**
  * ASN.1 INTEGER to Number/String converter
  */
-export const AsnIntegerConverter: IAsnConverter<IntegerConverterType> = {
-  fromASN: (value: any) => value.valueBlock.valueHex.byteLength >= 4
-    ? parseInt(value.valueBlock.toString())
+export const AsnIntegerConverter: IAsnConverter<IntegerConverterType, asn1.Integer> = {
+  fromASN: (value: asn1.Integer) => value.valueBlock.valueHexView.byteLength >= 4
+    ? value.valueBlock.toString() // use string format
     : value.valueBlock.valueDec, // use number format
   toASN: (value: IntegerConverterType) => new asn1.Integer({ value: value as any }),
 };
@@ -50,6 +50,14 @@ export const AsnIntegerArrayBufferConverter: IAsnConverter<ArrayBuffer> = {
   toASN: (value: ArrayBuffer) => new asn1.Integer({ valueHex: value } as any),
 };
 
+/**
+ * ASN.1 INTEGER to BigInt converter
+ */
+export const AsnIntegerBigIntConverter: IAsnConverter<bigint, asn1.Integer> = {
+  fromASN: (value: asn1.Integer) => value.toBigInt(),
+  toASN: (value: bigint) => asn1.Integer.fromBigInt(value),
+};
+
 /**
  * ASN.1 BIT STRING converter
  */

diff --git a/packages/schema/src/decorators.ts b/packages/schema/src/decorators.ts
@@ -4,16 +4,18 @@ import { IAsnSchema, IAsnSchemaItem } from "./schema";
 import { schemaStorage } from "./storage";
 import { IAsnConverter, IEmptyConstructor } from "./types";
 
-interface IAsn1TypeOptions {
+export type AsnItemType<T = any> = AsnPropTypes | IEmptyConstructor<T>;
+
+export interface IAsn1TypeOptions {
   type: AsnTypeTypes;
-  itemType?: AsnPropTypes | IEmptyConstructor<any>;
+  itemType?: AsnItemType;
 }
 export type AsnRepeatTypeString = "sequence" | "set";
 
 export type AsnRepeatType = AsnRepeatTypeString;
 
-interface IAsn1PropOptions {
-  type: AsnPropTypes | IEmptyConstructor<any>;
+export interface IAsn1PropOptions {
+  type: AsnItemType;
   optional?: boolean;
   defaultValue?: any;
   context?: number;
@@ -33,6 +35,20 @@ export const AsnType = (options: IAsn1TypeOptions) => (target: object) => {
   Object.assign(schema, options);
 };
 
+export const AsnChoiceType = () => AsnType({ type: AsnTypeTypes.Choice });
+
+export interface IAsn1SetOptions {
+  itemType: AsnItemType;
+}
+
+export const AsnSetType = (options: IAsn1SetOptions) => AsnType({ type: AsnTypeTypes.Set, ...options });
+
+export interface IAsn1SequenceOptions {
+  itemType?: AsnItemType;
+}
+
+export const AsnSequenceType = (options: IAsn1SequenceOptions) => AsnType({ type: AsnTypeTypes.Sequence, ...options });
+
 export const AsnProp = (options: IAsn1PropOptions) => (target: object, propertyKey: string) => {
   let schema: IAsnSchema;
   if (!schemaStorage.has(target.constructor)) {

diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
@@ -1,6 +1,6 @@
 export * from "./converters";
 export * from "./types/index";
-export { AsnProp, AsnType } from "./decorators";
+export { AsnProp, AsnType, AsnChoiceType, AsnSequenceType, AsnSetType } from "./decorators";
 export { AsnTypeTypes, AsnPropTypes } from "./enums";
 export { AsnParser } from "./parser";
 export { AsnSerializer } from "./serializer";