Skip to content

Commit f882823

Browse files
peacekeeperpeacekeeper
committed
fix: Fix Data Integrity contexts
1 parent 84e3350 commit f882823

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

‎src/main/java/com/danubetech/dataintegrity/jsonld/DataIntegrityContexts.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public class DataIntegrityContexts {
2222
public static final URI JSONLD_CONTEXT_W3ID_SECURITY_SUITES_ED25519_2020_V1 = URI.create("https://w3id.org/security/suites/ed25519-2020/v1");
2323
public static final URI JSONLD_CONTEXT_W3ID_SECURITY_SUITES_X25519_2019_V1 = URI.create("https://w3id.org/security/suites/x25519-2019/v1");
2424
public static final URI JSONLD_CONTEXT_W3ID_SECURITY_SUITES_JWS_2020_V1 = URI.create("https://w3id.org/security/suites/jws-2020/v1");
25-
public static final URI JSONLD_CONTEXT_W3ID_DATAINTEGRITY_V1 = URI.create("https://w3id.org/data-integrity/v1");
26-
public static final URI JSONLD_CONTEXT_W3ID_DATAINTEGRITY_V2 = URI.create("https://w3id.org/data-integrity/v2");
25+
public static final URI JSONLD_CONTEXT_W3ID_SECURITY_DATAINTEGRITY_V1 = URI.create("https://w3id.org/security/data-integrity/v1");
26+
public static final URI JSONLD_CONTEXT_W3ID_SECURITY_DATAINTEGRITY_V2 = URI.create("https://w3id.org/security/data-integrity/v2");
2727
public static final URI JSONLD_CONTEXT_W3ID_ZCAP_V1 = URI.create("https://w3id.org/zcap/v1");
2828
public static final URI JSONLD_CONTEXT_W3ID_JSON_LD_PATCH_V1 = URI.create("https://w3id.org/json-ld-patch/v1");
2929
public static final URI JSONLD_CONTEXT_W3C_2018_CREDENTIALS_V1 = URI.create("https://www.w3.org/2018/credentials/v1");
@@ -56,10 +56,10 @@ public class DataIntegrityContexts {
5656
JsonDocument.of(MediaType.JSON_LD, Objects.requireNonNull(DataIntegrityContexts.class.getResourceAsStream("security-suites-x25519-2019.jsonld"))));
5757
CONTEXTS.put(JSONLD_CONTEXT_W3ID_SECURITY_SUITES_JWS_2020_V1,
5858
JsonDocument.of(MediaType.JSON_LD, Objects.requireNonNull(DataIntegrityContexts.class.getResourceAsStream("security-suites-jws-2020.jsonld"))));
59-
CONTEXTS.put(JSONLD_CONTEXT_W3ID_DATAINTEGRITY_V1,
60-
JsonDocument.of(MediaType.JSON_LD, Objects.requireNonNull(DataIntegrityContexts.class.getResourceAsStream("dataintegrity-v1.jsonld"))));
61-
CONTEXTS.put(JSONLD_CONTEXT_W3ID_DATAINTEGRITY_V2,
62-
JsonDocument.of(MediaType.JSON_LD, Objects.requireNonNull(DataIntegrityContexts.class.getResourceAsStream("dataintegrity-v2.jsonld"))));
59+
CONTEXTS.put(JSONLD_CONTEXT_W3ID_SECURITY_DATAINTEGRITY_V1,
60+
JsonDocument.of(MediaType.JSON_LD, Objects.requireNonNull(DataIntegrityContexts.class.getResourceAsStream("security-dataintegrity-v1.jsonld"))));
61+
CONTEXTS.put(JSONLD_CONTEXT_W3ID_SECURITY_DATAINTEGRITY_V2,
62+
JsonDocument.of(MediaType.JSON_LD, Objects.requireNonNull(DataIntegrityContexts.class.getResourceAsStream("security-dataintegrity-v2.jsonld"))));
6363
CONTEXTS.put(JSONLD_CONTEXT_W3ID_ZCAP_V1,
6464
JsonDocument.of(MediaType.JSON_LD, Objects.requireNonNull(DataIntegrityContexts.class.getResourceAsStream("zcap-v1.jsonld"))));
6565
CONTEXTS.put(JSONLD_CONTEXT_W3ID_JSON_LD_PATCH_V1,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class DataIntegrityProofDataIntegritySuite extends DataIntegritySuite {
5757
KeyTypeName.P_256, List.of(JWSAlgorithm.ES256),
5858
KeyTypeName.P_384, List.of(JWSAlgorithm.ES384),
5959
KeyTypeName.P_521, List.of(JWSAlgorithm.ES512)),
60-
List.of(DataIntegrityContexts.JSONLD_CONTEXT_W3ID_DATAINTEGRITY_V2, DataIntegrityContexts.JSONLD_CONTEXT_W3C_CREDENTIALS_V2));
60+
List.of(DataIntegrityContexts.JSONLD_CONTEXT_W3ID_SECURITY_DATAINTEGRITY_V2, DataIntegrityContexts.JSONLD_CONTEXT_W3C_CREDENTIALS_V2));
6161
}
6262

