feat: More work on Schnorr signature support

peacekeeper · peacekeeper · commit cb8655af1cbe · 2025-02-28T00:48:10.000+01:00
diff --git a/src/main/java/com/danubetech/dataintegrity/signer/DataIntegrityProofLdSigner.java b/src/main/java/com/danubetech/dataintegrity/signer/DataIntegrityProofLdSigner.java
@@ -6,7 +6,6 @@
 import com.danubetech.dataintegrity.suites.DataIntegrityProofDataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import com.danubetech.keyformats.crypto.ByteSigner;
-import com.danubetech.keyformats.crypto.impl.Ed25519_EdDSA_PrivateKeySigner;
 import io.ipfs.multibase.Multibase;
 
 import java.security.GeneralSecurityException;
@@ -17,29 +16,25 @@ public DataIntegrityProofLdSigner(ByteSigner signer) {
         super(DataIntegritySuites.DATA_INTEGRITY_SUITE_DATAINTEGRITYPROOF, signer);
     }
 
-    public DataIntegrityProofLdSigner(byte[] privateKey) {
-        this(new Ed25519_EdDSA_PrivateKeySigner(privateKey));
-    }
-
     public DataIntegrityProofLdSigner() {
         this((ByteSigner) null);
     }
 
     public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         String cryptosuite = dataIntegrityProof.getCryptosuite();
         if (cryptosuite == null) return RDFC10Canonicalizer.getInstance();
-        return DataIntegrityProofDataIntegritySuite.findCanonicalizerByCryptosuite(cryptosuite);
+        Canonicalizer canonicalizer = DataIntegrityProofDataIntegritySuite.findCanonicalizerByCryptosuite(cryptosuite);
+        if (canonicalizer == null) throw new IllegalArgumentException("Unknown cryptosuite: " + cryptosuite);
+        return canonicalizer;
     }
 
