chore: remove const-hex crate

Author: zensh

Cargo.toml

@@ -3,7 +3,7 @@ members = ["rs/ic_auth_types", "rs/ic_auth_verifier"]
 resolver = "2"
 
 [workspace.package]
-version = "0.4.7"
+version = "0.4.8"
 edition = "2024"
 repository = "https://github.com/ldclabs/ic-auth"
 keywords = ["auth", "identity", "deeplink", "icp", "canister"]
@@ -16,7 +16,7 @@ arc-swap = "1.7"
 base64 = "0.22"
 candid = "0.10"
 ciborium = "0.2"
-const-hex = "1"
+hex = "0.4"
 http = "1.3"
 serde = { version = "1", features = ["derive"] }
 serde_bytes = "0.11"

rs/ic_auth_types/Cargo.toml

@@ -18,7 +18,7 @@ xid = { workspace = true, optional = true }
 
 [dev-dependencies]
 ciborium = { workspace = true }
-const-hex = { workspace = true }
+hex = { workspace = true }
 serde_json = { workspace = true }
 
 [features]

rs/ic_auth_types/src/bytes.rs

@@ -487,16 +487,13 @@ mod tests {
 
         let mut data = Vec::new();
         ciborium::into_writer(&t, &mut data).unwrap();
-        println!("{}", const_hex::encode(&data));
-        assert_eq!(
-            data,
-            const_hex::decode("a26161440102030461624401020304").unwrap()
-        );
+        println!("{}", hex::encode(&data));
+        assert_eq!(data, hex::decode("a26161440102030461624401020304").unwrap());
         let t1: Test = ciborium::from_reader(&data[..]).unwrap();
         assert_eq!(t, t1);
 
         let a = encode_one(vec![1u8, 2, 3, 4]).unwrap();
-        println!("candid: {}", const_hex::encode(&a));
+        println!("candid: {}", hex::encode(&a));
         assert_eq!(a, encode_one(ByteBuf::from(vec![1, 2, 3, 4])).unwrap());
         assert_eq!(a, encode_one(ByteBufB64::from(vec![1, 2, 3, 4])).unwrap());
         assert_eq!(a, encode_one(ByteArrayB64::from([1, 2, 3, 4])).unwrap());

rs/ic_auth_types/src/lib.rs

@@ -131,13 +131,11 @@ mod tests {
 
         let mut data = Vec::new();
         ciborium::into_writer(&d, &mut data).unwrap();
-        println!("{}", const_hex::encode(&data));
+        println!("{}", hex::encode(&data));
         assert_eq!(
             data,
-            const_hex::decode(
-                "a3667075626b657944010203046a65787069726174696f6e186367746172676574738140"
-            )
-            .unwrap()
+            hex::decode("a3667075626b657944010203046a65787069726174696f6e186367746172676574738140")
+                .unwrap()
         );
         let d1: Delegation = ciborium::from_reader(&data[..]).unwrap();
         assert_eq!(d, d1);

rs/ic_auth_types/src/xid.rs

@@ -382,10 +382,10 @@ mod tests {
 
         let mut data = Vec::new();
         ciborium::into_writer(&t, &mut data).unwrap();
-        println!("{}", const_hex::encode(&data));
+        println!("{}", hex::encode(&data));
         assert_eq!(
             data,
-            const_hex::decode("a2667468726561644c000000000000000000000000697072696e636970616c4104")
+            hex::decode("a2667468726561644c000000000000000000000000697072696e636970616c4104")
                 .unwrap()
         );
         let t1: Test = ciborium::from_reader(&data[..]).unwrap();

rs/ic_auth_verifier/Cargo.toml

@@ -25,7 +25,7 @@ arc-swap = { workspace = true, optional = true }
 ic-signature-verification = { workspace = true, optional = true }
 http = { workspace = true, optional = true }
 base64 = { workspace = true, optional = true }
-const-hex = { workspace = true }
+hex = { workspace = true }
 ic-agent = { workspace = true, optional = true }
 url = { workspace = true, optional = true }
 ed25519-consensus = { workspace = true, optional = true }

rs/ic_auth_verifier/src/asn1.rs

@@ -157,13 +157,13 @@ mod tests {
 
     #[test]
     fn test_user_public_key_from_der() {
-        let data = const_hex::decode("303C300C060A2B0601040183B8430102032C000A0000000000000007010116FB513D360579FA1102D36E3BC8D53FB966F3AC9F717842B2B54C227582D786").unwrap();
+        let data = hex::decode("303C300C060A2B0601040183B8430102032C000A0000000000000007010116FB513D360579FA1102D36E3BC8D53FB966F3AC9F717842B2B54C227582D786").unwrap();
         let (algo, pk) = user_public_key_from_der(&data).unwrap();
         println!("Algorithm: {:?}", algo);
         assert_eq!(algo, Algorithm::IcCanisterSignature);
         assert_eq!(pk.len(), 43);
 
-        let data = const_hex::decode("302A300506032B65700321004258A79844B5BC3089D6467A2CA67DA33EAB4A96ADCD93E72349B75C0A4C5219").unwrap();
+        let data = hex::decode("302A300506032B65700321004258A79844B5BC3089D6467A2CA67DA33EAB4A96ADCD93E72349B75C0A4C5219").unwrap();
         let (algo, pk) = user_public_key_from_der(&data).unwrap();
         println!("Algorithm: {:?}", algo);
         assert_eq!(algo, Algorithm::Ed25519);

rs/ic_auth_verifier/src/envelope.rs

@@ -538,8 +538,8 @@ pub fn verify_delegation_chain(
             "Last verified public key does not match session public key:\n\
              Last verified: {}\n\
              Session public key: {}",
-            const_hex::encode(last_verified),
-            const_hex::encode(session_pubkey)
+            hex::encode(last_verified),
+            hex::encode(session_pubkey)
         ));
     }
 
@@ -699,17 +699,16 @@ mod tests {
 
     #[test]
     fn test_envelope_with_iccsa() {
-        let msg =
-            const_hex::decode("086c81b03b34184d2365b88a7d94ad9cc0f4e98970b6c10068aae4e407333339")
-                .unwrap();
+        let msg = hex::decode("086c81b03b34184d2365b88a7d94ad9cc0f4e98970b6c10068aae4e407333339")
+            .unwrap();
         let sig =
-            const_hex::decode("d9d9f7a26b636572746966696361746558a1d9d9f7a26474726565830183024863616e697374657283024a0000000000000001010183024e6365727469666965645f646174618203582053e3b19ab292296b52b451b0662af2d86ac707569b39825fc31f62aca41406d483024474696d6582034387ad4b697369676e61747572655830a95766af95898e1c8492de7b7d9e6c601ea9d9958113f6c0491ef044ed5ebb03d31983abfa40ebbef7068ebaf7e66f05647472656583024373696783025820591047009df12cb39741d672f270045fd15beec2b0b84c1d71bda98b758726cd83025820d37372239856cdf2ae158e5ac365f15501a9e5612a970ddd7b3199c522b54194820340")
+            hex::decode("d9d9f7a26b636572746966696361746558a1d9d9f7a26474726565830183024863616e697374657283024a0000000000000001010183024e6365727469666965645f646174618203582053e3b19ab292296b52b451b0662af2d86ac707569b39825fc31f62aca41406d483024474696d6582034387ad4b697369676e61747572655830a95766af95898e1c8492de7b7d9e6c601ea9d9958113f6c0491ef044ed5ebb03d31983abfa40ebbef7068ebaf7e66f05647472656583024373696783025820591047009df12cb39741d672f270045fd15beec2b0b84c1d71bda98b758726cd83025820d37372239856cdf2ae158e5ac365f15501a9e5612a970ddd7b3199c522b54194820340")
                 .unwrap();
         let pk_der =
-            const_hex::decode("303c300c060a2b0601040183b8430102032c000a000000000000000101011f809d0136deeed8e0187447d20ac0e13e0201e1dede8c437eada3e8dc349f85")
+            hex::decode("303c300c060a2b0601040183b8430102032c000a000000000000000101011f809d0136deeed8e0187447d20ac0e13e0201e1dede8c437eada3e8dc349f85")
                 .unwrap();
         let root =
-            const_hex::decode("b90210504fe157d1df412e500ced967ef794dc7aa88c84d764b74b6bc2cf0e575d79f331927df062240c88a28e1802c60b407c7bce541b50310d775919bcd0f799222c3738bc3bcc8bf05af5f52ee2afec54c460bda35c6c379267924db2d374")
+            hex::decode("b90210504fe157d1df412e500ced967ef794dc7aa88c84d764b74b6bc2cf0e575d79f331927df062240c88a28e1802c60b407c7bce541b50310d775919bcd0f799222c3738bc3bcc8bf05af5f52ee2afec54c460bda35c6c379267924db2d374")
                 .unwrap();
         let (alg, _pk) = user_public_key_from_der(&pk_der).unwrap();
         assert_eq!(alg, Algorithm::IcCanisterSignature);
@@ -724,32 +723,32 @@ mod tests {
 
     #[test]
     fn test_verify_delegation_chain() {
-        let user_pubkey = const_hex::decode(
+        let user_pubkey = hex::decode(
             "303C300C060A2B0601040183B8430102032C000A0000000000000007010116FB513D360579FA1102D36E3BC8D53FB966F3AC9F717842B2B54C227582D786",
         ).unwrap();
-        let session_pubkey = const_hex::decode(
+        let session_pubkey = hex::decode(
             "302A300506032B6570032100C6C020379C06F82F81111E1DA776F143C4F532EBE2D9FB16461F1243B5A92BAA",
         ).unwrap();
         let delegations = vec![
             SignedDelegationCompact {
                 delegation: DelegationCompact {
-                    pubkey: const_hex::decode(
+                    pubkey: hex::decode(
                         "302A300506032B65700321005EC6DE6BD72919EA56CCA4E8E7124CEF75807DC212F1AE1FC3BA58903FC8795A",
                     ).unwrap().into(),
                     expiration: 1748957411593484684,
                     targets: None,
                 },
-                signature: const_hex::decode(
+                signature: hex::decode(
                     "D9D9F7A26B63657274696669636174655904AFD9D9F7A36474726565830183018301820458207F795EAF211FB3DA321D2291429BAD43A869A1CCFD761FF5A35F1A362322A1F483024863616E697374657283018301830183024A000000000000000701018301830183024E6365727469666965645F64617461820358201BD26E2A134BB173ACE579802B2BD138D28B3307CE5415BAD1304EDC8EB6A5E182045820D8F64F7AFCA6A55D4EE6DED9B0200BAC6651CAF4C7A1920212B5A03C9BF1DF3682045820F5ECD4D3EDCD85DE4C3B07B8A8D77F69DEFCB5BD652071FFD46B2A6604029112820458205085E5811DEACD817B4FF38A37C93B8421B7DDC92E5489FDF0D3F5CF36E320728204582032698C8D6A87E6831B3E8AA11641F27E77B692C6F866FD3D9D3E917EA570515682045820F7C9916E3BDEB2AC59E18441EBEFDDA60B801A91F8508B4F1B2ADA5B7F62AAA682045820989249384F8855B851E3F07C55E66DEFA4719612B1D9565E4C2B47918F902240830182045820FBF74833516364406FEC8290DFB4593E369120B408F757754CF11E96DF87AA8D83024474696D658203498CF3BBB0EDC2959E18697369676E61747572655830AF6204D323E367981055D0FB24E03070BDD6EC0D1BFABE2E3408B9C4792F1D4C44FE49A3AE9FD6ABD53D53DCF38E0E0E6A64656C65676174696F6EA2697375626E65745F6964581D43DCAF1180DB82FDA708CE3AC7A03A6060ABDE13E9546C60E8CCE65D026B6365727469666963617465590294D9D9F7A264747265658301820458200E077A1AA8E3A69E473446FB605EF74212198EC90D4D0010B3DC091AE3F01B798301830182045820954285DD391C0258F30BD79123B51AB939B93982F24426FE94E376FC13F5D3D38302467375626E6574830183018301820458200985315BBE905B7F9336D7064793905B005689F3C9C2A21AD9A31FBE6CDD5599830182045820466A70286CF9ACE9801CA53E22AF6EE059A094FD60498606D484B6854058307D83018301820458208B2F6C15078AE4D3B93470915CA53E373327F37EA74BA1B8177D986BB79B31AE8302581D43DCAF1180DB82FDA708CE3AC7A03A6060ABDE13E9546C60E8CCE65D02830183024F63616E69737465725F72616E67657382035832D9D9F782824A000000000000000701014A00000000000000070101824A000000000210000001014A00000000021FFFFF010183024A7075626C69635F6B657982035885308182301D060D2B0601040182DC7C0503010201060C2B0601040182DC7C050302010361008819AAA868DA353E3451BB97675FFFAA711E3C1C1230E39E1FEEB0AF9FE03E67C9393F08D796C1E42B528ABB5FCB4159199284B00096F6DAFA93B4711F1AC65F594B67CE2C0B35710E0391C5424CB754779A1C6084F6E77B584E7C8CF7FE9D89820458202C51DB7B5650B7A3DBBB8530A7449CC6F90144778B62F20F3C26D72E95E50698820458206961EF137C2AEE0B0467082EF6D3C12C03E93013B602A4CB6214270E484863F182045820EA6D87F551BD7F433852FA3F8697E653676C2DA59615618B39C50D74069123C983024474696D65820349A0BFA380BAC2959E18697369676E61747572655830B82F7761EC5C9A30672188D7A5F7EE82B540E51A86239C5A2A8E51DA6CB19CA3980DD8125440EC49C54865CED7EAA10F6474726565830182045820ECF5038E1037F1181243DAABBD82BE6045A5B0B9F1025C905FA339E2C1305608830243736967830183018204582029D9F6DAFC4411D79A0B7A64FCFF42FCE426974773A4178BA421DF59165D9E32830182045820ABD07F88910310B251F025105AEA620A46984E3D677A54EEC324134F6ED4DDD783018204582055D9BE42D0A247D96B4C67822E937EAD71567B5BE0A4965150F01D2AB51AC971830182045820CCB0E0C4819032E6C3C7B0E359F8A7297EED11A484FD7D8081CCA2461371E0328301830258206BB18EF359E4DBB2372D7C255BA9351BC862ACF06D9D2B14CDB1271EEFAA597E8302582015451785051A113622599AD74E94CC066EEF4BAC88AC36A42403C65CEDFFE8E0820340820458203A229EE09D8AC3B9C0540F596654FED78B3D5ABDD03657F66AD3240856214167820458206C0048C242D41CF83B77D782F6733B95B7AA137736741D05DACA0385D79BF466").unwrap().into()
                 }, SignedDelegationCompact{
                     delegation: DelegationCompact {
-                    pubkey: const_hex::decode(
+                    pubkey: hex::decode(
                         "302A300506032B6570032100C6C020379C06F82F81111E1DA776F143C4F532EBE2D9FB16461F1243B5A92BAA",
                     ).unwrap().into(),
                     expiration: 1750784792831000000,
                     targets: None,
                 },
-                signature: const_hex::decode("18397232DD4AE43103E1884E956F91B44188E40A288DBCB73BF99DC27DBFAB1E1F0FAB76C44E0A0206F34887D5197B46C2D57876B0DB4C28E97967FDA8807908").unwrap().into(),
+                signature: hex::decode("18397232DD4AE43103E1884E956F91B44188E40A288DBCB73BF99DC27DBFAB1E1F0FAB76C44E0A0206F34887D5197B46C2D57876B0DB4C28E97967FDA8807908").unwrap().into(),
                 }];
         let rt = verify_delegation_chain(
             &user_pubkey,

rs/ic_auth_verifier/src/lib.rs

@@ -129,7 +129,7 @@ mod tests {
 
     #[test]
     fn should_work_with_ecdsa_secp256k1() {
-        let pk_der = const_hex::decode("3056301006072a8648ce3d020106052b8104000a034200047060f720298ffa0f48d9606abdb013bc82f4ff269f9adc3e7226391af3fad8b30fd6a30deb81d5b4f9e142971085d0ae15b8e222d85af1e17438e630d09b7ef4").unwrap();
+        let pk_der = hex::decode("3056301006072a8648ce3d020106052b8104000a034200047060f720298ffa0f48d9606abdb013bc82f4ff269f9adc3e7226391af3fad8b30fd6a30deb81d5b4f9e142971085d0ae15b8e222d85af1e17438e630d09b7ef4").unwrap();
         let (alg, pk) = user_public_key_from_der(&pk_der).unwrap();
         assert_eq!(alg, Algorithm::EcdsaSecp256k1);
         assert!(k256::ecdsa::VerifyingKey::from_sec1_bytes(&pk).is_ok());
@@ -146,7 +146,7 @@ mod tests {
 
     #[test]
     fn should_work_with_ecdsa_p256() {
-        let pk_der = const_hex::decode("3059301306072a8648ce3d020106082a8648ce3d03010703420004485c32997ce7c6d38ca82c821185c689d424fac7c9695bb97786c4248aab6428949bcd163e2bcf3eeeac4f200b38fbd053f82c4e1776dc9c6dc8db9b7c35e06f").unwrap();
+        let pk_der = hex::decode("3059301306072a8648ce3d020106082a8648ce3d03010703420004485c32997ce7c6d38ca82c821185c689d424fac7c9695bb97786c4248aab6428949bcd163e2bcf3eeeac4f200b38fbd053f82c4e1776dc9c6dc8db9b7c35e06f").unwrap();
         let (alg, pk) = user_public_key_from_der(&pk_der).unwrap();
         assert_eq!(alg, Algorithm::EcdsaP256);
         assert!(p256::ecdsa::VerifyingKey::from_sec1_bytes(&pk).is_ok());
@@ -164,8 +164,7 @@ mod tests {
     #[test]
     fn should_work_with_iccsa_pubkey() {
         let pk_der =
-            const_hex::decode("301b300c060a2b0601040183b8430102030b007075626c6963206b6579")
-                .unwrap();
+            hex::decode("301b300c060a2b0601040183b8430102030b007075626c6963206b6579").unwrap();
         let (alg, _pk) = user_public_key_from_der(&pk_der).unwrap();
         assert_eq!(alg, Algorithm::IcCanisterSignature);
     }