typepki-asn1gen 0.1.0 → 0.3.0

package/README.md

@@ -1,7 +1,7 @@
 typepki-asn1gen: ASN.1 data generator for TypePKI library
 =========================================================
 
-[TOP](https://kjur.github.io/typepki-asn1gen/) | [github](https://github.com/kjur/typepki-asn1gen) | [npm](https://www.npmjs.com/package/typepki-asn1gen) | [TypePKI](https://kjur.github.com/typepki/) 
+[TOP](https://kjur.github.io/typepki-asn1gen/) | [github](https://github.com/kjur/typepki-asn1gen) | [npm](https://www.npmjs.com/package/typepki-asn1gen) | [TypePKI](https://kjur.github.io/typepki/) 
 
 The 'TypePKI' library is an opensource free TypeScript PKI library which is the successor of the long lived [jsrsasign](https://kjur.github.io/jsrsasign) library.
 

package/dist/import/index.d.mts

@@ -19,6 +19,17 @@ export interface ASN1Data {
  * ]}) -> "3006020101020102"
  */
 export declare function getASN1(p: ASN1Data): string;
+/**
+ * get a hexadecimal string of ASN.1 tag by a tag name
+ * @param tagName - name of ASN.1 tag
+ * @return hexadecimal string of ASN.1 tag
+ * @example
+ * tagtohex("bool") -> "01"
+ * tagtohex("utf8str") -> "0c"
+ * tagtohex("a4") -> context specific constructed tag 4
+ * tagtohex("80") -> context specific tag 0
+ */
+export declare function tagtohex(tagName: string): string;
 /**
  * convert hexadecimal positive integer to ASN.1 integer value
  * @param h - hexadecimal string of positive integer
@@ -43,6 +54,7 @@ export declare function getLength(n: number): string;
  * zero padding for hexadecimal string
  * @param s - odd or even length hexadecimal string
  * @return even length zero padded hexadecimal string
+ * @deprecated use hexpad in typepki-strconv
  * @example
  * hexpad("1") -> "01"
  * hexpad("ab3c") -> "ab3c"

package/dist/import/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.mts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,WAAW,QAAQ;IACvB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,GAAG,CAAC;CACR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAQ3C;AAiBD;;;;;;;;;GASG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAIxC;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAU3C;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.mts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,WAAW,QAAQ;IACvB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,GAAG,CAAC;CACR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAmB3C;AAaD;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA4BhD;AAiBD;;;;;;;;;GASG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAIxC;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAU3C;AAED;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAExC"}

package/dist/import/index.mjs

@@ -1 +1 @@
-function r(t){return!(t.length%2===1||t.match(/^[0-9a-f]+$/)==null)}function u(t){switch(t.t){case"int":return i(t.v);case"seq":return l(t.v)}return""}function i(t){return typeof t=="string"&&r(t)?`02${s(t.length/2)}${t}`:""}function l(t){let e="";for(let n=0;n<t.length;n++)e+=u(t[n]);return`30${s(e.length/2)}${e}`}function h(t){return t=t.replace(/^(00){1,}/,""),t.match(/^[8-9a-f]/)?"00"+t:t}function s(t){let e;return t<128?(e=o(t.toString(16)),e):(e=o(t.toString(16)),(128+e.length/2).toString(16)+e)}function o(t){return t.length%2===1?`0${t}`:t}export{u as getASN1,s as getLength,o as hexpad,h as pospad};
+function c(t){if(t.t=="asn"&&"tlv"in t.v)return t.v.tlv;if(t.t=="seq"||t.t=="set"||t.t.match(/^a\d$/)){let n="";for(let s=0;s<t.v.length;s++)n+=c(t.v[s]);let l=i(n.length/2);return`${u(t.t)}${l}${n}`}let e=u(t.t),r=f(t.v),o=i(r.length/2);return`${e}${o}${r}`}function f(t){if(typeof t=="string"){if(t.match(/^[0-9a-f]+$/))return t;throw new Error("string but not hex")}else if(typeof t=="object"){if("hex"in t&&typeof t.hex=="string")return t.hex;throw new Error(`unsupported value object: ${JSON.stringify(t)}`)}throw new Error("unsupported value")}function u(t){switch(t){case"bool":return"01";case"int":return"02";case"bitstr":return"03";case"octstr":return"04";case"null":return"05";case"oid":return"06";case"enum":return"0a";case"utf8str":return"0c";case"numstr":return"12";case"prnstr":return"13";case"telstr":return"14";case"vidstr":return"15";case"ia5str":return"16";case"utctime":return"17";case"gentime":return"18";case"grastr":return"19";case"visstr":return"1a";case"genstr":return"1b";case"unistr":return"1c";case"chrstr":return"1d";case"bmpstr":return"1e";case"seq":return"30";case"set":return"31"}if(t.match(/^[8a]\d$/))return t;throw new Error(`unsupported tagName: ${t}`)}function m(t){return t=t.replace(/^(00){1,}/,""),t.match(/^[8-9a-f]/)?"00"+t:t}function i(t){let e;return t<128?(e=a(t.toString(16)),e):(e=a(t.toString(16)),(128+e.length/2).toString(16)+e)}function a(t){return t.length%2===1?`0${t}`:t}export{c as getASN1,i as getLength,a as hexpad,m as pospad,u as tagtohex};

package/dist/require/index.cjs

@@ -1 +1 @@
-"use strict";var s=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var $=Object.getOwnPropertyNames;var m=Object.prototype.hasOwnProperty;var l=(t,e)=>()=>(t&&(e=t(t=0)),e);var b=(t,e)=>{for(var n in e)s(t,n,{get:e[n],enumerable:!0})},d=(t,e,n,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of $(e))!m.call(t,r)&&r!==n&&s(t,r,{get:()=>e[r],enumerable:!(o=p(e,r))||o.enumerable});return t};var x=t=>d(s({},"__esModule",{value:!0}),t);function a(t){return!(t.length%2===1||t.match(/^[0-9a-f]+$/)==null)}var f=l(()=>{});var h={};b(h,{getASN1:()=>c,getLength:()=>i,hexpad:()=>u,pospad:()=>I});function c(t){switch(t.t){case"int":return w(t.v);case"seq":return S(t.v)}return""}function w(t){return typeof t=="string"&&a(t)?`02${i(t.length/2)}${t}`:""}function S(t){let e="";for(let n=0;n<t.length;n++)e+=c(t[n]);return`30${i(e.length/2)}${e}`}function I(t){return t=t.replace(/^(00){1,}/,""),t.match(/^[8-9a-f]/)?"00"+t:t}function i(t){let e;return t<128?(e=u(t.toString(16)),e):(e=u(t.toString(16)),(128+e.length/2).toString(16)+e)}function u(t){return t.length%2===1?`0${t}`:t}var g=l(()=>{"use strict";f()});module.exports=(g(),x(h));
+"use strict";var u=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var c=(t,e)=>()=>(t&&(e=t(t=0)),e);var x=(t,e)=>{for(var n in e)u(t,n,{get:e[n],enumerable:!0})},w=(t,e,n,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of b(e))!d.call(t,r)&&r!==n&&u(t,r,{get:()=>e[r],enumerable:!(s=m(e,r))||s.enumerable});return t};var S=t=>w(u({},"__esModule",{value:!0}),t);var f=c(()=>{});var g={};x(g,{getASN1:()=>h,getLength:()=>a,hexpad:()=>l,pospad:()=>y,tagtohex:()=>i});function h(t){if(t.t=="asn"&&"tlv"in t.v)return t.v.tlv;if(t.t=="seq"||t.t=="set"||t.t.match(/^a\d$/)){let r="";for(let o=0;o<t.v.length;o++)r+=h(t.v[o]);let $=a(r.length/2);return`${i(t.t)}${$}${r}`}let e=i(t.t),n=I(t.v),s=a(n.length/2);return`${e}${s}${n}`}function I(t){if(typeof t=="string"){if(t.match(/^[0-9a-f]+$/))return t;throw new Error("string but not hex")}else if(typeof t=="object"){if("hex"in t&&typeof t.hex=="string")return t.hex;throw new Error(`unsupported value object: ${JSON.stringify(t)}`)}throw new Error("unsupported value")}function i(t){switch(t){case"bool":return"01";case"int":return"02";case"bitstr":return"03";case"octstr":return"04";case"null":return"05";case"oid":return"06";case"enum":return"0a";case"utf8str":return"0c";case"numstr":return"12";case"prnstr":return"13";case"telstr":return"14";case"vidstr":return"15";case"ia5str":return"16";case"utctime":return"17";case"gentime":return"18";case"grastr":return"19";case"visstr":return"1a";case"genstr":return"1b";case"unistr":return"1c";case"chrstr":return"1d";case"bmpstr":return"1e";case"seq":return"30";case"set":return"31"}if(t.match(/^[8a]\d$/))return t;throw new Error(`unsupported tagName: ${t}`)}function y(t){return t=t.replace(/^(00){1,}/,""),t.match(/^[8-9a-f]/)?"00"+t:t}function a(t){let e;return t<128?(e=l(t.toString(16)),e):(e=l(t.toString(16)),(128+e.length/2).toString(16)+e)}function l(t){return t.length%2===1?`0${t}`:t}var p=c(()=>{"use strict";f()});module.exports=(p(),S(g));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typepki-asn1gen",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "author": "Kenji Urushima <kenji.urushima@gmail.com>",
   "description": "ASN.1 data generator for TypePKI library (beta)",
   "homepage": "https://kjur.github.io/typepki-asn1gen",
@@ -29,7 +29,7 @@
     "precommit": "run-z check:type fix test build",
     "prepublish": "attw --pack .",
     "run-z": "run-z",
-    "doc": "typedoc --includeVersion --cleanOutputDir false --tsconfig ./tsconfig.typedoc.json --options ./typedoc.json src/index.mts"
+    "doc": "typedoc --includeVersion --cleanOutputDir false --tsconfig ./tsconfig.typedoc.json --options ./typedoc.json src/index.mts --skipErrorChecking"
   },
   "files": [
     "src",
@@ -56,13 +56,14 @@
     "@changesets/cli": "^2.27.1",
     "@types/bun": "^1.1.1",
     "bun-types": "^1.1.4",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.27.2",
     "jest": "^29.7.0",
     "run-z": "^2.0.0",
     "typedoc": "^0.25.13",
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "typepki-strconv": "^0.3.0"
+    "typepki-asn1gen": "file:typepki-asn1gen-0.2.0.tgz",
+    "typepki-strconv": "^0.5.0"
   }
 }

package/src/index.mts

@@ -22,15 +22,77 @@ export interface ASN1Data {
  * ]}) -> "3006020101020102"
  */
 export function getASN1(p: ASN1Data): string {
-  switch (p.t) {
-    case "int":
-      return generateASN1_int(p.v);
-    case "seq":
-      return generateASN1_seq(p.v);
+  if (p.t == "asn" && "tlv" in p.v) return p.v.tlv;
+
+  if (p.t == "seq" || p.t == "set" || p.t.match(/^a\d$/)) {
+    let hV = "";
+    for (let i = 0; i < p.v.length; i++) {
+      hV += getASN1(p.v[i]);
+    }
+    const hL = getLength(hV.length / 2);
+    const hT = tagtohex(p.t);
+    return `${hT}${hL}${hV}`;
   }
+
+  const hT: string = tagtohex(p.t);
+  const hV: string = _getValueHex(p.v);
+  const hL: string = getLength(hV.length / 2);
+  return `${hT}${hL}${hV}`;
+
   return "";
 }
 
+function _getValueHex(value: string | object): string {
+  if (typeof value === "string") {
+    if (value.match(/^[0-9a-f]+$/)) return value;
+    throw new Error("string but not hex");
+  } else if (typeof value === "object") {
+    if ("hex" in value && typeof value.hex == "string") return value.hex;
+    throw new Error(`unsupported value object: ${JSON.stringify(value)}`);
+  }
+  throw new Error("unsupported value");
+}
+
+/**
+ * get a hexadecimal string of ASN.1 tag by a tag name
+ * @param tagName - name of ASN.1 tag
+ * @return hexadecimal string of ASN.1 tag
+ * @example
+ * tagtohex("bool") -> "01"
+ * tagtohex("utf8str") -> "0c"
+ * tagtohex("a4") -> context specific constructed tag 4
+ * tagtohex("80") -> context specific tag 0
+ */
+export function tagtohex(tagName: string): string {
+  switch (tagName) {
+    case "bool":	return "01";
+    case "int":		return "02";
+    case "bitstr":	return "03";
+    case "octstr":	return "04";
+    case "null":	return "05";
+    case "oid":		return "06";
+    case "enum":	return "0a";
+    case "utf8str":	return "0c";
+    case "numstr":	return "12";
+    case "prnstr":	return "13";
+    case "telstr":	return "14";
+    case "vidstr":	return "15";
+    case "ia5str":	return "16";
+    case "utctime":	return "17";
+    case "gentime":	return "18";
+    case "grastr":	return "19";
+    case "visstr":	return "1a";
+    case "genstr":	return "1b";
+    case "unistr":	return "1c";
+    case "chrstr":	return "1d";
+    case "bmpstr":	return "1e";
+    case "seq":		return "30";
+    case "set":		return "31";
+  }
+  if (tagName.match(/^[8a]\d$/)) return tagName;
+  throw new Error(`unsupported tagName: ${tagName}`);
+}
+
 function generateASN1_int(v: string | object): string {
   if (typeof v == "string" && ishex(v)) {
     return `02${getLength(v.length / 2)}${v}`;
@@ -86,6 +148,7 @@ export function getLength(n: number): string {
  * zero padding for hexadecimal string
  * @param s - odd or even length hexadecimal string
  * @return even length zero padded hexadecimal string
+ * @deprecated use hexpad in typepki-strconv
  * @example
  * hexpad("1") -> "01"
  * hexpad("ab3c") -> "ab3c"

package/src/index.test.mts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { pospad, getLength, getASN1 } from "./index.mts";
+import { pospad, getLength, getASN1, tagtohex } from "./index.mts";
 
 test("pospad", () => {
   expect(pospad("1234")).toBe("1234");
@@ -17,9 +17,52 @@ test("getLength", () => {
 });
 
 test("getASN1", () => {
+  let pASN1;
   expect(getASN1({t: "int", v: "12ab"})).toBe("020212ab");
+  expect(getASN1({t: "int", v: {hex:"12ab"}})).toBe("020212ab");
   expect(getASN1({t: "seq", v: [
     {t: "int", v: "01"},
     {t: "int", v: "02"}
   ]})).toBe("3006020101020102");
+  pASN1 = {
+    t: "a4",
+    v: [ { t: "octstr", v: { hex: "020101" }  } ]
+  };
+  expect(getASN1(pASN1)).toBe("a4050403020101");
+  expect(getASN1({t:"octstr",v:{hex:"020101"}})).toBe("0403020101");
+  pASN1 = {
+    t: "seq", v: [
+      { t: "seq", v: [
+	{ t: "a4", v: [ { t: "octstr", v: { hex: "abcd" } } ] }
+      ] },
+      { t: "int", v: { hex: "1234" } }
+    ]
+  };
+  expect(getASN1(pASN1)).toBe("300c3006a4040402abcd02021234");
+  expect(getASN1({t:"octstr",v:{hex:"abcd"}})).toBe("0402abcd");
+});
+
+test("getASN1 - asn", () => {
+  expect(getASN1({t: "asn", v: { tlv: "020101" }})).toBe("020101");
+});
+
+test("getASN1 - IssuerSerial cert /C=JP/O=T1", () => {
+  const pASN1 = {
+    t: "seq", v: [
+      { t: "seq", v: [
+	{ t: "a4", v: [ { t: "asn", v: { tlv: "301a310b3009060355040613024a50310b3009060355040a0c025431" } } ] }
+      ] },
+      { t: "int", v: { hex: "01" } }
+    ]
+  };
+  expect(getASN1(pASN1)).toBe("3023301ea41c301a310b3009060355040613024a50310b3009060355040a0c025431020101");
+});
+
+
+test("tagtohex", () => {
+  expect(tagtohex("81")).toBe("81");
+  expect(tagtohex("octstr")).toBe("04");
+  expect(tagtohex("seq")).toBe("30");
+  expect(tagtohex("set")).toBe("31");
+  expect(tagtohex("a0")).toBe("a0");
 });