-    public static void sign(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> ldProofBuilder, byte[] signingInput, ByteSigner signer) throws GeneralSecurityException {
+    public static void sign(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> ldProofBuilder, byte[] signingInput, ByteSigner signer, String cryptosuite) throws GeneralSecurityException {
 
         // determine algorithm and cryptosuite
 
         String algorithm;
-        String cryptosuite;
 
         algorithm = signer.getAlgorithm();
-        cryptosuite = ldProofBuilder.build().getCryptosuite();
         if (cryptosuite != null) {
             if (! DataIntegrityProofDataIntegritySuite.findCryptosuitesByJwsAlgorithm(algorithm).contains(cryptosuite)) {
                 throw new GeneralSecurityException("Algorithm " + algorithm + " is not supported by cryptosuite " + cryptosuite);
@@ -63,6 +58,6 @@ public static void sign(DataIntegrityProof.Builder<? extends DataIntegrityProof.
 
     @Override
     public void sign(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> ldProofBuilder, byte[] signingInput) throws GeneralSecurityException {
-        sign(ldProofBuilder, signingInput, this.getSigner());
+        sign(ldProofBuilder, signingInput, this.getSigner(), this.getCryptosuite());
     }
 }
diff --git a/src/main/java/com/danubetech/dataintegrity/signer/EcdsaKoblitzSignature2016LdSigner.java b/src/main/java/com/danubetech/dataintegrity/signer/EcdsaKoblitzSignature2016LdSigner.java
@@ -14,7 +14,7 @@
 import com.danubetech.dataintegrity.suites.EcdsaKoblitzSignature2016DataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import com.danubetech.dataintegrity.util.JWSUtil;
-import org.bitcoinj.core.ECKey;
+import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 import java.util.Collections;
diff --git a/src/main/java/com/danubetech/dataintegrity/signer/EcdsaSecp256k1Signature2019LdSigner.java b/src/main/java/com/danubetech/dataintegrity/signer/EcdsaSecp256k1Signature2019LdSigner.java
@@ -14,7 +14,7 @@
 import com.nimbusds.jose.JWSHeader;
 import com.nimbusds.jose.JWSSigner;
 import com.nimbusds.jose.util.Base64URL;
-import org.bitcoinj.core.ECKey;
+import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 import java.util.Collections;
diff --git a/src/main/java/com/danubetech/dataintegrity/signer/JcsEcdsaSecp256k1Signature2019LdSigner.java b/src/main/java/com/danubetech/dataintegrity/signer/JcsEcdsaSecp256k1Signature2019LdSigner.java
@@ -10,7 +10,7 @@
 import com.danubetech.dataintegrity.suites.JcsEcdsaSecp256K1Signature2019DataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import io.ipfs.multibase.Base58;
-import org.bitcoinj.core.ECKey;
+import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 import java.util.Map;
diff --git a/src/main/java/com/danubetech/dataintegrity/signer/LdSigner.java b/src/main/java/com/danubetech/dataintegrity/signer/LdSigner.java
@@ -87,6 +87,10 @@ public DataIntegrityProof sign(JsonLDObject jsonLdObject, boolean addToJsonLdObj
                 .previousProof(this.getPreviousProof())
                 .build();
 
+        // add missing context(s)
+
+        loadMissingContext(jsonLdObject);
+
         // obtain the canonicalized document
 
         byte[] canonicalizationResult = this.getCanonicalizer(dataIntegrityProof).canonicalize(dataIntegrityProof, jsonLdObject);
@@ -103,7 +107,6 @@ public DataIntegrityProof sign(JsonLDObject jsonLdObject, boolean addToJsonLdObj
         // add proof to JSON-LD
 
         if (addToJsonLdObject) dataIntegrityProof.addToJsonLDObject(jsonLdObject);
-        loadMissingContext(jsonLdObject);
 
         // done
 
diff --git a/src/main/java/com/danubetech/dataintegrity/suites/DataIntegrityProofDataIntegritySuite.java b/src/main/java/com/danubetech/dataintegrity/suites/DataIntegrityProofDataIntegritySuite.java
@@ -14,10 +14,12 @@
 public class DataIntegrityProofDataIntegritySuite extends DataIntegritySuite {
 
 	private static final Map<String, Canonicalizer> CANONICALIZERS_BY_CRYPTOSUITE = Map.of(
+			"eddsa-rdfc-2022", RDFC10Canonicalizer.getInstance(),
+			"eddsa-jcs-2022", JCSCanonicalizer.getInstance(),
 			"ecdsa-rdfc-2019", RDFC10Canonicalizer.getInstance(),
 			"ecdsa-jcs-2019", JCSCanonicalizer.getInstance(),
-			"eddsa-rdfc-2022", RDFC10Canonicalizer.getInstance(),
-			"eddsa-jcs-2022", JCSCanonicalizer.getInstance()
+			"schnorr-secp256k1-rdfc-2025", RDFC10Canonicalizer.getInstance(),
+			"schnorr-secp256k1-jcs-2025", JCSCanonicalizer.getInstance()
 	);
 
 	private static final Map<String, List<String>> CRYPTOSUITES_BY_JWS_ALGORITHM = Map.of(
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/BbsBlsSignature2020LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/BbsBlsSignature2020LdVerifier.java
@@ -27,7 +27,7 @@ public BbsBlsSignature2020LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return URDNA2015Canonicalizer.getInstance();
     }
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/DataIntegrityProofLdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/DataIntegrityProofLdVerifier.java
@@ -1,20 +1,14 @@
 package com.danubetech.dataintegrity.verifier;
 
 import com.danubetech.dataintegrity.DataIntegrityProof;
-import com.danubetech.dataintegrity.adapter.JWSVerifierAdapter;
 import com.danubetech.dataintegrity.canonicalizer.Canonicalizer;
 import com.danubetech.dataintegrity.canonicalizer.RDFC10Canonicalizer;
 import com.danubetech.dataintegrity.suites.DataIntegrityProofDataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
-import com.danubetech.dataintegrity.util.JWSUtil;
 import com.danubetech.keyformats.crypto.ByteVerifier;
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.JWSObject;
-import com.nimbusds.jose.JWSVerifier;
+import io.ipfs.multibase.Multibase;
 
 import java.security.GeneralSecurityException;
-import java.text.ParseException;
 
 public class DataIntegrityProofLdVerifier extends LdVerifier<DataIntegrityProofDataIntegritySuite> {
 
@@ -26,30 +20,37 @@ public DataIntegrityProofLdVerifier() {
         this(null);
     }
 
-    public Canonicalizer getCanonicalizer() {
-        return RDFC10Canonicalizer.getInstance();
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
+        String cryptosuite = dataIntegrityProof.getCryptosuite();
+        if (cryptosuite == null) return RDFC10Canonicalizer.getInstance();
+        Canonicalizer canonicalizer = DataIntegrityProofDataIntegritySuite.findCanonicalizerByCryptosuite(cryptosuite);
+        if (canonicalizer == null) throw new IllegalArgumentException("Unknown cryptosuite: " + cryptosuite);
+        return canonicalizer;
     }
 
     public static boolean verify(byte[] signingInput, DataIntegrityProof dataIntegrityProof, ByteVerifier verifier) throws GeneralSecurityException {
 
-        // build the JWS and verify
+        // determine algorithm and cryptosuite
 
-        String jws = dataIntegrityProof.getJws();
-        if (jws == null) throw new GeneralSecurityException("No 'jws' in proof.");
+        String cryptosuite = dataIntegrityProof.getCryptosuite();
+        if (cryptosuite == null) throw new GeneralSecurityException("No cryptosuite in data integrity proof: " + dataIntegrityProof);
 
-        boolean verify;
+        String algorithm;
 
-        try {
+        algorithm = verifier.getAlgorithm();
+        if (! DataIntegrityProofDataIntegritySuite.findCryptosuitesByJwsAlgorithm(algorithm).contains(cryptosuite)) {
+            throw new GeneralSecurityException("Algorithm " + algorithm + " is not supported by cryptosuite " + cryptosuite);
+        }
 
-            JWSObject detachedJwsObject = JWSObject.parse(jws);
-            byte[] jwsSigningInput = JWSUtil.getJwsSigningInput(detachedJwsObject.getHeader(), signingInput);
+        // verify
 
-            JWSVerifier jwsVerifier = new JWSVerifierAdapter(verifier, JWSAlgorithm.parse(verifier.getAlgorithm()));
-            verify = jwsVerifier.verify(detachedJwsObject.getHeader(), jwsSigningInput, detachedJwsObject.getSignature());
-        } catch (JOSEException | ParseException ex) {
+        String proofValue = dataIntegrityProof.getProofValue();
+        if (proofValue == null) throw new GeneralSecurityException("No 'proofValue' in proof.");
 
-            throw new GeneralSecurityException("JOSE verification problem: " + ex.getMessage(), ex);
-        }
+        boolean verify;
+
+        byte[] bytes = Multibase.decode(proofValue);
+        verify = verifier.verify(signingInput, bytes, algorithm);
 
         // done
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/EcdsaKoblitzSignature2016LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/EcdsaKoblitzSignature2016LdVerifier.java
@@ -13,7 +13,7 @@
 import com.danubetech.dataintegrity.suites.EcdsaKoblitzSignature2016DataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import com.danubetech.dataintegrity.util.JWSUtil;
-import org.bitcoinj.core.ECKey;
+import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 import java.text.ParseException;
@@ -32,7 +32,7 @@ public EcdsaKoblitzSignature2016LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return URDNA2015Canonicalizer.getInstance();
     }
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/EcdsaSecp256k1Signature2019LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/EcdsaSecp256k1Signature2019LdVerifier.java
@@ -13,7 +13,7 @@
 import com.nimbusds.jose.JWSAlgorithm;
 import com.nimbusds.jose.JWSObject;
 import com.nimbusds.jose.JWSVerifier;
-import org.bitcoinj.core.ECKey;
+import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 import java.text.ParseException;
@@ -32,7 +32,7 @@ public EcdsaSecp256k1Signature2019LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return URDNA2015Canonicalizer.getInstance();
     }
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/Ed25519Signature2018LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/Ed25519Signature2018LdVerifier.java
@@ -31,7 +31,7 @@ public Ed25519Signature2018LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return URDNA2015Canonicalizer.getInstance();
     }
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/Ed25519Signature2020LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/Ed25519Signature2020LdVerifier.java
@@ -26,7 +26,7 @@ public Ed25519Signature2020LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return URDNA2015Canonicalizer.getInstance();
     }
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/JcsEcdsaSecp256k1Signature2019LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/JcsEcdsaSecp256k1Signature2019LdVerifier.java
@@ -10,7 +10,7 @@
 import com.danubetech.dataintegrity.suites.JcsEcdsaSecp256K1Signature2019DataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import io.ipfs.multibase.Base58;
-import org.bitcoinj.core.ECKey;
+import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 
@@ -28,7 +28,7 @@ public JcsEcdsaSecp256k1Signature2019LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return JCSCanonicalizer.getInstance();
     }
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/JcsEd25519Signature2020LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/JcsEd25519Signature2020LdVerifier.java
@@ -26,7 +26,7 @@ public JcsEd25519Signature2020LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return JCSCanonicalizer.getInstance();
     }
 
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/JsonWebSignature2020LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/JsonWebSignature2020LdVerifier.java
@@ -3,7 +3,7 @@
 import com.danubetech.dataintegrity.DataIntegrityProof;
 import com.danubetech.dataintegrity.adapter.JWSVerifierAdapter;
 import com.danubetech.dataintegrity.canonicalizer.Canonicalizer;
-import com.danubetech.dataintegrity.canonicalizer.JCSCanonicalizer;
+import com.danubetech.dataintegrity.canonicalizer.URDNA2015Canonicalizer;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import com.danubetech.dataintegrity.suites.JsonWebSignature2020DataIntegritySuite;
 import com.danubetech.dataintegrity.util.JWSUtil;
@@ -26,8 +26,8 @@ public JsonWebSignature2020LdVerifier() {
         this(null);
     }
 
-    public Canonicalizer getCanonicalizer() {
-        return JCSCanonicalizer.getInstance();
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
+        return URDNA2015Canonicalizer.getInstance();
     }
 
     public static boolean verify(byte[] signingInput, DataIntegrityProof dataIntegrityProof, ByteVerifier verifier) throws GeneralSecurityException {
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/LdVerifier.java
@@ -50,7 +50,7 @@ public boolean verify(JsonLDObject jsonLdObject, DataIntegrityProof dataIntegrit
 
         // obtain the canonicalized document
 
-        byte[] canonicalizationResult = this.getCanonicalizer().canonicalize(dataIntegrityProof, jsonLdObject);
+        byte[] canonicalizationResult = this.getCanonicalizer(dataIntegrityProof).canonicalize(dataIntegrityProof, jsonLdObject);
 
         // verify
 
@@ -77,7 +77,7 @@ public DataIntegritySuite getDataIntegritySuite() {
         return this.dataIntegritySuite;
     }
 
-    public abstract Canonicalizer getCanonicalizer();
+    public abstract Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof);
 
     /*
      * Getters and setters
diff --git a/src/main/java/com/danubetech/dataintegrity/verifier/RsaSignature2018LdVerifier.java b/src/main/java/com/danubetech/dataintegrity/verifier/RsaSignature2018LdVerifier.java
@@ -32,7 +32,7 @@ public RsaSignature2018LdVerifier() {
         this((ByteVerifier) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
         return URDNA2015Canonicalizer.getInstance();
     }
 
diff --git a/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_ecdsa_jcs_2019_Test.java b/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_ecdsa_jcs_2019_Test.java
@@ -0,0 +1,74 @@
+package com.danubetech.dataintegrity;
+
+import com.danubetech.dataintegrity.jsonld.LDSecurityContexts;
+import com.danubetech.dataintegrity.signer.DataIntegrityProofLdSigner;
+import com.danubetech.dataintegrity.suites.DataIntegritySuites;
+import com.danubetech.dataintegrity.verifier.DataIntegrityProofLdVerifier;
+import com.danubetech.keyformats.crypto.PrivateKeySigner;
+import com.danubetech.keyformats.crypto.PrivateKeySignerFactory;
+import com.danubetech.keyformats.crypto.PublicKeyVerifier;
+import com.danubetech.keyformats.crypto.PublicKeyVerifierFactory;
+import com.danubetech.keyformats.crypto.provider.Ed25519Provider;
+import com.danubetech.keyformats.crypto.provider.RandomProvider;
+import com.danubetech.keyformats.crypto.provider.SHA256Provider;
+import com.danubetech.keyformats.crypto.provider.impl.JavaRandomProvider;
+import com.danubetech.keyformats.crypto.provider.impl.JavaSHA256Provider;
+import com.danubetech.keyformats.crypto.provider.impl.TinkEd25519Provider;
+import com.danubetech.keyformats.jose.JWSAlgorithm;
+import com.danubetech.keyformats.jose.KeyTypeName;
+import foundation.identity.jsonld.JsonLDObject;
+import foundation.identity.jsonld.JsonLDUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.InputStreamReader;
+import java.util.Date;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JsonLdSignDataIntegrityProof_ecdsa_jcs_2019_Test {
+
+	@BeforeEach
+	public void before() {
+
+		RandomProvider.set(new JavaRandomProvider());
+		SHA256Provider.set(new JavaSHA256Provider());
+		Ed25519Provider.set(new TinkEd25519Provider());
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void testSign() throws Throwable {
+
+		JsonLDObject jsonLdObject = JsonLDObject.fromJson(new InputStreamReader(Objects.requireNonNull(JsonLdSignDataIntegrityProof_ecdsa_jcs_2019_Test.class.getResourceAsStream("input.jsonld"))));
+		jsonLdObject.setDocumentLoader(LDSecurityContexts.DOCUMENT_LOADER);
+
+		Date created = JsonLDUtils.DATE_FORMAT.parse("2017-10-24T05:33:31Z");
+		Date expires = JsonLDUtils.DATE_FORMAT.parse("2027-10-24T05:33:31Z");
+		String domain = "example.com";
+		String nonce = null;
+
+		PrivateKeySigner<?> privateKeySigner = PrivateKeySignerFactory.privateKeySignerForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256K, TestUtil.testSecp256k1PrivateKey);
+		DataIntegrityProofLdSigner signer = new DataIntegrityProofLdSigner(privateKeySigner);
+		signer.setCryptosuite("ecdsa-jcs-2019");
+		signer.setCreated(created);
+		signer.setExpires(expires);
+		signer.setDomain(domain);
+		signer.setNonce(nonce);
+		DataIntegrityProof dataIntegrityProof = signer.sign(jsonLdObject);
+
+		assertEquals(DataIntegritySuites.DATA_INTEGRITY_SUITE_DATAINTEGRITYPROOF.getTerm(), dataIntegrityProof.getType());
+		assertEquals(created, dataIntegrityProof.getCreated());
+		assertEquals(expires, dataIntegrityProof.getExpires());
+		assertEquals(domain, dataIntegrityProof.getDomain());
+		assertEquals(nonce, dataIntegrityProof.getNonce());
+		assertEquals("z3pQFkWcvLytVG47LWMjaoZFjW4NqyxL3SGyC6xKjqWpdTPj2Yzr92yT6b7eT3ty7EJALH8P4igra1k6G6oKFVDdE", dataIntegrityProof.getProofValue());
+
+		PublicKeyVerifier<?> publicKeyVerifier = PublicKeyVerifierFactory.publicKeyVerifierForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256K, TestUtil.testSecp256k1PublicKey);
+		DataIntegrityProofLdVerifier verifier = new DataIntegrityProofLdVerifier(publicKeyVerifier);
+		boolean verify = verifier.verify(jsonLdObject, dataIntegrityProof);
+		assertTrue(verify);
+	}
+}
diff --git a/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_ecdsa_rdfc_2019_Test.java b/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_ecdsa_rdfc_2019_Test.java
diff --git a/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_eddsa_jcs_2022_Test.java b/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_eddsa_jcs_2022_Test.java
diff --git a/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_eddsa_rdfc_2022_Test.java b/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_eddsa_rdfc_2022_Test.java
diff --git a/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_schnorr_secp256k1_jcs_2025_Test.java b/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_schnorr_secp256k1_jcs_2025_Test.java
diff --git a/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_schnorr_secp256k1_rdfc_2025_Test.java b/src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_schnorr_secp256k1_rdfc_2025_Test.java
diff --git a/src/test/java/com/danubetech/dataintegrity/JsonLdSignJsonWebSignatureTest.java b/src/test/java/com/danubetech/dataintegrity/JsonLdSignJsonWebSignatureTest.java
diff --git a/src/test/java/com/danubetech/dataintegrity/TestUtil.java b/src/test/java/com/danubetech/dataintegrity/TestUtil.java

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public BbsBlsSignature2020LdVerifier() {`
`27`	`27`	`this((ByteVerifier) null);`
`28`	`28`	`}`
`29`	`29`
`30`		`- public Canonicalizer getCanonicalizer() {`
	`30`	`+ public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {`
`31`	`31`	`return URDNA2015Canonicalizer.getInstance();`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`import com.danubetech.dataintegrity.suites.EcdsaKoblitzSignature2016DataIntegritySuite;`
`14`	`14`	`import com.danubetech.dataintegrity.suites.DataIntegritySuites;`
`15`	`15`	`import com.danubetech.dataintegrity.util.JWSUtil;`
`16`		`-import org.bitcoinj.core.ECKey;`
	`16`	`+import org.bitcoinj.crypto.ECKey;`
`17`	`17`
`18`	`18`	`import java.security.GeneralSecurityException;`
`19`	`19`	`import java.text.ParseException;`
`@@ -32,7 +32,7 @@ public EcdsaKoblitzSignature2016LdVerifier() {`
`32`	`32`	`this((ByteVerifier) null);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public Canonicalizer getCanonicalizer() {`
	`35`	`+ public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {`
`36`	`36`	`return URDNA2015Canonicalizer.getInstance();`
`37`	`37`	`}`
`38`	`38`