chore: wip

Author: chrisbbreuer

src/algorithms/asymmetric/rsa.ts

@@ -1162,7 +1162,7 @@ export function setRsaPublicKey(n: BigInteger, e: BigInteger): {
       const d = decrypt(signature, key, true, false)
 
       return scheme.verify(digest, d, key.n.bitLength())
-    }
+    },
   }
 
   /**
@@ -1282,7 +1282,7 @@ export function setPrivateKey(
      *
      * @return the signature as a byte string.
      */
-    sign: function (md: any, scheme: any) {
+    sign(md: any, scheme: any) {
       /* Note: The internal implementation of RSA operations is being
         transitioned away from a PKCS#1 v1.5 hard-coded scheme. Some legacy
         code like the use of an encoding block identifier 'bt' will eventually
@@ -1310,24 +1310,24 @@ export function setPrivateKey(
     },
 
     /**
-   * Decrypts the given data with this private key. The decryption scheme
-   * must match the one used to encrypt the data.
-   *
-   * @param data the byte string to decrypt.
-   * @param scheme the decryption scheme to use:
-   *          'RSAES-PKCS1-V1_5' (default),
-   *          'RSA-OAEP',
-   *          'RAW', 'NONE', or null to perform raw RSA decryption.
-   * @param schemeOptions any scheme-specific options.
-   *
-   * @return the decrypted byte string.
-   */
-    decrypt: function (data: string, scheme: string, schemeOptions: any) {
+     * Decrypts the given data with this private key. The decryption scheme
+     * must match the one used to encrypt the data.
+     *
+     * @param data the byte string to decrypt.
+     * @param scheme the decryption scheme to use:
+     *          'RSAES-PKCS1-V1_5' (default),
+     *          'RSA-OAEP',
+     *          'RAW', 'NONE', or null to perform raw RSA decryption.
+     * @param schemeOptions any scheme-specific options.
+     *
+     * @return the decrypted byte string.
+     */
+    decrypt(data: string, scheme: string, schemeOptions: any) {
       if (typeof scheme === 'string') {
         scheme = scheme.toUpperCase()
       }
 
-        else if (scheme === undefined) {
+      else if (scheme === undefined) {
         scheme = 'RSAES-PKCS1-V1_5'
       }
 
@@ -1353,7 +1353,7 @@ export function setPrivateKey(
 
       // decode according to scheme
       return scheme.decode(d, key, false)
-    }
+    },
   }
 
   return key
@@ -1478,7 +1478,7 @@ export function privateKeyToAsn1(key: {
   ])
 }
 
-type PublicKeyCapture = {
+interface PublicKeyCapture {
   publicKeyModulus?: string
   publicKeyExponent?: Asn1Object
 }
@@ -1498,7 +1498,7 @@ export function publicKeyFromAsn1(obj?: Asn1Object): RSAKey {
     // get oid
     const oid = asn1.derToOid(capture.publicKeyOid)
     if (oid !== oids.rsaEncryption) {
-      var error = new Error('Cannot read public key. Unknown OID.')
+      const error = new Error('Cannot read public key. Unknown OID.')
       error.oid = oid
       throw error
     }

src/pki.ts

@@ -1,5 +1,4 @@
 import type { RSA } from './algorithms/asymmetric/rsa'
-import type { PemMessage } from './encoding/pem'
 import { privateKeyFromAsn1, privateKeyToAsn1, rsa } from './algorithms/asymmetric/rsa'
 /**
  * TypeScript implementation of a basic Public Key Infrastructure, including
@@ -10,7 +9,7 @@ import { privateKeyFromAsn1, privateKeyToAsn1, rsa } from './algorithms/asymmetr
  */
 import { asn1 } from './encoding/asn1'
 import { pem } from './encoding/pem'
-import { certificateToAsn1, CRIAttributesAsArray, getCertificationRequestInfo } from './x509'
+import { certificateExtensionsToAsn1, certificateToAsn1, CRIAttributesAsArray, getCertificationRequestInfo } from './x509'
 
 interface CustomError extends Error {
   headerType?: string
@@ -78,6 +77,7 @@ export function privateKeyInfoToPem(pki: any, maxline: number = 64): string {
 }
 
 export interface Pki {
+  certificateExtensionsToAsn1: typeof certificateExtensionsToAsn1
   certificateToAsn1: typeof certificateToAsn1
   CRIAttributesAsArray: typeof CRIAttributesAsArray
   getCertificationRequestInfo: typeof getCertificationRequestInfo
@@ -88,6 +88,7 @@ export interface Pki {
 }
 
 export const pki: Pki = {
+  certificateExtensionsToAsn1,
   certificateToAsn1,
   getCertificationRequestInfo,
   CRIAttributesAsArray,

src/utils/index.ts

@@ -1171,31 +1171,32 @@ export function bytesToIPv6(bytes: string): string | null {
       const idx = ip.length
       if (!last || idx !== last.end + 1) {
         zeroGroups.push({ start: idx, end: idx })
-      } else {
+      }
+      else {
         last.end = idx
-        if ((last.end - last.start) >
-          (zeroGroups[zeroMaxGroup].end - zeroGroups[zeroMaxGroup].start)) {
+        if ((last.end - last.start)
+          > (zeroGroups[zeroMaxGroup].end - zeroGroups[zeroMaxGroup].start)) {
           zeroMaxGroup = zeroGroups.length - 1
         }
       }
     }
-    ip.push(hex);
+    ip.push(hex)
   }
   if (zeroGroups.length > 0) {
     const group = zeroGroups[zeroMaxGroup]
     // only shorten group of length > 0
     if (group.end - group.start > 0) {
       ip.splice(group.start, group.end - group.start + 1, '')
       if (group.start === 0) {
-        ip.unshift('');
+        ip.unshift('')
       }
       if (group.end === 7) {
-        ip.push('');
+        ip.push('')
       }
     }
   }
 
-  return ip.join(':');
+  return ip.join(':')
 };
 
 export interface Util {