@sphereon/ssi-sdk-ext.key-utils 0.34.1-feature.SSISDK.65.redirect.fix.260 → 0.34.1-feature.SSISDK.70.integrate.digidentity.307

package/src/functions.ts

@@ -1,7 +1,7 @@
 import { randomBytes } from '@ethersproject/random'
 // Do not change these require statements to imports before we change to ESM. Breaks external CJS packages depending on this module
 import { bls12_381 } from '@noble/curves/bls12-381'
-import { ed25519 } from '@noble/curves/ed25519'
+import { ed25519, x25519 } from '@noble/curves/ed25519'
 import { p256 } from '@noble/curves/p256'
 import { p384 } from '@noble/curves/p384'
 import { p521 } from '@noble/curves/p521'
@@ -120,14 +120,20 @@ export async function importProvidedOrGeneratedKey(
   // @ts-ignore
   const type = args.options?.type ?? args.options?.key?.type ?? args.options?.keyType ?? 'Secp256r1'
   const key = args?.options?.key
-  // Make sure x509 options are also set on the metadata as that is what the kms will look for
-  if (args.options?.x509 && key) {
+  if (key) {
     key.meta = {
-      ...key.meta,
-      x509: {
-        ...args.options.x509,
-        ...key.meta?.x509,
-      },
+      providerName: args.providerName,
+    }
+
+    // Make sure x509 options are also set on the metadata as that is what the kms will look for
+    if (args.options?.x509) {
+      key.meta = {
+        ...key.meta,
+        x509: {
+          ...args.options.x509,
+          ...key.meta?.x509,
+        },
+      }
     }
   }
 
@@ -367,7 +373,7 @@ export function rsaJwkToRawHexKey(jwk: JsonWebKey): string {
     // We are converting from base64 to base64url to be sure. The spec uses base64url, but in the wild we sometimes encounter a base64 string
     const modulus = fromString(jwk.n.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''), 'base64url') // 'n' is the modulus
     const exponent = fromString(jwk.e.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''), 'base64url') // 'e' is the exponent
-  
+
     return toString(modulus, 'hex') + toString(exponent, 'hex')*/
 }
 
@@ -423,6 +429,17 @@ function octJwkToRawHexKey(jwk: JsonWebKey): string {
   return toString(key, 'hex')
 }
 
+export function x25519PublicHexFromPrivateHex(privateKeyHex: string): string {
+  if (!/^[0-9a-fA-F]{64}$/.test(privateKeyHex)) {
+    throw new Error('Private key must be 32-byte hex (64 chars)')
+  }
+
+  const priv = Uint8Array.from(Buffer.from(privateKeyHex, 'hex'))
+  const pub = x25519.getPublicKey(priv)
+
+  return Buffer.from(pub).toString('hex')
+}
+
 /**
  * Determines the use param based upon the key/signature type or supplied use value.
  *

package/src/types/key-util-types.ts

@@ -30,6 +30,7 @@ export interface X509Opts {
 }
 
 export interface IImportProvidedOrGeneratedKeyArgs {
+  providerName: string
   kms?: string
   alias?: string
   options?: IKeyOpts