wip

Author: peacekeeper

src/main/java/com/danubetech/dataintegrity/signer/DataIntegrityProofLdSigner.java

@@ -2,15 +2,11 @@
 
 import com.danubetech.dataintegrity.DataIntegrityProof;
 import com.danubetech.dataintegrity.canonicalizer.Canonicalizer;
-import com.danubetech.dataintegrity.canonicalizer.JCSCanonicalizer;
 import com.danubetech.dataintegrity.canonicalizer.RDFC10Canonicalizer;
-import com.danubetech.dataintegrity.canonicalizer.URDNA2015Canonicalizer;
 import com.danubetech.dataintegrity.suites.DataIntegrityProofDataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
-import com.danubetech.dataintegrity.suites.Ed25519Signature2020DataIntegritySuite;
 import com.danubetech.keyformats.crypto.ByteSigner;
 import com.danubetech.keyformats.crypto.impl.Ed25519_EdDSA_PrivateKeySigner;
-import com.danubetech.keyformats.jose.JWSAlgorithm;
 import io.ipfs.multibase.Multibase;
 
 import java.security.GeneralSecurityException;
@@ -29,22 +25,32 @@ public DataIntegrityProofLdSigner() {
         this((ByteSigner) null);
     }
 
-    public Canonicalizer getCanonicalizer() {
-        return RDFC10Canonicalizer.getInstance();
+    public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
+        String cryptosuite = dataIntegrityProof.getCryptosuite();
+        if (cryptosuite == null) return RDFC10Canonicalizer.getInstance();
+        return DataIntegrityProofDataIntegritySuite.findCanonicalizerByCryptosuite(cryptosuite);
     }
 
     public static void sign(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> ldProofBuilder, byte[] signingInput, ByteSigner signer) throws GeneralSecurityException {
 
         // sign
 
         String proofValue;
+        String cryptosuite;
+
+        cryptosuite = ldProofBuilder.build().getCryptosuite();
+        if (cryptosuite != null) {
+        } else {
+            cryptosuite = DataIntegrityProofDataIntegritySuite.findDefaultCryptosuiteByJwsAlgorithm(signer.getAlgorithm());
+        }
 
         byte[] bytes = signer.sign(signingInput, signer.getAlgorithm());
         proofValue = Multibase.encode(Multibase.Base.Base58BTC, bytes);
 
         // done
 
         ldProofBuilder.proofValue(proofValue);
+        ldProofBuilder.cryptosuite(cryptosuite);
     }
 
     @Override

src/main/java/com/danubetech/dataintegrity/signer/LdSigner.java

@@ -89,7 +89,7 @@ public DataIntegrityProof sign(JsonLDObject jsonLdObject, boolean addToJsonLdObj
 
         // obtain the canonicalized document
 
-        byte[] canonicalizationResult = this.getCanonicalizer().canonicalize(dataIntegrityProof, jsonLdObject);
+        byte[] canonicalizationResult = this.getCanonicalizer(dataIntegrityProof).canonicalize(dataIntegrityProof, jsonLdObject);
 
         // sign
 
@@ -127,7 +127,7 @@ public DataIntegritySuite getDataIntegritySuite() {
         return this.dataIntegritySuite;
     }
 
-    public abstract Canonicalizer getCanonicalizer();
+    public abstract Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof);
 
     /*
      * Getters and setters

src/main/java/com/danubetech/dataintegrity/suites/DataIntegrityProofDataIntegritySuite.java

@@ -20,25 +20,12 @@ public class DataIntegrityProofDataIntegritySuite extends DataIntegritySuite {
 			"eddsa-jcs-2022", JCSCanonicalizer.getInstance()
 	);
 
-	private static final Map<String, Map<KeyTypeName, String>> JWS_ALGORITHM_BY_CRYPTOSUITE_AND_KEY_TYPE_NAME = Map.of(
-			"ecdsa-rdfc-2019", Map.of(
-					KeyTypeName.secp256k1, JWSAlgorithm.ES256K,
-					KeyTypeName.P_256, JWSAlgorithm.ES256,
-					KeyTypeName.P_384, JWSAlgorithm.ES384,
-					KeyTypeName.P_521, JWSAlgorithm.ES512
-			),
-			"ecdsa-jcs-2019", Map.of(
-					KeyTypeName.Ed25519, JWSAlgorithm.EdDSA
-			),
-			"eddsa-rdfc-2022", Map.of(
-					KeyTypeName.secp256k1, JWSAlgorithm.ES256K,
-					KeyTypeName.P_256, JWSAlgorithm.ES256,
-					KeyTypeName.P_384, JWSAlgorithm.ES384,
-					KeyTypeName.P_521, JWSAlgorithm.ES512
-			),
-			"eddsa-jcs-2022", Map.of(
-					KeyTypeName.Ed25519, JWSAlgorithm.EdDSA
-			)
+	private static final Map<String, List<String>> CRYPTOSUITES_BY_JWS_ALGORITHM = Map.of(
+			JWSAlgorithm.EdDSA, List.of("eddsa-rdfc-2022", "eddsa-jcs-2022"),
+			JWSAlgorithm.ES256K, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019"),
+			JWSAlgorithm.ES256, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019"),
+			JWSAlgorithm.ES384, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019"),
+			JWSAlgorithm.ES512, List.of("ecdsa-rdfc-2019", "ecdsa-jcs-2019")
 	);
 
 	DataIntegrityProofDataIntegritySuite() {
@@ -52,4 +39,17 @@ public class DataIntegrityProofDataIntegritySuite extends DataIntegritySuite {
 						KeyTypeName.P_521, List.of(JWSAlgorithm.ES512)),
                 List.of(LDSecurityContexts.JSONLD_CONTEXT_W3ID_DATAINTEGRITY_V2));
 	}
+
+	public static Canonicalizer findCanonicalizerByCryptosuite(String cryptosuite) {
+		return CANONICALIZERS_BY_CRYPTOSUITE.get(cryptosuite);
+	}
+
+	public static List<String> findCryptosuitesByJwsAlgorithm(String jwsAlgorithm) {
+		return CRYPTOSUITES_BY_JWS_ALGORITHM.get(jwsAlgorithm);
+	}
+
+	public static String findDefaultCryptosuiteByJwsAlgorithm(String jwsAlgorithm) {
+		List<String> foundCryptosuiteByJwsAlgorithm = findCryptosuitesByJwsAlgorithm(jwsAlgorithm);
+		return foundCryptosuiteByJwsAlgorithm == null ? null : foundCryptosuiteByJwsAlgorithm.get(0);
+	}
 }