6363
@Override

src/main/resources/com/danubetech/dataintegrity/jsonld/dataintegrity-v1.jsonld renamed to src/main/resources/com/danubetech/dataintegrity/jsonld/security-dataintegrity-v1.jsonld

File renamed without changes.

src/main/resources/com/danubetech/dataintegrity/jsonld/dataintegrity-v2.jsonld renamed to src/main/resources/com/danubetech/dataintegrity/jsonld/security-dataintegrity-v2.jsonld

File renamed without changes.

‎src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_bip340_jcs_2025_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void testSign() throws Throwable {
6565
assertEquals(expires, dataIntegrityProof.getExpires());
6666
assertEquals(domain, dataIntegrityProof.getDomain());
6767
assertEquals(nonce, dataIntegrityProof.getNonce());
68-
assertEquals("zagNFfDWE4qtEHA1zXZoiMqZfUnvYiH3Hgkt4MRAjaXZxdGWoJRccWJXFM1mf99R9QLuFHJauLDc3d3MChDmM9zx", dataIntegrityProof.getProofValue());
68+
assertEquals("z3XoNJWmxpCDif1xVm4H8mk2jRVyBRfTw6qsvv6Mkc83GGP1KjFWyxUPVFaP2QkTpnKAvan4iftNQkQj2JE68qUth", dataIntegrityProof.getProofValue());
6969

7070
PublicKeyVerifier<?> publicKeyVerifier = PublicKeyVerifierFactory.publicKeyVerifierForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256KS, TestKeys.testSecp256k1PublicKey);
7171
DataIntegrityProofLdVerifier verifier = new DataIntegrityProofLdVerifier(publicKeyVerifier);

‎src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_ecdsa_jcs_2019_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void testSign() throws Throwable {
6666
assertEquals(expires, dataIntegrityProof.getExpires());
6767
assertEquals(domain, dataIntegrityProof.getDomain());
6868
assertEquals(nonce, dataIntegrityProof.getNonce());
69-
assertEquals("z3fjKrnvGF7iqHTnmStoARrB78njaHbo3RqXUGE5MT3rVoeM5HwZDk9PD1ArsqKvJGx9pi54JQ9rHkdwL2pcD2cKy", dataIntegrityProof.getProofValue());
69+
assertEquals("z29wkTrpAo4xBn5URSov7wPNWWtaNyaq2Rjhh8EDzWfn47DAW9ogjvpiFP5XBEqWkFRUhyBPeJyv5knXXzxmYwCwh", dataIntegrityProof.getProofValue());
7070

7171
PublicKeyVerifier<?> publicKeyVerifier = PublicKeyVerifierFactory.publicKeyVerifierForKey(KeyTypeName.secp256k1, JWSAlgorithm.ES256K, TestKeys.testSecp256k1PublicKey);
7272
DataIntegrityProofLdVerifier verifier = new DataIntegrityProofLdVerifier(publicKeyVerifier);

‎src/test/java/com/danubetech/dataintegrity/JsonLdSignDataIntegrityProof_eddsa_jcs_2022_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void testSign() throws Throwable {
6666
assertEquals(expires, dataIntegrityProof.getExpires());
6767
assertEquals(domain, dataIntegrityProof.getDomain());
6868
assertEquals(nonce, dataIntegrityProof.getNonce());
69-
assertEquals("z4ZujDx63qCtAbTgLHK1brJuutprt9QTGPNkeybZKEnQTTHmrcso6RpqH5My8gYfUc5zD3cZozzP1kFHBtLDxwWQR", dataIntegrityProof.getProofValue());
69+
assertEquals("zGv8zDPJcKjTTaRgWS5iHJEVHxeQUSh7MZf3sYFSbZaocyBStJ6hS2FM5YoLeH1UxnEzvkA5kwgoVfgMM1iR9LE5", dataIntegrityProof.getProofValue());
7070

7171
PublicKeyVerifier<?> publicKeyVerifier = PublicKeyVerifierFactory.publicKeyVerifierForKey(KeyTypeName.Ed25519, JWSAlgorithm.EdDSA, TestKeys.testEd25519PublicKey);
7272
DataIntegrityProofLdVerifier verifier = new DataIntegrityProofLdVerifier(publicKeyVerifier);

0 commit comments

Comments
 (0)