@sphereon/ssi-sdk-ext.x509-utils 0.28.1-feature.jose.vcdm.52 → 0.28.1-feature.oyd.cmsm.improv.20

package/src/x509/rsa-signer.ts

@@ -1,13 +1,9 @@
-// @ts-ignore
 import * as u8a from 'uint8arrays'
-const { fromString, toString } = u8a
-import type { HashAlgorithm, KeyVisibility } from '../types'
+import { HashAlgorithm, KeyVisibility } from '../types'
 import { globalCrypto } from './crypto'
 import { cryptoSubtleImportRSAKey, RSAEncryptionSchemes, RSASignatureSchemes } from './rsa-key'
 import { PEMToJwk } from './x509-utils'
-import type { JsonWebKey } from '@sphereon/ssi-types'
-// @ts-ignore
-import { CryptoKey, RsaPssParams, AlgorithmIdentifier } from 'node'
+
 export class RSASigner {
   private readonly hashAlgorithm: HashAlgorithm
   private readonly jwk: JsonWebKey
@@ -50,7 +46,7 @@ export class RSASigner {
 
   private bufferToString(buf: ArrayBuffer) {
     const uint8Array = new Uint8Array(buf)
-    return toString(uint8Array, 'base64url') // Needs to be base64url for JsonWebSignature2020. Don't change!
+    return u8a.toString(uint8Array, 'base64url') // Needs to be base64url for JsonWebSignature2020. Don't change!
   }
 
   public async sign(data: Uint8Array): Promise<string> {
@@ -68,7 +64,7 @@ export class RSASigner {
   public async verify(data: string | Uint8Array, signature: string): Promise<boolean> {
     const jws = signature.includes('.') ? signature.split('.')[2] : signature
 
-    const input = typeof data == 'string' ? fromString(data, 'utf-8') : data
+    const input = typeof data == 'string' ? u8a.fromString(data, 'utf-8') : data
 
     let key = await this.getKey()
     if (!key.usages.includes('verify')) {
@@ -78,7 +74,7 @@ export class RSASigner {
       delete verifyJwk.key_ops
       key = await cryptoSubtleImportRSAKey(verifyJwk, this.scheme, this.hashAlgorithm)
     }
-    const verificationResult = await globalCrypto(false).subtle.verify(this.getImportParams(), key, fromString(jws, 'base64url'), input)
+    const verificationResult = await globalCrypto(false).subtle.verify(this.getImportParams(), key, u8a.fromString(jws, 'base64url'), input)
     return verificationResult
   }
 }

package/src/x509/x509-utils.ts

@@ -1,13 +1,10 @@
 import { X509Certificate } from '@peculiar/x509'
 import { Certificate } from 'pkijs'
-// @ts-ignore
 import * as u8a from 'uint8arrays'
-const { fromString, toString } = u8a
 // @ts-ignore
 import keyto from '@trust/keyto'
-import type { KeyVisibility } from '../types'
+import { KeyVisibility } from '../types'
 
-import type { JsonWebKey } from '@sphereon/ssi-types'
 // Based on (MIT licensed):
 // https://github.com/hildjj/node-posh/blob/master/lib/index.js
 export function pemCertChainTox5c(cert: string, maxDepth?: number): string[] {
@@ -60,7 +57,7 @@ export const pemOrDerToX509Certificate = (cert: string | Uint8Array | X509Certif
   if (!DER) {
     throw Error('Invalid cert input value supplied. PEM, DER, Bytes and X509Certificate object are supported')
   }
-  return Certificate.fromBER(fromString(DER, 'base64pad'))
+  return Certificate.fromBER(u8a.fromString(DER, 'base64pad'))
 }
 
 export const areCertificatesEqual = (cert1: Certificate, cert2: Certificate): boolean => {
@@ -133,7 +130,7 @@ export function PEMToBinary(pem: string): Uint8Array {
     .replace(/-----END [^-]+-----[^]*$/, '')
     .replace(/\s/g, '')
 
-  return fromString(pemContents, 'base64pad')
+  return u8a.fromString(pemContents, 'base64pad')
 }
 
 /**
@@ -143,7 +140,7 @@ export function PEMToBinary(pem: string): Uint8Array {
  */
 export const base64ToHex = (input: string, inputEncoding?: 'base64' | 'base64pad' | 'base64url' | 'base64urlpad') => {
   const base64NoNewlines = input.replace(/[^0-9A-Za-z_\-~\/+=]*/g, '')
-  return toString(fromString(base64NoNewlines, inputEncoding ? inputEncoding : 'base64pad'), 'base16')
+  return u8a.toString(u8a.fromString(base64NoNewlines, inputEncoding ? inputEncoding : 'base64pad'), 'base16')
 }
 
 export const hexToBase64 = (input: number | object | string, targetEncoding?: 'base64' | 'base64pad' | 'base64url' | 'base64urlpad'): string => {
@@ -151,7 +148,7 @@ export const hexToBase64 = (input: number | object | string, targetEncoding?: 'b
   if (hex.length % 2 === 1) {
     hex = `0${hex}`
   }
-  return toString(fromString(hex, 'base16'), targetEncoding ? targetEncoding : 'base64pad')
+  return u8a.toString(u8a.fromString(hex, 'base16'), targetEncoding ? targetEncoding : 'base64pad')
 }
 
 export const hexToPEM = (hex: string, type: KeyVisibility): string => {

package/src/x509/x509-validator.ts

@@ -6,9 +6,7 @@ import { JWK } from '@sphereon/ssi-types'
 import x509 from 'js-x509-utils'
 import { AltName, AttributeTypeAndValue, Certificate, CryptoEngine, getCrypto, id_SubjectAltName, setEngine } from 'pkijs'
 import { container } from 'tsyringe'
-// @ts-ignore
 import * as u8a from 'uint8arrays'
-const { fromString, toString } = u8a
 import { globalCrypto } from './crypto'
 import { areCertificatesEqual, derToPEM, pemOrDerToX509Certificate } from './x509-utils'
 
@@ -307,7 +305,6 @@ export type ParsedCertificate = {
   publicKeyInfo: SubjectPublicKeyInfo
   publicKeyJwk?: JWK
   publicKeyRaw: Uint8Array
-  // @ts-ignore
   publicKeyAlgorithm: Algorithm
   certificateInfo: CertificateInfo
   certificate: Certificate
@@ -519,10 +516,10 @@ const getDNString = (typesAndValues: AttributeTypeAndValue[]): string => {
 export const getCertificateSubjectPublicKeyJWK = async (pemOrDerCert: string | Uint8Array | Certificate): Promise<JWK> => {
   const pemOrDerStr =
     typeof pemOrDerCert === 'string'
-      ? toString(fromString(pemOrDerCert, 'base64pad'), 'base64pad')
+      ? u8a.toString(u8a.fromString(pemOrDerCert, 'base64pad'), 'base64pad')
       : pemOrDerCert instanceof Uint8Array
-      ? toString(pemOrDerCert, 'base64pad')
-      : toString(fromString(pemOrDerCert.toString('base64'), 'base64pad'), 'base64pad')
+      ? u8a.toString(pemOrDerCert, 'base64pad')
+      : u8a.toString(u8a.fromString(pemOrDerCert.toString('base64'), 'base64pad'), 'base64pad')
   const pem = derToPEM(pemOrDerStr)
   const certificate = pemOrDerToX509Certificate(pem)
   var jwk: JWK | undefined