diff --git a/iroha-drip-general-master/drippy/host_identity.py b/iroha-drip-general-master/drippy/host_identity.py index a5a48091c7c3e55250fbfef6853d7b28b621061c..3ea0f61d7cb94acbd7b46181f45f3543aa7d454a 100644 --- a/iroha-drip-general-master/drippy/host_identity.py +++ b/iroha-drip-general-master/drippy/host_identity.py @@ -38,7 +38,7 @@ class HostIdentity: pub_key = ''.join(host_id.find("pub").string.split(':')) hid = host_id.find("hid").string - hhit = ''.join(["{:>04}".format(byte_group) for byte_group in host_id.find("hit").string.split(':')]) + hhit = ''.join(["{:>}".format(byte_group) for byte_group in host_id.find("hit").string.split(':')]) return HostIdentity(hhit, hid, priv_key, pub_key) @@ -57,7 +57,7 @@ class HostIdentity: def verify_hhit(self): chash = cSHAKE128( - unhexlify(CONTEXT_ID + CURVE_ID + self._pub_key), + unhexlify(self._hhit[:16]), 64, "", unhexlify(CONTEXT_ID)) diff --git a/iroha-drip-general-master/identities/drone/drone_identities.xml b/iroha-drip-general-master/identities/drone/drone_identities.xml index 5c8c33202ad7b5eaa2c8cd1665e7fc9d3d09abee..2c96d5621d9c195640f33df5449c16211ad2c271 100644 --- a/iroha-drip-general-master/identities/drone/drone_identities.xml +++ b/iroha-drip-general-master/identities/drone/drone_identities.xml @@ -6,7 +6,13 @@ <CURVE>1</CURVE> <PRIV>39:15:7F:89:77:35:08:22:09:56:47:CA:3C:70:4C:BC:52:E3:C2:CD:28:F6:ED:C8:43:93:8E:E2:DA:90:08:35</PRIV> <PUB>E3:2E:3A:C8:C1:F7:A1:BD:FE:A6:7E:75:39:AB:41:E3:38:3A:47:DB:B1:6B:32:7E:1D:E5:11:B8:FF:BE:07:54</PUB> - <HIT>2001:25:b3f:a14c:1cee:522e:25ad:d5b0</HIT> + <HIT>2001:30:0b3f:a14c:05:4436:e9fa:2868:b013</HIT> + <!-- + 2001:30 (28-bit Prefix), + 0b3f:a14c (28-bit HID), + 05 (8-bit Suite ID), + 4436:e9fa:2868:b013 (64-bit Hash) + --> <LSI>1.173.213.176</LSI> </host_identity> </my_host_identities> diff --git a/iroha-drip-general-master/identities/drone/hash_hhit_tool.py b/iroha-drip-general-master/identities/drone/hash_hhit_tool.py new file mode 100644 index 0000000000000000000000000000000000000000..470effc2ecf1f5c62a438a0e66fde855b3accca3 --- /dev/null +++ b/iroha-drip-general-master/identities/drone/hash_hhit_tool.py @@ -0,0 +1,17 @@ +from drippy.cSHAKE import cSHAKE128 +from binascii import unhexlify + +CONTEXT_ID = "F0EFF02FBFF43D0FE7930C3C6E6174EA" +CURVE_ID = "0001" + +pub_key = "E32E3AC8C1F7A1BDFEA67E7539AB41E3383A47DBB16B327E1DE511B8FFBE0754" +input = "2001300b3fa14c05" + +result = cSHAKE128( + unhexlify(input), + 64, + "", + unhexlify(CONTEXT_ID) +) + +print(result)