@blamejs/core 0.18.11 → 0.18.13

package/lib/vendor/blamejs-pki.cjs

@@ -1,4 +1,4 @@
-// @blamejs/pki v0.3.29 — vendored (Apache-2.0). Zero-dep pure CJS.
+// @blamejs/pki v0.3.32 — vendored (Apache-2.0). Zero-dep pure CJS.
 // https://github.com/blamejs/pki  Exports: x509, crl, pkcs12, key, webcrypto, schema, csr, cms, ...
 // Backs lib/mtls-engine-default.js (PQC-capable CA + PKCS#12 engine).
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -137,7 +137,7 @@ var require_package = __commonJS({
   "node_modules/@blamejs/pki/package.json"(exports2, module2) {
     module2.exports = {
       name: "@blamejs/pki",
-      version: "0.3.29",
+      version: "0.3.32",
       description: "Pure-JavaScript PKI toolkit that owns its stack \u2014 X.509, ASN.1/DER, CMS, PQC-first.",
       license: "Apache-2.0",
       author: "blamejs contributors",
@@ -2494,6 +2494,10 @@ var require_oid = __commonJS({
         aaControls: 6,
         acProxying: 10,
         acmeIdentifier: 31,
+        // id-pe-subjectInfoAccess (RFC 5280 sec. 4.2.2.2) -- the SIA extension companion to the AIA.
+        subjectInfoAccess: 11,
+        // id-pe-tlsfeature (RFC 7633) -- the TLS Feature (formerly "must-staple") extension.
+        tlsFeature: 24,
         // id-pe-qcStatements (RFC 3739 sec. 3.2.6) -- the qualified-certificate-statements extension.
         qcStatements: 3
       } },
@@ -2540,8 +2544,23 @@ var require_oid = __commonJS({
       selectedAttrType: { base: [2, 5, 1, 5], of: { clearance: 55 } },
       // PKIX Access Descriptor methods (id-ad, RFC 5280 sec. 4.2.2.1/sec. 4.2.2.2). id-ad-ocsp
       // is the arc the OCSP responder OIDs hang under; id-ad-caIssuers names the AIA
-      // CA-issuers access method.
-      adAccess: { base: [1, 3, 6, 1, 5, 5, 7, 48], of: { ocsp: 1, caIssuers: 2 } },
+      // CA-issuers access method. The remaining id-ad methods (timeStamping RFC 3161, caRepository
+      // + rpkiManifest/signedObject/rpkiNotify RFC 6487/8182) complete the C509 Information Access
+      // registry (draft-ietf-cose-cbor-encoded-cert sec. 8.11); they carry the id-ad- prefix so the
+      // name->OID reverse stays unambiguous next to the id-kp "timeStamping" purpose (a distinct arc).
+      adAccess: { base: [1, 3, 6, 1, 5, 5, 7, 48], of: {
+        ocsp: 1,
+        caIssuers: 2,
+        "id-ad-timeStamping": 3,
+        "id-ad-caRepository": 5,
+        "id-ad-rpkiManifest": 10,
+        "id-ad-signedObject": 11,
+        "id-ad-rpkiNotify": 13
+      } },
+      // id-on -- RFC 5280 sec. 4.2.1.6 otherName type-ids the C509 sec. 8.13 registry gives their own
+      // negative ints: id-on-hardwareModuleName (RFC 4108), id-on-SmtpUTF8Mailbox (RFC 9598),
+      // id-on-MACAddress (I-D.ietf-lamps-macaddress-on) on the id-pkix 8 arc.
+      pkixOn: { base: [1, 3, 6, 1, 5, 5, 7, 8], of: { hardwareModuleName: 4, smtpUtf8Mailbox: 9, macAddress: 12 } },
       // OCSP (RFC 6960) on the id-pkix-ocsp arc (= id-ad-ocsp). id-pkix-ocsp-basic is
       // the ResponseBytes.responseType this build decodes; id-pkix-ocsp-nonce (sec. 4.4.1)
       // names the nonce extension; the remaining members name the other OCSP extensions
@@ -2572,15 +2591,29 @@ var require_oid = __commonJS({
       } },
       regInfo: { base: [1, 3, 6, 1, 5, 5, 7, 5, 2], of: { utf8Pairs: 1, certReq: 2 } },
       // PKIX extended key purposes (id-kp, RFC 5280 sec. 4.2.1.12). timeStamping is required
-      // -- critical and sole -- on an RFC 3161 TSA signing certificate (sec. 2.3).
+      // -- critical and sole -- on an RFC 3161 TSA signing certificate (sec. 2.3). The SSH
+      // (RFC 6187), CMC (RFC 6402), and Bundle Security (RFC 9174) purposes complete the C509
+      // Extended Key Usages registry (draft-ietf-cose-cbor-encoded-cert sec. 8.12).
       pkixKp: { base: [1, 3, 6, 1, 5, 5, 7, 3], of: {
         serverAuth: 1,
         clientAuth: 2,
         codeSigning: 3,
         emailProtection: 4,
         timeStamping: 8,
-        ocspSigning: 9
+        ocspSigning: 9,
+        secureShellClient: 21,
+        secureShellServer: 22,
+        cmcCA: 27,
+        cmcRA: 28,
+        cmcArchive: 29,
+        cmKGA: 32,
+        bundleSecurity: 35
       } },
+      // Kerberos PKINIT extended key purposes (id-pkinit, RFC 4556 sec. 3.2.3 / 3.2.4): the client
+      // and KDC authentication EKUs (C509 Extended Key Usages registry integers 10 / 11).
+      pkinitKp: { base: [1, 3, 6, 1, 5, 2, 3], of: { pkinitClientAuth: 4, pkinitKdc: 5 } },
+      // Wi-SUN FAN device extended key purpose (C509 Extended Key Usages registry integer 20).
+      wisun: { base: [1, 3, 6, 1, 4, 1, 45605], of: { fanDevice: 1 } },
       // Google Certificate Transparency (RFC 6962) on the 1.3.6.1.4.1.11129.2.4 arc:
       // the SCT-list X.509 extension (sec. 3.3), the precertificate poison (sec. 3.1), the
       // precert-signing EKU (sec. 3.1, naming only), and the OCSP-delivered SCT list
@@ -7420,6 +7453,8 @@ var require_schema_c509 = __commonJS({
     var oid = require_oid();
     var x509 = require_schema_x509();
     var pkix = require_schema_pkix();
+    var schema = require_schema_engine();
+    var guard = require_guard_all();
     var constants = require_constants();
     var frameworkError = require_framework_error();
     var validator = require_validator_all();
@@ -7455,8 +7490,9 @@ var require_schema_c509 = __commonJS({
       2: _name("surname"),
       3: _name("serialNumber"),
       4: _name("countryName"),
-      6: _name("localityName"),
-      7: _name("stateOrProvinceName"),
+      5: _name("localityName"),
+      6: _name("stateOrProvinceName"),
+      7: _name("streetAddress"),
       8: _name("organizationName"),
       9: _name("organizationalUnitName"),
       10: _name("title")
@@ -7466,9 +7502,79 @@ var require_schema_c509 = __commonJS({
       2: _name("keyUsage"),
       3: _name("subjectAltName"),
       4: _name("basicConstraints"),
-      7: _name("keyUsage"),
-      10: _name("authorityKeyIdentifier")
+      5: _name("cRLDistributionPoints"),
+      7: _name("authorityKeyIdentifier"),
+      8: _name("extKeyUsage"),
+      9: _name("authorityInfoAccess"),
+      25: _name("issuerAltName"),
+      26: _name("nameConstraints"),
+      29: _name("freshestCRL"),
+      30: _name("inhibitAnyPolicy"),
+      31: _name("subjectInfoAccess"),
+      36: _name("ocspNoCheck"),
+      38: _name("tlsFeature")
+    };
+    var EXT_COMPACT = {
+      subjectKeyIdentifier: 1,
+      keyUsage: 1,
+      basicConstraints: 1,
+      authorityKeyIdentifier: 1,
+      extKeyUsage: 1,
+      inhibitAnyPolicy: 1,
+      ocspNoCheck: 1,
+      tlsFeature: 1,
+      subjectAltName: 1,
+      issuerAltName: 1,
+      nameConstraints: 1,
+      cRLDistributionPoints: 1,
+      freshestCRL: 1,
+      authorityInfoAccess: 1,
+      subjectInfoAccess: 1
+    };
+    var EKU_BY_INT = {
+      0: _name("anyExtendedKeyUsage"),
+      1: _name("serverAuth"),
+      2: _name("clientAuth"),
+      3: _name("codeSigning"),
+      4: _name("emailProtection"),
+      8: _name("timeStamping"),
+      9: _name("ocspSigning"),
+      10: _name("pkinitClientAuth"),
+      11: _name("pkinitKdc"),
+      12: _name("secureShellClient"),
+      13: _name("secureShellServer"),
+      14: _name("bundleSecurity"),
+      15: _name("cmcCA"),
+      16: _name("cmcRA"),
+      17: _name("cmcArchive"),
+      18: _name("cmKGA"),
+      20: _name("fanDevice")
+    };
+    var EKU_TO_INT = {};
+    Object.keys(EKU_BY_INT).forEach(function(k) {
+      EKU_TO_INT[oid.byName(EKU_BY_INT[k])] = Number(k);
+    });
+    var NS = pkix.makeNS("c509", C509Error, oid);
+    var GN_LEAF = pkix.generalName(NS, { decodeValue: true });
+    var GN_LEAF_SUBTREE = pkix.generalName(NS, { decodeValue: true, subtreeBase: true });
+    var ON_NAME_BY_INT = { "-1": _name("hardwareModuleName"), "-2": _name("smtpUtf8Mailbox"), "-3": _name("macAddress") };
+    var ON_INT_BY_OID = {};
+    Object.keys(ON_NAME_BY_INT).forEach(function(k) {
+      ON_INT_BY_OID[oid.byName(ON_NAME_BY_INT[k])] = Number(k);
+    });
+    var IA_BY_INT = {
+      1: _name("ocsp"),
+      2: _name("caIssuers"),
+      3: _name("id-ad-timeStamping"),
+      5: _name("id-ad-caRepository"),
+      10: _name("id-ad-rpkiManifest"),
+      11: _name("id-ad-signedObject"),
+      13: _name("id-ad-rpkiNotify")
     };
+    var IA_TO_INT = {};
+    Object.keys(IA_BY_INT).forEach(function(k) {
+      IA_TO_INT[oid.byName(IA_BY_INT[k])] = Number(k);
+    });
     function _biguint(node, code, label) {
       if (!node || node.majorType !== 2) throw _err(code, label + " must be an unwrapped CBOR byte string (~biguint)");
       var b2 = node.content;
@@ -7478,7 +7584,7 @@ var require_schema_c509 = __commonJS({
     }
     function _time(node, allowNull, label) {
       if (allowNull && node.majorType === 7 && node.ai === 22) return null;
-      if (!node || node.majorType !== 0) throw _err("c509/bad-validity", label + " must be an unwrapped CBOR epoch integer (~time)");
+      if (node.majorType !== 0) throw _err("c509/bad-validity", label + " must be an unwrapped CBOR epoch integer (~time)");
       var secs = node.argument;
       if (secs > MAX_EPOCH_SECONDS) throw _err("c509/bad-validity", label + " is outside the representable Date range");
       return new Date(C.TIME.seconds(Number(secs)));
@@ -7539,6 +7645,7 @@ var require_schema_c509 = __commonJS({
       var kids = node.children || [];
       if (kids.length % 2 !== 0) throw _err("c509/bad-name", "a C509 Name array must be attribute-type/value pairs (dangling attribute type)");
       for (var i = 0; i + 1 < kids.length; i += 2) {
+        if (kids[i].majorType !== 0 && kids[i].majorType !== 1) throw _err("c509/bad-name", "a C509 Name attribute type must be a CBOR integer");
         var ti = Number(cbor.read.int(kids[i]));
         var tname = ATTR_BY_INT[Math.abs(ti)];
         if (tname === void 0) throw _err("c509/bad-name", "attribute type integer " + ti + " has no C509 registry row");
@@ -7552,6 +7659,532 @@ var require_schema_c509 = __commonJS({
     function _shortName(n) {
       return n === "commonName" ? "CN" : n === "countryName" ? "C" : n === "organizationName" ? "O" : n === "organizationalUnitName" ? "OU" : n === "localityName" ? "L" : n === "stateOrProvinceName" ? "ST" : n;
     }
+    function _cborUint(node, label) {
+      if (node.majorType !== 0) throw _err("c509/bad-extensions", "a " + label + " value must be a CBOR unsigned integer");
+      return cbor.read.int(node);
+    }
+    function _cborIntVal(node, label) {
+      if (node.majorType !== 0 && node.majorType !== 1) throw _err("c509/bad-extensions", "a " + label + " value must be a CBOR integer");
+      return cbor.read.int(node);
+    }
+    function _ekuPurposeOid(node) {
+      if (node.majorType === 0 || node.majorType === 1) {
+        var i = Number(cbor.read.int(node));
+        var nm = EKU_BY_INT[i];
+        if (nm === void 0) throw _err("c509/bad-extensions", "an extKeyUsage int " + i + " has no C509 registry row");
+        return oid.byName(nm);
+      }
+      return _oidName(node, "c509/bad-extensions", "an extKeyUsage KeyPurposeId").oid;
+    }
+    function _oidCbor(dotted) {
+      return cbor.build.byteString(asn1.encodeOidContent(dotted));
+    }
+    function _isCborNull(node) {
+      return node.majorType === 7 && node.ai === 22;
+    }
+    function _ia5Bytes(node, tag) {
+      if (node.majorType !== 3) throw _err("c509/bad-extensions", "a GeneralName [" + tag + "] value must be a CBOR text string (IA5String)");
+      var s = cbor.read.textString(node);
+      if (s.length === 0) throw _err("c509/bad-extensions", "a GeneralName [" + tag + "] IA5String must be non-empty");
+      for (var i = 0; i < s.length; i++) {
+        if (s.charCodeAt(i) > 127) throw _err("c509/bad-extensions", "a GeneralName [" + tag + "] IA5String has a non-ASCII code point");
+      }
+      var buf = Buffer.from(s, "latin1");
+      guard.name.assertPrintableIa5(buf, _err, "c509/bad-extensions", "GeneralName [" + tag + "]");
+      return buf;
+    }
+    function _namedBitsToContent(value) {
+      if (!Number.isInteger(value) || value <= 0 || value > 511) return null;
+      var hi = 0;
+      for (var t = value; t; t >>= 1) hi++;
+      hi -= 1;
+      var buf = Buffer.alloc((hi >> 3) + 1);
+      for (var bit = 0; bit <= hi; bit++) {
+        if (value & 1 << bit) buf[bit >> 3] |= 128 >> (bit & 7);
+      }
+      return { unusedBits: 7 - (hi & 7), bytes: buf };
+    }
+    function _namedBitsFromContent(bytes, unusedBits) {
+      var total = bytes.length * 8 - unusedBits, value = 0;
+      for (var bit = 0; bit < total && bit < 31; bit++) {
+        if (bytes[bit >> 3] & 128 >> (bit & 7)) value |= 1 << bit;
+      }
+      return value > 0 && value <= 511 ? value : null;
+    }
+    function _generalNameToDer(intVal, valueNode, ipMode) {
+      if (intVal === 1 || intVal === 2 || intVal === 6) return b.contextPrimitive(intVal, _ia5Bytes(valueNode, intVal));
+      if (intVal === 4) return b.explicit(4, _reconName(_name509(valueNode, true)));
+      if (intVal === 7) return b.contextPrimitive(7, ipMode ? _ncIpToDer(valueNode) : _sanIpBytes(valueNode));
+      if (intVal === 8) return b.contextPrimitive(8, asn1.encodeOidContent(_oidName(valueNode, "c509/bad-extensions", "a registeredID [8]").oid));
+      if (intVal === 0 || intVal === -1 || intVal === -2 || intVal === -3) return _otherNameToDer(valueNode, intVal);
+      throw _err("c509/bad-extensions", "GeneralName int " + intVal + " has no C509 sec. 8.13 registry row");
+    }
+    function _generalNameFromDer(gn, ipMode) {
+      var t = gn.tagNumber;
+      if (t === 1 || t === 2 || t === 6) return [cbor.build.int(BigInt(t)), cbor.build.textString(gn.value)];
+      if (t === 4) {
+        var nm = _dirNameToCbor(gn.bytes);
+        return nm == null ? null : [cbor.build.int(4n), nm];
+      }
+      if (t === 7) {
+        if (!ipMode) return [cbor.build.int(7n), cbor.build.byteString(gn.value)];
+        var ip = _ncIpFromDer(gn.value);
+        return ip == null ? null : [cbor.build.int(7n), cbor.build.byteString(ip)];
+      }
+      if (t === 8) return [cbor.build.int(8n), _oidCbor(gn.value)];
+      if (t === 0) return _otherNameFromDer(gn.value);
+      return null;
+    }
+    function _generalNamesToDer(node) {
+      if (node.majorType !== 4 || !node.children) throw _err("c509/bad-extensions", "a GeneralNames value must be a CBOR array");
+      var kids = node.children;
+      if (kids.length === 0 || kids.length % 2 !== 0) throw _err("c509/bad-extensions", "a GeneralNames array must be non-empty (int, value) pairs (sec. 3.3)");
+      var out = [];
+      for (var i = 0; i + 1 < kids.length; i += 2) out.push(_generalNameToDer(Number(_cborIntVal(kids[i], "a GeneralName type")), kids[i + 1], false));
+      return out;
+    }
+    function _generalNamesFromDer(gnNodes) {
+      var out = [];
+      for (var i = 0; i < gnNodes.length; i++) {
+        var pair = _generalNameFromDer(schema.walk(GN_LEAF, gnNodes[i], NS), false);
+        if (pair == null) return null;
+        out.push(pair[0]);
+        out.push(pair[1]);
+      }
+      return out;
+    }
+    function _otherNameToDer(node, intVal) {
+      var typeId, inner;
+      if (intVal === 0) {
+        if (node.majorType !== 4 || !node.children || node.children.length !== 2) throw _err("c509/bad-extensions", "a generic otherName value must be a CBOR [ ~oid, bytes ] pair");
+        typeId = _oidName(node.children[0], "c509/bad-extensions", "an otherName type-id").oid;
+        if (node.children[1].majorType !== 2) throw _err("c509/bad-extensions", "an otherName value must be a CBOR byte string (the [0] EXPLICIT inner TLV)");
+        inner = node.children[1].content;
+        try {
+          asn1.decode(inner);
+        } catch (e) {
+          throw _err("c509/bad-extensions", "an otherName value is not a single well-formed DER element", e);
+        }
+      } else if (intVal === -1) {
+        if (node.majorType !== 4 || !node.children || node.children.length !== 2) throw _err("c509/bad-extensions", "an id-on-hardwareModuleName value must be a CBOR [ ~oid, bytes ] pair");
+        if (node.children[1].majorType !== 2) throw _err("c509/bad-extensions", "a hardwareModuleName hwSerialNum must be a CBOR byte string");
+        typeId = oid.byName("hardwareModuleName");
+        inner = b.sequence([b.oid(_oidName(node.children[0], "c509/bad-extensions", "a hardwareModuleName hwType").oid), b.octetString(node.children[1].content)]);
+      } else if (intVal === -2) {
+        if (node.majorType !== 3) throw _err("c509/bad-extensions", "an id-on-SmtpUTF8Mailbox value must be a CBOR text string");
+        var smtp = cbor.read.textString(node);
+        if (smtp.length === 0) throw _err("c509/bad-extensions", "an id-on-SmtpUTF8Mailbox value must be non-empty (RFC 9598 SIZE (1..MAX))");
+        typeId = oid.byName("smtpUtf8Mailbox");
+        inner = b.utf8(smtp);
+      } else {
+        if (node.majorType !== 2) throw _err("c509/bad-extensions", "an id-on-MACAddress value must be a CBOR byte string");
+        if (node.content.length !== 6 && node.content.length !== 8) throw _err("c509/bad-extensions", "an id-on-MACAddress value must be 6 (EUI-48) or 8 (EUI-64) octets");
+        typeId = oid.byName("macAddress");
+        inner = b.octetString(node.content);
+      }
+      return b.contextConstructed(0, Buffer.concat([b.oid(typeId), b.explicit(0, inner)]));
+    }
+    function _otherNameFromDer(v) {
+      var onInt = ON_INT_BY_OID[v.typeId];
+      if (onInt === void 0) return [cbor.build.int(0n), cbor.build.array([_oidCbor(v.typeId), cbor.build.byteString(v.valueBytes)])];
+      var inner;
+      try {
+        inner = asn1.decode(v.valueBytes);
+      } catch (_e) {
+        return null;
+      }
+      if (onInt === -1) {
+        if (inner.tagClass !== "universal" || inner.tagNumber !== asn1.TAGS.SEQUENCE || !inner.children || inner.children.length !== 2) return null;
+        var hwType, hwSerial;
+        try {
+          hwType = asn1.read.oid(inner.children[0]);
+          hwSerial = asn1.read.octetString(inner.children[1]);
+        } catch (_e2) {
+          return null;
+        }
+        return [cbor.build.int(-1n), cbor.build.array([_oidCbor(hwType), cbor.build.byteString(hwSerial)])];
+      }
+      if (onInt === -2) {
+        if (inner.tagClass !== "universal" || inner.tagNumber !== asn1.TAGS.UTF8_STRING) return null;
+        var txt;
+        try {
+          txt = asn1.read.string(inner);
+        } catch (_e3) {
+          return null;
+        }
+        return [cbor.build.int(-2n), cbor.build.textString(txt)];
+      }
+      if (inner.tagClass !== "universal" || inner.tagNumber !== asn1.TAGS.OCTET_STRING) return null;
+      var mac;
+      try {
+        mac = asn1.read.octetString(inner);
+      } catch (_e4) {
+        return null;
+      }
+      if (mac.length !== 6 && mac.length !== 8) return null;
+      return [cbor.build.int(-3n), cbor.build.byteString(mac)];
+    }
+    function _dirNameToCbor(gnBytes) {
+      var node = asn1.decode(gnBytes);
+      if (!node.children || node.children.length !== 1) return null;
+      var name;
+      try {
+        name = _c509NameFromDer(node.children[0].bytes);
+      } catch (_e) {
+        return null;
+      }
+      try {
+        return _encName(name, true);
+      } catch (_e2) {
+        return null;
+      }
+    }
+    function _sanIpBytes(node) {
+      if (node.majorType !== 2) throw _err("c509/bad-extensions", "an iPAddress value must be a CBOR byte string");
+      if (node.content.length !== 4 && node.content.length !== 16) throw _err("c509/bad-extensions", "an iPAddress must be 4 (IPv4) or 16 (IPv6) octets");
+      return node.content;
+    }
+    function _ncIpToDer(node) {
+      if (node.majorType !== 2) throw _err("c509/bad-extensions", "a name-constraints iPAddress value must be a CBOR byte string");
+      var buf = node.content, addrLen;
+      if (buf.length === 5) addrLen = 4;
+      else if (buf.length === 17) addrLen = 16;
+      else throw _err("c509/bad-extensions", "a name-constraints iPAddress must be 5 (IPv4) or 17 (IPv6) octets (address + prefix length; RFC 9549 sec. 2.2)");
+      var prefixLen = buf[addrLen], maxBits = addrLen * 8;
+      if (prefixLen > maxBits) throw _err("c509/bad-extensions", "a name-constraints iPAddress prefix length " + prefixLen + " exceeds " + maxBits);
+      var mask = Buffer.alloc(addrLen);
+      for (var bit = 0; bit < prefixLen; bit++) mask[bit >> 3] |= 128 >> (bit & 7);
+      return Buffer.concat([buf.subarray(0, addrLen), mask]);
+    }
+    function _ncIpFromDer(buf) {
+      var addrLen = buf.length >> 1, mask = buf.subarray(addrLen), prefixLen = 0, seenZero = false;
+      for (var i = 0; i < mask.length; i++) {
+        for (var bit = 0; bit < 8; bit++) {
+          if (mask[i] & 128 >> bit) {
+            if (seenZero) return null;
+            prefixLen++;
+          } else seenZero = true;
+        }
+      }
+      return Buffer.concat([buf.subarray(0, addrLen), Buffer.from([prefixLen])]);
+    }
+    function _subtreesToDer(node) {
+      if (node.majorType !== 4 || !node.children) throw _err("c509/bad-extensions", "a GeneralSubtrees value must be a CBOR array");
+      var kids = node.children;
+      if (kids.length === 0 || kids.length % 2 !== 0) throw _err("c509/bad-extensions", "a GeneralSubtrees array must be non-empty (int, value) pairs");
+      var out = [];
+      for (var i = 0; i + 1 < kids.length; i += 2) out.push(b.sequence([_generalNameToDer(Number(_cborIntVal(kids[i], "a GeneralSubtree base type")), kids[i + 1], true)]));
+      return Buffer.concat(out);
+    }
+    function _subtreesFromDer(subtreeNodes) {
+      if (!subtreeNodes.length) return null;
+      var out = [];
+      for (var i = 0; i < subtreeNodes.length; i++) {
+        var st = subtreeNodes[i];
+        if (st.tagClass !== "universal" || st.tagNumber !== asn1.TAGS.SEQUENCE || !st.children || st.children.length !== 1) return null;
+        var pair = _generalNameFromDer(schema.walk(GN_LEAF_SUBTREE, st.children[0], NS), true);
+        if (pair == null) return null;
+        out.push(pair[0]);
+        out.push(pair[1]);
+      }
+      return out;
+    }
+    function _accessMethodOid(node) {
+      if (node.majorType === 0 || node.majorType === 1) {
+        var i = Number(cbor.read.int(node)), nm = IA_BY_INT[i];
+        if (nm === void 0) throw _err("c509/bad-extensions", "an accessMethod int " + i + " has no C509 sec. 8.11 registry row");
+        return oid.byName(nm);
+      }
+      return _oidName(node, "c509/bad-extensions", "an accessMethod").oid;
+    }
+    function _reasonsBitsToDer(value) {
+      if ((value & 1) !== 0) throw _err("c509/bad-extensions", "a cRLDistributionPoints reasons value must not set the reserved unused ReasonFlags bit 0 (RFC 5280 sec. 4.2.1.13)");
+      var c = _namedBitsToContent(value);
+      if (c == null) throw _err("c509/bad-extensions", "a cRLDistributionPoints reasons value must be within the 9 defined ReasonFlags bits");
+      return b.contextPrimitive(1, Buffer.concat([Buffer.from([c.unusedBits]), c.bytes]));
+    }
+    function _serialIntContent(node) {
+      var mag = _minBytes(_biguint(node, "c509/bad-extensions", "an authorityKeyIdentifier serial"));
+      if (mag.length === 0) return Buffer.from([0]);
+      return mag[0] & 128 ? Buffer.concat([Buffer.from([0]), mag]) : mag;
+    }
+    function _dpToDer(dpNode) {
+      if (dpNode.majorType !== 4 || !dpNode.children || dpNode.children.length !== 3) throw _err("c509/bad-extensions", "a DistributionPoint must be a CBOR [ fullName, reasons, cRLIssuer ] array");
+      var fullName = dpNode.children[0], reasons = dpNode.children[1], crlIssuer = dpNode.children[2];
+      var uris;
+      if (fullName.majorType === 3) uris = [b.contextPrimitive(6, _ia5Bytes(fullName, 6))];
+      else if (fullName.majorType === 4 && fullName.children) {
+        if (fullName.children.length < 2) throw _err("c509/bad-extensions", "a DistributionPoint fullName array must hold 2 or more URIs (a single URI is a bare text; sec. 3.3)");
+        uris = fullName.children.map(function(u) {
+          return b.contextPrimitive(6, _ia5Bytes(u, 6));
+        });
+      } else throw _err("c509/bad-extensions", "a DistributionPoint fullName must be a URI text or an array of URIs");
+      var fields = [b.explicit(0, b.contextConstructed(0, Buffer.concat(uris)))];
+      if (!_isCborNull(reasons)) fields.push(_reasonsBitsToDer(Number(_cborUint(reasons, "cRLDistributionPoints reasons"))));
+      if (!_isCborNull(crlIssuer)) fields.push(b.contextConstructed(2, b.explicit(4, _reconName(_name509(crlIssuer, true)))));
+      return b.sequence(fields);
+    }
+    function _dpFromDer(dp) {
+      if (dp.tagClass !== "universal" || dp.tagNumber !== asn1.TAGS.SEQUENCE || !dp.children) return null;
+      var fullNameUris = null, reasonsVal = null, crlIssuerCbor = null, lastTag = -1;
+      for (var i = 0; i < dp.children.length; i++) {
+        var f = dp.children[i];
+        if (f.tagClass !== "context" || f.tagNumber <= lastTag) return null;
+        lastTag = f.tagNumber;
+        if (f.tagNumber === 0) {
+          if (!f.children || f.children.length !== 1) return null;
+          var dpn = f.children[0];
+          if (dpn.tagClass !== "context" || dpn.tagNumber !== 0 || !dpn.children || !dpn.children.length) return null;
+          fullNameUris = [];
+          for (var j = 0; j < dpn.children.length; j++) {
+            var mm = dpn.children[j];
+            if (mm.tagClass !== "context" || mm.tagNumber !== 6) return null;
+            fullNameUris.push(schema.walk(GN_LEAF, mm, NS).value);
+          }
+        } else if (f.tagNumber === 1) {
+          var bs;
+          try {
+            bs = asn1.read.bitStringImplicit(f, 1);
+          } catch (_e) {
+            return null;
+          }
+          reasonsVal = _namedBitsFromContent(bs.bytes, bs.unusedBits);
+          if (reasonsVal == null) return null;
+        } else if (f.tagNumber === 2) {
+          if (!f.children || f.children.length !== 1) return null;
+          var ci = f.children[0];
+          if (ci.tagClass !== "context" || ci.tagNumber !== 4 || !ci.children || ci.children.length !== 1) return null;
+          try {
+            crlIssuerCbor = _encName(_c509NameFromDer(ci.children[0].bytes), true);
+          } catch (_e2) {
+            return null;
+          }
+        } else return null;
+      }
+      if (fullNameUris == null) return null;
+      var oneUri = fullNameUris.length === 1 ? fullNameUris[0] : null;
+      var fnCbor = oneUri != null ? cbor.build.textString(oneUri) : cbor.build.array(fullNameUris.map(function(u) {
+        return cbor.build.textString(u);
+      }));
+      return {
+        triple: cbor.build.array([fnCbor, reasonsVal == null ? cbor.build.nullValue() : cbor.build.uint(BigInt(reasonsVal)), crlIssuerCbor == null ? cbor.build.nullValue() : crlIssuerCbor]),
+        oneUri,
+        noReasons: reasonsVal == null,
+        noIssuer: crlIssuerCbor == null
+      };
+    }
+    function _extValueToDer(name, node) {
+      switch (name) {
+        case "subjectKeyIdentifier":
+          if (node.majorType !== 2) throw _err("c509/bad-extensions", "a subjectKeyIdentifier value must be a CBOR byte string");
+          return b.octetString(node.content);
+        case "keyUsage":
+          return _reconKeyUsageBits(Number(_cborUint(node, "keyUsage")));
+        case "basicConstraints": {
+          var iv = _cborIntVal(node, "basicConstraints");
+          if (iv === -2n) return b.sequence([]);
+          if (iv === -1n) return b.sequence([b.boolean(true)]);
+          if (iv >= 0n) return b.sequence([b.boolean(true), b.integer(iv)]);
+          throw _err("c509/bad-extensions", "a basicConstraints int " + iv + " is outside the -2/-1/pathLen range");
+        }
+        case "authorityKeyIdentifier":
+          if (node.majorType === 2) return b.sequence([b.contextPrimitive(0, node.content)]);
+          if (node.majorType === 4 && node.children && node.children.length === 3) {
+            if (node.children[0].majorType !== 2) throw _err("c509/bad-extensions", "an authorityKeyIdentifier keyIdentifier must be a CBOR byte string");
+            return b.sequence([
+              b.contextPrimitive(0, node.children[0].content),
+              // keyIdentifier [0] IMPLICIT OCTET STRING
+              b.contextConstructed(1, Buffer.concat(_generalNamesToDer(node.children[1]))),
+              // authorityCertIssuer [1] IMPLICIT GeneralNames
+              b.contextPrimitive(2, _serialIntContent(node.children[2]))
+              // authorityCertSerialNumber [2] IMPLICIT INTEGER
+            ]);
+          }
+          throw _err("c509/bad-extensions", "an authorityKeyIdentifier value must be a keyId byte string or the [ keyId, authorityCertIssuer, serial ] array (sec. 3.3)");
+        case "extKeyUsage": {
+          var items;
+          if (node.majorType === 4) {
+            items = node.children || [];
+            if (items.length < 2) throw _err("c509/bad-extensions", "an extKeyUsage array must hold 2 or more KeyPurposeIds; a single purpose omits the array (draft-20 sec. 3.3)");
+          } else {
+            items = [node];
+          }
+          return b.sequence(items.map(function(it) {
+            return b.oid(_ekuPurposeOid(it));
+          }));
+        }
+        case "inhibitAnyPolicy":
+          return b.integer(_cborUint(node, "inhibitAnyPolicy"));
+        case "ocspNoCheck":
+          if (node.majorType !== 7 || !(Buffer.isBuffer(node.bytes) && node.bytes.length === 1 && node.bytes[0] === 246)) throw _err("c509/bad-extensions", "an ocspNoCheck value must be the CBOR simple value null");
+          return b.nullValue();
+        case "tlsFeature": {
+          if (node.majorType !== 4) throw _err("c509/bad-extensions", "a tlsFeature value must be a CBOR array");
+          return b.sequence((node.children || []).map(function(f) {
+            return b.integer(_cborUint(f, "tlsFeature feature"));
+          }));
+        }
+        case "subjectAltName":
+        case "issuerAltName":
+          if (node.majorType === 3) return b.sequence([b.contextPrimitive(2, _ia5Bytes(node, 2))]);
+          return b.sequence(_generalNamesToDer(node));
+        case "nameConstraints": {
+          if (node.majorType !== 4 || !node.children || node.children.length !== 2) throw _err("c509/bad-extensions", "a nameConstraints value must be a 2-element CBOR array [ permitted, excluded ] (sec. 3.3)");
+          var ncFields = [];
+          if (!_isCborNull(node.children[0])) ncFields.push(b.contextConstructed(0, _subtreesToDer(node.children[0])));
+          if (!_isCborNull(node.children[1])) ncFields.push(b.contextConstructed(1, _subtreesToDer(node.children[1])));
+          if (ncFields.length === 0) throw _err("c509/bad-extensions", "nameConstraints must contain permittedSubtrees or excludedSubtrees (RFC 5280 sec. 4.2.1.10)");
+          return b.sequence(ncFields);
+        }
+        case "authorityInfoAccess":
+        case "subjectInfoAccess": {
+          if (node.majorType !== 4 || !node.children) throw _err("c509/bad-extensions", "an " + name + " value must be a CBOR array");
+          var aiaKids = node.children;
+          if (aiaKids.length === 0 || aiaKids.length % 2 !== 0) throw _err("c509/bad-extensions", "an " + name + " array must be non-empty (accessMethod, uri) pairs (sec. 3.3)");
+          var descs = [];
+          for (var ai = 0; ai + 1 < aiaKids.length; ai += 2) descs.push(b.sequence([b.oid(_accessMethodOid(aiaKids[ai])), b.contextPrimitive(6, _ia5Bytes(aiaKids[ai + 1], 6))]));
+          return b.sequence(descs);
+        }
+        case "cRLDistributionPoints":
+        case "freshestCRL":
+          if (node.majorType === 3) return b.sequence([b.sequence([b.explicit(0, b.contextConstructed(0, b.contextPrimitive(6, _ia5Bytes(node, 6))))])]);
+          if (node.majorType !== 4 || !node.children || node.children.length < 1) throw _err("c509/bad-extensions", "a " + name + " value must be a CBOR array of DistributionPoints or a bare URI text (sec. 3.3)");
+          return b.sequence(node.children.map(function(dp) {
+            return _dpToDer(dp);
+          }));
+        default:
+          throw _err("c509/bad-extensions", "extension " + name + " has no compact value decoder");
+      }
+    }
+    function _extValueFromDer(name, der) {
+      var node;
+      try {
+        node = asn1.decode(der);
+        switch (name) {
+          case "subjectKeyIdentifier":
+            return cbor.build.byteString(asn1.read.octetString(node));
+          case "keyUsage": {
+            var bits = _keyUsageBitsFromDer(der);
+            return bits == null ? null : cbor.build.uint(BigInt(bits));
+          }
+          case "basicConstraints": {
+            var kids = node.children || [];
+            if (kids.length === 0) return cbor.build.int(-2n);
+            if (asn1.read.boolean(kids[0]) !== true) return null;
+            if (kids.length === 1) return cbor.build.int(-1n);
+            if (kids.length !== 2) return null;
+            return cbor.build.uint(asn1.read.integer(kids[1]));
+          }
+          case "authorityKeyIdentifier": {
+            var akids = node.children || [];
+            if (akids.length === 1 && akids[0].tagClass === "context" && akids[0].tagNumber === 0) {
+              return cbor.build.byteString(asn1.read.octetStringImplicit(akids[0], 0));
+            }
+            if (akids.length === 3 && akids[0].tagClass === "context" && akids[0].tagNumber === 0 && akids[1].tagClass === "context" && akids[1].tagNumber === 1 && akids[1].children && akids[2].tagClass === "context" && akids[2].tagNumber === 2) {
+              var akiIssuer = _generalNamesFromDer(akids[1].children);
+              if (akiIssuer == null) return null;
+              var akiSerial = asn1.read.integerImplicit(akids[2], 2);
+              if (akiSerial < 0n) return null;
+              return cbor.build.array([cbor.build.byteString(asn1.read.octetStringImplicit(akids[0], 0)), cbor.build.array(akiIssuer), cbor.build.byteString(_minBytes(akiSerial))]);
+            }
+            return null;
+          }
+          case "extKeyUsage": {
+            var purposes = node.children || [];
+            if (!purposes.length) return null;
+            var out = purposes.map(function(p) {
+              var dotted = asn1.read.oid(p), pint = EKU_TO_INT[dotted];
+              return pint !== void 0 ? cbor.build.int(BigInt(pint)) : cbor.build.byteString(asn1.encodeOidContent(dotted));
+            });
+            return out.length === 1 ? out[0] : cbor.build.array(out);
+          }
+          case "inhibitAnyPolicy":
+            return cbor.build.uint(asn1.read.integer(node));
+          case "ocspNoCheck":
+            asn1.read.nullValue(node);
+            return cbor.build.nullValue();
+          case "tlsFeature":
+            return cbor.build.array((node.children || []).map(function(f) {
+              return cbor.build.uint(asn1.read.integer(f));
+            }));
+          case "subjectAltName":
+          case "issuerAltName": {
+            if (node.tagClass !== "universal" || node.tagNumber !== asn1.TAGS.SEQUENCE || !node.children || node.children.length < 1) return null;
+            var sanMembers = node.children;
+            if (sanMembers.length === 1 && sanMembers[0].tagClass === "context" && sanMembers[0].tagNumber === 2) {
+              return cbor.build.textString(schema.walk(GN_LEAF, sanMembers[0], NS).value);
+            }
+            var sanItems = _generalNamesFromDer(sanMembers);
+            return sanItems == null ? null : cbor.build.array(sanItems);
+          }
+          case "nameConstraints": {
+            if (node.tagClass !== "universal" || node.tagNumber !== asn1.TAGS.SEQUENCE || !node.children || node.children.length < 1) return null;
+            var permCbor = cbor.build.nullValue(), exclCbor = cbor.build.nullValue(), sawNc = false, ncLast = -1;
+            for (var nci = 0; nci < node.children.length; nci++) {
+              var ncf = node.children[nci];
+              if (ncf.tagClass !== "context" || ncf.tagNumber <= ncLast) return null;
+              ncLast = ncf.tagNumber;
+              var subItems = _subtreesFromDer(ncf.children || []);
+              if (subItems == null) return null;
+              if (ncf.tagNumber === 0) {
+                permCbor = cbor.build.array(subItems);
+                sawNc = true;
+              } else if (ncf.tagNumber === 1) {
+                exclCbor = cbor.build.array(subItems);
+                sawNc = true;
+              } else return null;
+            }
+            return sawNc ? cbor.build.array([permCbor, exclCbor]) : null;
+          }
+          case "authorityInfoAccess":
+          case "subjectInfoAccess": {
+            var aiaDescs = node.children || [];
+            if (node.tagClass !== "universal" || node.tagNumber !== asn1.TAGS.SEQUENCE || aiaDescs.length < 1) return null;
+            var aiaOut = [];
+            for (var adi = 0; adi < aiaDescs.length; adi++) {
+              var d = aiaDescs[adi];
+              if (d.tagClass !== "universal" || d.tagNumber !== asn1.TAGS.SEQUENCE || !d.children || d.children.length !== 2) return null;
+              var aiaLoc = d.children[1];
+              if (aiaLoc.tagClass !== "context" || aiaLoc.tagNumber !== 6) return null;
+              var methodDotted = asn1.read.oid(d.children[0]), mint = IA_TO_INT[methodDotted];
+              aiaOut.push(mint !== void 0 ? cbor.build.int(BigInt(mint)) : _oidCbor(methodDotted));
+              aiaOut.push(cbor.build.textString(schema.walk(GN_LEAF, aiaLoc, NS).value));
+            }
+            return cbor.build.array(aiaOut);
+          }
+          case "cRLDistributionPoints":
+          case "freshestCRL": {
+            var dps = node.children || [];
+            if (node.tagClass !== "universal" || node.tagNumber !== asn1.TAGS.SEQUENCE || dps.length < 1) return null;
+            var dpResults = [];
+            for (var dpi = 0; dpi < dps.length; dpi++) {
+              var dpr = _dpFromDer(dps[dpi]);
+              if (dpr == null) return null;
+              dpResults.push(dpr);
+            }
+            if (dpResults.length === 1 && dpResults[0].oneUri != null && dpResults[0].noReasons && dpResults[0].noIssuer) return cbor.build.textString(dpResults[0].oneUri);
+            return cbor.build.array(dpResults.map(function(r) {
+              return r.triple;
+            }));
+          }
+          default:
+            return null;
+        }
+      } catch (_e) {
+        return null;
+      }
+    }
+    function _tryCompactExtValue(name, der) {
+      var compact = _extValueFromDer(name, der);
+      if (compact == null) return null;
+      var recon;
+      try {
+        recon = _extValueToDer(name, cbor.decode(compact));
+      } catch (_e) {
+        return null;
+      }
+      return recon.equals(der) ? compact : null;
+    }
     function _extensions(node) {
       if (node.majorType === 0 || node.majorType === 1) {
         var iv = Number(cbor.read.int(node));
@@ -7570,7 +8203,13 @@ var require_schema_c509 = __commonJS({
           if (name === void 0) throw _err("c509/bad-extensions", "extension type integer " + ei + " has no C509 registry row");
           extOid = oid.byName(name);
           critical = ei < 0;
-          valContent = valNode.content;
+          if (EXT_COMPACT[name]) {
+            valContent = _extValueToDer(name, valNode);
+          } else if (valNode.majorType === 2) {
+            valContent = valNode.content;
+          } else {
+            throw _err("c509/bad-extensions", "extension " + name + " has no compact value codec; its int-form value must be a byte string (draft-20 sec. 3.3)");
+          }
         } else {
           var r = _oidName(idNode, "c509/bad-extensions", "an extension id");
           name = r.name;
@@ -7640,16 +8279,9 @@ var require_schema_c509 = __commonJS({
       throw _err("c509/non-invertible", "subjectPublicKey algorithm " + spkAlg.name + " is not in the type-3 reconstruction covered set");
     }
     function _reconKeyUsageBits(value) {
-      if (!Number.isInteger(value) || value <= 0 || value > 511) throw _err("c509/non-invertible", "a keyUsage value must be a positive integer within the 9 defined bits");
-      var hi = 0;
-      for (var t = value; t; t >>= 1) hi++;
-      hi -= 1;
-      var nbytes = (hi >> 3) + 1;
-      var buf = Buffer.alloc(nbytes);
-      for (var bit = 0; bit <= hi; bit++) {
-        if (value & 1 << bit) buf[bit >> 3] |= 128 >> (bit & 7);
-      }
-      return b.bitString(buf, 7 - (hi & 7));
+      var c = _namedBitsToContent(value);
+      if (c == null) throw _err("c509/non-invertible", "a keyUsage value must be a positive integer within the 9 defined bits");
+      return b.bitString(c.bytes, c.unusedBits);
     }
     function _reconExtensions(exts) {
       var items = exts.map(function(ext) {
@@ -7760,8 +8392,14 @@ var require_schema_c509 = __commonJS({
     }
     var SIG_ALG_TO_INT = { ecdsaWithSHA256: 0, ecdsaWithSHA384: 1, ecdsaWithSHA512: 2 };
     var PK_ALG_TO_INT = { rsaEncryption: 0, "ecPublicKey|prime256v1": 1, "ecPublicKey|secp384r1": 2, "ecPublicKey|secp521r1": 3 };
-    var ATTR_TO_INT = { commonName: 1, surname: 2, serialNumber: 3, countryName: 4, localityName: 6, stateOrProvinceName: 7, organizationName: 8, organizationalUnitName: 9, title: 10 };
-    var EXT_TO_INT = { subjectKeyIdentifier: 1, keyUsage: 2, subjectAltName: 3, basicConstraints: 4, authorityKeyIdentifier: 10 };
+    var ATTR_TO_INT = {};
+    Object.keys(ATTR_BY_INT).forEach(function(k) {
+      ATTR_TO_INT[ATTR_BY_INT[k]] = Number(k);
+    });
+    var EXT_TO_INT = {};
+    Object.keys(EXT_BY_INT).forEach(function(k) {
+      if (EXT_COMPACT[EXT_BY_INT[k]]) EXT_TO_INT[EXT_BY_INT[k]] = Number(k);
+    });
     function _minBytes(n) {
       if (n < 0n) throw _err("c509/bad-serial", "a ~biguint value must be non-negative");
       if (n === 0n) return Buffer.alloc(0);
@@ -7812,12 +8450,12 @@ var require_schema_c509 = __commonJS({
       var items = [];
       exts.forEach(function(ext) {
         var ei = EXT_TO_INT[ext.name];
-        if (ei !== void 0) {
+        var compact = ei !== void 0 && Buffer.isBuffer(ext.value) ? _tryCompactExtValue(ext.name, ext.value) : null;
+        if (compact != null) {
           items.push(cbor.build.int(BigInt(ext.critical ? -ei : ei)));
-          if (!Buffer.isBuffer(ext.value)) throw _err("c509/non-invertible", "extension " + ext.name + " has no byte-string value to encode");
-          items.push(cbor.build.byteString(ext.value));
+          items.push(compact);
         } else {
-          items.push(cbor.build.byteString(asn1.encodeOidContent(ext.oid)));
+          items.push(cbor.build.byteString(asn1.encodeOidContent(ext.oid || oid.byName(ext.name))));
           if (!Buffer.isBuffer(ext.value)) throw _err("c509/non-invertible", "extension " + (ext.oid || ext.name) + " has no byte-string value to encode");
           var bs = cbor.build.byteString(ext.value);
           items.push(ext.critical ? cbor.build.array([bs]) : bs);
@@ -7894,11 +8532,7 @@ var require_schema_c509 = __commonJS({
       } catch (_e) {
         return null;
       }
-      var total = bs.bytes.length * 8 - bs.unusedBits, value = 0;
-      for (var bit = 0; bit < total && bit < 31; bit++) {
-        if (bs.bytes[bit >> 3] & 128 >> (bit & 7)) value |= 1 << bit;
-      }
-      return value > 0 && value <= 511 ? value : null;
+      return _namedBitsFromContent(bs.bytes, bs.unusedBits);
     }
     var _NO_EXPIRY = Date.UTC(9999, 11, 31, 23, 59, 59);
     var NODE_TO_WEBCRYPTO = { "prime256v1": "P-256", "secp384r1": "P-384", "secp521r1": "P-521" };