diff --git a/cip/cip30/src/main/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSigner.java b/cip/cip30/src/main/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSigner.java index a386c7cd..41b8f5e8 100644 --- a/cip/cip30/src/main/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSigner.java +++ b/cip/cip30/src/main/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSigner.java @@ -1,6 +1,7 @@ package com.bloxbean.cardano.client.cip.cip30; import co.nstant.in.cbor.model.ByteString; +import co.nstant.in.cbor.model.SimpleValue; import co.nstant.in.cbor.model.UnsignedInteger; import com.bloxbean.cardano.client.account.Account; import com.bloxbean.cardano.client.address.Address; @@ -20,14 +21,14 @@ public enum CIP30DataSigner { INSTANCE(); CIP30DataSigner() { - } /** * Sign and create DataSignature in CIP30's signData() format + * * @param addressBytes Address bytes - * @param payload payload bytes to sign - * @param signer signing account + * @param payload payload bytes to sign + * @param signer signing account * @return DataSignature * @throws DataSignError */ @@ -36,7 +37,39 @@ public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payl byte[] pvtKey = signer.privateKeyBytes(); byte[] pubKey = signer.publicKeyBytes(); - return signData(addressBytes, payload, pvtKey, pubKey); + return signData(addressBytes, payload, pvtKey, pubKey, false); + } + + /** + * Sign and create DataSignature in CIP30's signData() format + * + * @param addressBytes Address bytes + * @param payload payload bytes to sign + * @param signer signing account + * @param hashedPayload indicates if the payload is hashed + * @return DataSignature + * @throws DataSignError + */ + public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payload, @NonNull Account signer, boolean hashedPayload) + throws DataSignError { + byte[] pvtKey = signer.privateKeyBytes(); + byte[] pubKey = signer.publicKeyBytes(); + + return signData(addressBytes, payload, pvtKey, pubKey, hashedPayload); + } + + /** + * Sign and create DataSignature in CIP30's signData() format + * + * @param addressBytes Address bytes + * @param payload payload bytes to sign + * @param pvtKey private key bytes + * @param pubKey public key bytes to add + * @return DataSignature + * @throws DataSignError + */ + public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payload, @NonNull byte[] pvtKey, @NonNull byte[] pubKey) throws DataSignError { + return signData(addressBytes, payload, pvtKey, pubKey, false); } /** @@ -45,10 +78,11 @@ public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payl * @param payload payload bytes to sign * @param pvtKey private key bytes * @param pubKey public key bytes to add + * @param hashedPayload indicates if the payload is hashed * @return DataSignature * @throws DataSignError */ - public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payload, @NonNull byte[] pvtKey, @NonNull byte[] pubKey) + public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payload, @NonNull byte[] pvtKey, @NonNull byte[] pubKey, boolean hashedPayload) throws DataSignError { try { HeaderMap protectedHeaderMap = new HeaderMap() @@ -56,16 +90,20 @@ public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payl .keyId(addressBytes) .addOtherHeader(ADDRESS_KEY, new ByteString(addressBytes)); + HeaderMap unprotectedHeaderMap = new HeaderMap(); + if (hashedPayload) { + unprotectedHeaderMap.addOtherHeader("hashed", SimpleValue.TRUE); + } + Headers headers = new Headers() ._protected(new ProtectedHeaderMap(protectedHeaderMap)) - .unprotected(new HeaderMap()); + .unprotected(unprotectedHeaderMap); - COSESign1Builder coseSign1Builder = new COSESign1Builder(headers, payload, false); + COSESign1Builder coseSign1Builder = new COSESign1Builder(headers, payload, false, hashedPayload); SigStructure sigStructure = coseSign1Builder.makeDataToSign(); byte[] signature; - if (pvtKey.length >= 64) { //64 bytes expanded pvt key signature = Configuration.INSTANCE.getSigningProvider().signExtended(sigStructure.serializeAsBytes(), pvtKey); } else { //32 bytes pvt key @@ -74,7 +112,6 @@ public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payl COSESign1 coseSign1 = coseSign1Builder.build(signature); - //COSEKey COSEKey coseKey = new COSEKey() .keyType(OKP) //OKP .keyId(addressBytes) @@ -82,8 +119,10 @@ public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payl .addOtherHeader(CRV_KEY, new UnsignedInteger(CRV_Ed25519)) //crv Ed25519 .addOtherHeader(X_KEY, new ByteString(pubKey)); //x pub key used to sign sig_structure - return new DataSignature(HexUtil.encodeHexString(coseSign1.serializeAsBytes()), - HexUtil.encodeHexString(coseKey.serializeAsBytes())); + String sig = HexUtil.encodeHexString(coseSign1.serializeAsBytes()); + String key = HexUtil.encodeHexString(coseKey.serializeAsBytes()); + + return new DataSignature(sig, key); } catch (Exception e) { throw new DataSignError("Error signing data", e); } @@ -91,6 +130,7 @@ public DataSignature signData(@NonNull byte[] addressBytes, @NonNull byte[] payl /** * Verify CIP30 signData signature + * * @param dataSignature * @return true if verification is successful, otherwise false */ @@ -106,8 +146,9 @@ public boolean verify(@NonNull DataSignature dataSignature) { .verify(signature, sigStructure.serializeAsBytes(), pubKey); //Verify address - byte[] addressBytes = coseSign1.headers()._protected().getAsHeaderMap().otherHeaderAsBytes(ADDRESS_KEY); + byte[] addressBytes = coseSign1.headers()._protected().getAsHeaderMap().otherHeaderAsBytes(ADDRESS_KEY); Address address = new Address(addressBytes); + boolean addressVerified = AddressProvider.verifyAddress(address, pubKey); return sigVerified && addressVerified; diff --git a/cip/cip30/src/test/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSignerTest.java b/cip/cip30/src/test/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSignerTest.java index 4a2ebee8..fba89e2e 100644 --- a/cip/cip30/src/test/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSignerTest.java +++ b/cip/cip30/src/test/java/com/bloxbean/cardano/client/cip/cip30/CIP30DataSignerTest.java @@ -6,13 +6,16 @@ import com.bloxbean.cardano.client.address.Address; import com.bloxbean.cardano.client.cip.cip8.COSEKey; import com.bloxbean.cardano.client.common.model.Networks; +import com.bloxbean.cardano.client.crypto.Blake2bUtil; import com.bloxbean.cardano.client.util.HexUtil; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; class CIP30DataSignerTest { + String mnemonic = "nice orient enjoy teach jump office alert inquiry apart unaware seat tumble unveil device have bullet morning eyebrow time image embody divide version uniform"; + Account account = new Account(Networks.testnet(), mnemonic); @Test @@ -68,5 +71,50 @@ void verifyNamiSignature_invalidKey() { assertThat(verified).isFalse(); } -} + @Test + void verifyHashedLedgerHardwareWallet() { + DataSignature dataSignature = new DataSignature() + .signature("84582aa201276761646472657373581de103d205532089ad2f7816892e2ef42849b7b52788e41b3fd43a6e01cfa166686173686564f5581c1c1afc33a1ed48205eadcbbda2fc8e61442af2e04673616f21b7d0385840954858f672e9ca51975655452d79a8f106011e9535a2ebfb909f7bbcce5d10d246ae62df2da3a7790edd8f93723cbdfdffc5341d08135b1a40e7a998e8b2ed06") + .key("a4010103272006215820c13745be35c2dfc3fa9523140030dda5b5346634e405662b1aae5c61389c55b3"); + boolean verified = CIP30DataSigner.INSTANCE.verify(dataSignature); + + assertThat(verified).isTrue(); + } + + @Test + void verifySignDataHashedPayload() { + DataSignature dataSignature = new DataSignature() + .signature("845846a2012767616464726573735839003175d03902583e82037438cc86732f6e539f803f9a8b2d4ee164b9d0c77e617030631811f60a1f8a8be26d65a57ff71825b336cc6b76361da166686173686564f44b48656c6c6f20576f726c64584036c2151e1230364b0bf9e40cb65dbdca4c5decf4187e3c5511945d410ea59a1e733b5e68178c234979053ed75b0226ba826fb951c5a79fabf10bddcabda8dc05") + .key("a4010103272006215820a5f73966e73d0bb9eadc75c5857eafd054a0202d716ac6dde00303ee9c0019e3"); + + boolean verified = CIP30DataSigner.INSTANCE.verify(dataSignature); + assertThat(verified).isTrue(); + } + + @Test + void signDataHashedPayload() throws DataSignError { + byte[] payload = Blake2bUtil.blake2bHash224("Hello World".getBytes()); + + Address address = new Address(account.baseAddress()); + DataSignature dataSignature = CIP30DataSigner.INSTANCE.signData(address.getBytes(), payload, account, true); + + assertThat(dataSignature).isNotNull(); + assertThat(dataSignature.signature()).isEqualTo("845882a3012704583900327d065c4c135860b9ac6a758c9ef032100a724865998a6b1b8219f3d11c3061dfc0c16e14f5b6779fef214eab7aaa3dffdc5e30c1272f0e6761646472657373583900327d065c4c135860b9ac6a758c9ef032100a724865998a6b1b8219f3d11c3061dfc0c16e14f5b6779fef214eab7aaa3dffdc5e30c1272f0ea166686173686564f5581c19790463ef4ad09bdb724e3a6550c640593d4870f6e192ac8147f35d5840d6348538f8c69f5ac30615700b78597dc29795d5fef2aa6165f17ac208b3163b2d2d55405beb6cd8fc66e3beaac1d08b91fae7b9679cc0ae212c65cfe277d608"); + assertThat(dataSignature.key()).isEqualTo("a5010102583900327d065c4c135860b9ac6a758c9ef032100a724865998a6b1b8219f3d11c3061dfc0c16e14f5b6779fef214eab7aaa3dffdc5e30c1272f0e03272006215820097c8507b71063f99e38147f09eacf76f25576a2ddfac2f40da8feee8dab2d5d"); + assertThat(HexUtil.encodeHexString(dataSignature.address())).isEqualTo("00327d065c4c135860b9ac6a758c9ef032100a724865998a6b1b8219f3d11c3061dfc0c16e14f5b6779fef214eab7aaa3dffdc5e30c1272f0e"); + } + + @Test + public void verifySignedHashedPayload() { + String sig = "845882a3012704583900327d065c4c135860b9ac6a758c9ef032100a724865998a6b1b8219f3d11c3061dfc0c16e14f5b6779fef214eab7aaa3dffdc5e30c1272f0e6761646472657373583900327d065c4c135860b9ac6a758c9ef032100a724865998a6b1b8219f3d11c3061dfc0c16e14f5b6779fef214eab7aaa3dffdc5e30c1272f0ea166686173686564f5581c19790463ef4ad09bdb724e3a6550c640593d4870f6e192ac8147f35d5840d6348538f8c69f5ac30615700b78597dc29795d5fef2aa6165f17ac208b3163b2d2d55405beb6cd8fc66e3beaac1d08b91fae7b9679cc0ae212c65cfe277d608"; + String key = "a5010102583900327d065c4c135860b9ac6a758c9ef032100a724865998a6b1b8219f3d11c3061dfc0c16e14f5b6779fef214eab7aaa3dffdc5e30c1272f0e03272006215820097c8507b71063f99e38147f09eacf76f25576a2ddfac2f40da8feee8dab2d5d"; + + DataSignature dataSig = new DataSignature().signature(sig).key(key); + + boolean isVerified = CIP30DataSigner.INSTANCE.verify(dataSig); + + assertThat(isVerified).isTrue(); + } + +} diff --git a/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/COSESign1.java b/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/COSESign1.java index 55df9bfe..8e64721f 100644 --- a/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/COSESign1.java +++ b/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/COSESign1.java @@ -113,3 +113,4 @@ public SigStructure signedData(byte[] externalAad, byte[] externalPayload) { .externalAad(externalAad); } } + diff --git a/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1Builder.java b/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1Builder.java index 78910880..44547d69 100644 --- a/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1Builder.java +++ b/cip/cip8/src/main/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1Builder.java @@ -5,13 +5,13 @@ import com.bloxbean.cardano.client.cip.cip8.Headers; import com.bloxbean.cardano.client.cip.cip8.SigContext; import com.bloxbean.cardano.client.cip.cip8.SigStructure; -import com.bloxbean.cardano.client.crypto.Blake2bUtil; import lombok.Data; import lombok.experimental.Accessors; @Accessors(fluent = true) @Data public class COSESign1Builder { + private Headers headers; private byte[] payload; private byte[] externalAad; @@ -22,6 +22,14 @@ public COSESign1Builder(Headers headers, byte[] payload, boolean isPayloadExtern this.headers = headers; this.payload = payload; this.isPayloadExternal = isPayloadExternal; + this.hashed = false; + } + + public COSESign1Builder(Headers headers, byte[] payload, boolean isPayloadExternal, boolean isHashed) { + this.headers = headers; + this.payload = payload; + this.isPayloadExternal = isPayloadExternal; + this.hashed = isHashed; } public SigStructure makeDataToSign() { @@ -38,15 +46,10 @@ public COSESign1 build(byte[] signedSigStructure) { Headers allHeader = headers.copy(); allHeader.unprotected().addOtherHeader("hashed", hashed ? SimpleValue.TRUE : SimpleValue.FALSE); - byte[] finalPayload; - if (hashed) { //blake2b224 hash - finalPayload = Blake2bUtil.blake2bHash224(payload); - } else - finalPayload = payload.clone(); - return new COSESign1() .headers(allHeader) - .payload(isPayloadExternal ? null : finalPayload) + .payload(isPayloadExternal ? null : payload.clone()) .signature(signedSigStructure); } + } diff --git a/cip/cip8/src/test/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1BuilderTest.java b/cip/cip8/src/test/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1BuilderTest.java index bce01503..647b9d65 100644 --- a/cip/cip8/src/test/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1BuilderTest.java +++ b/cip/cip8/src/test/java/com/bloxbean/cardano/client/cip/cip8/builder/COSESign1BuilderTest.java @@ -5,7 +5,9 @@ import co.nstant.in.cbor.model.ByteString; import co.nstant.in.cbor.model.SimpleValue; import co.nstant.in.cbor.model.UnicodeString; +import co.nstant.in.cbor.model.UnsignedInteger; import com.bloxbean.cardano.client.account.Account; +import com.bloxbean.cardano.client.address.Address; import com.bloxbean.cardano.client.cip.cip8.*; import com.bloxbean.cardano.client.common.model.Networks; import com.bloxbean.cardano.client.config.Configuration; @@ -45,12 +47,22 @@ void buildCOSESign1() throws CborException { COSESign1 coseSign1 = coseSign1Builder.build(signedSigStructure); String serHex = HexUtil.encodeHexString(coseSign1.serializeAsBytes()); - System.out.println(serHex); + + Address address = new Address(account.baseAddress()); + COSEKey coseKey = new COSEKey() + .keyType(1) //OKP + .keyId(address.getBytes()) + .algorithmId(-8) //EdDSA + .addOtherHeader(-1, new UnsignedInteger(6)) //crv Ed25519 + .addOtherHeader(-2, new ByteString(account.publicKeyBytes())); //x pub key used to sign sig_structure //This hex is the result from message-signing rust impl. String expected = "8447a2010e033903e7a2386371536f6d65206865616465722076616c756566686173686564f5581c19790463ef4ad09bdb724e3a6550c640593d4870f6e192ac8147f35d58400a448415208ba496d5cd58407a05269b8f0fd14a3c690b761b03c58e2ac70dd36a6bb9d0e03c5baa9d68da99af4be2a8245892325535ec3656435505ba182703"; COSESign1 coseSign12 = COSESign1.deserialize(CborDecoder.decode(HexUtil.decodeHexString(serHex)).get(0)); + System.out.println("expected:" + expected); + String key = HexUtil.encodeHexString(coseKey.serializeAsBytes()); + assertThat(serHex).isEqualTo(expected); assertThat(coseSign12).isEqualTo(coseSign1); } @@ -130,7 +142,6 @@ void buildCOSESign1_withPayLoadExTrue_additionalHeaders() throws CborException { COSESign1 coseSign1 = coseSign1Builder.build(signedSigStructure); String serHex = HexUtil.encodeHexString(coseSign1.serializeAsBytes()); - System.out.println(serHex); //This hex is the result from message-signing rust impl. String expected = "8458baa7010e02816d637269746963616c6974792d31033903e704430102030543040506064304050607828340a10281055840030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303038340a20103028108584005050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505aa01181802816d637269746963616c6974792d32033907cf04430102030543040506064304050607828340a10281145840030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303038340a20103028108584005050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505386371736f6d65206865616465722076616c7565646b6579314307080966686173686564f5f65840ba0e7cb56486b33c1fc3fb2730968cf46b9215bcf57dfdec15102cad72391b4ac2f5c6a23fe3e2545b6d0d2381fc5fbb090467e02f74d57eee8380b8cf9d1605";