diff --git a/.cargo/audit.toml b/.cargo/audit.toml index a409af97cb..fc1986e76a 100644 --- a/.cargo/audit.toml +++ b/.cargo/audit.toml @@ -1,2 +1,2 @@ [advisories] -ignore = [] +ignore = ["RUSTSEC-2024-0384"] diff --git a/Cargo.lock b/Cargo.lock index 4d5f4c40fb..84bd979310 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -46,24 +46,24 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" @@ -85,12 +85,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -198,7 +198,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] @@ -256,7 +256,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] @@ -358,46 +358,43 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.2.7" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", - "once_cell", "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" @@ -460,9 +457,23 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] [[package]] name = "encode_unicode" @@ -482,12 +493,41 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", ] +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.3" @@ -565,9 +605,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -589,9 +629,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -599,9 +639,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" @@ -617,9 +657,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -638,32 +678,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -708,9 +748,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -753,12 +793,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.0" @@ -769,6 +803,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "hashlink" version = "0.8.4" @@ -784,6 +824,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.3" @@ -829,6 +875,7 @@ name = "hickory-dns" version = "0.24.0" dependencies = [ "clap", + "env_logger", "futures-util", "hickory-client", "hickory-proto", @@ -849,6 +896,7 @@ name = "hickory-integration" version = "0.24.0" dependencies = [ "async-trait", + "env_logger", "futures", "hickory-client", "hickory-proto", @@ -892,7 +940,7 @@ dependencies = [ "openssl", "quinn", "rand", - "ring", + "ring 0.16.20", "rustls", "rustls-native-certs", "rustls-pemfile", @@ -1034,24 +1082,159 @@ dependencies = [ "itoa", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "idna" -version = "0.4.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "equivalent", + "hashbrown 0.15.2", ] [[package]] @@ -1093,15 +1276,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] -name = "is-terminal" -version = "0.4.9" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.14", - "windows-sys 0.48.0", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" @@ -1135,9 +1313,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libsqlite3-sys" @@ -1168,6 +1346,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.10" @@ -1180,9 +1364,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] @@ -1228,9 +1412,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -1274,6 +1458,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num_cpus" version = "1.16.0" @@ -1301,9 +1491,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.4.0", "cfg-if", @@ -1322,7 +1512,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] @@ -1333,9 +1523,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -1380,9 +1570,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" @@ -1429,6 +1619,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1437,9 +1633,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -1475,7 +1671,7 @@ checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "slab", @@ -1499,9 +1695,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1618,12 +1814,27 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + [[package]] name = "rusqlite" version = "0.29.0" @@ -1680,12 +1891,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -1713,12 +1924,12 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -1742,8 +1953,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -1786,7 +1997,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] @@ -1828,9 +2039,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -1858,11 +2069,23 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" @@ -1877,15 +2100,26 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "tempfile" version = "3.8.0" @@ -1916,7 +2150,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] @@ -1931,12 +2165,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -1950,13 +2186,24 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -1997,7 +2244,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] @@ -2067,7 +2314,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] [[package]] @@ -2109,27 +2356,12 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-width" version = "0.1.11" @@ -2142,11 +2374,17 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" -version = "2.4.1" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -2154,6 +2392,18 @@ dependencies = [ "serde", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.1" @@ -2168,9 +2418,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" [[package]] name = "vcpkg" @@ -2217,7 +2467,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -2251,7 +2501,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2324,6 +2574,24 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -2354,6 +2622,22 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -2366,6 +2650,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -2378,6 +2668,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -2390,6 +2686,18 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -2402,6 +2710,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -2414,6 +2728,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -2426,6 +2746,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -2438,6 +2764,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "winreg" version = "0.50.0" @@ -2448,22 +2780,101 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "synstructure", +] + [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.90", ] diff --git a/Cargo.toml b/Cargo.toml index 3294659cf0..1c96befbc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,7 +85,7 @@ clap = { version = "4.0", default-features = false } console = "0.15.0" data-encoding = "2.2.0" enum-as-inner = "0.6" -idna = "0.4.0" +idna = "1" ipconfig = "0.3.0" ipnet = "2.3.0" js-sys = "0.3.44" diff --git a/bin/tests/named_tests.rs b/bin/tests/named_tests.rs index 186bfffeff..53e85ff5ca 100644 --- a/bin/tests/named_tests.rs +++ b/bin/tests/named_tests.rs @@ -305,7 +305,7 @@ fn test_forward() { ); assert_eq!( *response.answers()[0].data().and_then(RData::as_a).unwrap(), - A::new(93, 184, 216, 34) + A::new(93, 184, 215, 14) ); // just tests that multiple queries work @@ -327,7 +327,7 @@ fn test_forward() { ); assert_eq!( *response.answers()[0].data().and_then(RData::as_a).unwrap(), - A::new(93, 184, 216, 34) + A::new(93, 184, 215, 14) ); assert!(!response.header().authoritative()); }) diff --git a/crates/async-std-resolver/src/lib.rs b/crates/async-std-resolver/src/lib.rs index dff685d1fe..c6afbe78d5 100644 --- a/crates/async-std-resolver/src/lib.rs +++ b/crates/async-std-resolver/src/lib.rs @@ -66,7 +66,7 @@ //! // this can return IPv4 and/or IPv6 addresses //! let address = response.iter().next().expect("no addresses returned!"); //! if address.is_ipv4() { -//! assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); +//! assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); //! } else { //! assert_eq!(address, IpAddr::V6(Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946))); //! } diff --git a/crates/client/src/client/async_client.rs b/crates/client/src/client/async_client.rs index 0eb69e2d0b..f619c6ade2 100644 --- a/crates/client/src/client/async_client.rs +++ b/crates/client/src/client/async_client.rs @@ -1118,7 +1118,7 @@ mod tests { // validate it's what we expected if let Some(RData::A(addr)) = message_returned.answers()[0].data() { - assert_eq!(*addr, A::new(93, 184, 216, 34)); + assert_eq!(*addr, A::new(93, 184, 215, 14)); } let message_parsed = Message::from_vec(&buffer) @@ -1126,7 +1126,7 @@ mod tests { // validate it's what we expected if let Some(RData::A(addr)) = message_parsed.answers()[0].data() { - assert_eq!(*addr, A::new(93, 184, 216, 34)); + assert_eq!(*addr, A::new(93, 184, 215, 14)); } } } diff --git a/crates/client/src/lib.rs b/crates/client/src/lib.rs index 735511497d..c3be30d80a 100644 --- a/crates/client/src/lib.rs +++ b/crates/client/src/lib.rs @@ -129,7 +129,7 @@ //! // In order to access it we need to first check what type of record it is //! // In this case we are interested in A, IPv4 address //! if let Some(RData::A(ref ip)) = answers[0].data() { -//! assert_eq!(*ip, A::new(93, 184, 216, 34)) +//! assert_eq!(*ip, A::new(93, 184, 215, 14)) //! } else { //! assert!(false, "unexpected result") //! } @@ -264,7 +264,7 @@ //! //! // validate it's what we expected //! if let Some(RData::A(addr)) = response.answers()[0].data() { -//! assert_eq!(*addr, A::new(93, 184, 216, 34)); +//! assert_eq!(*addr, A::new(93, 184, 215, 14)); //! } //! } //! ``` diff --git a/crates/proto/src/h2/h2_client_stream.rs b/crates/proto/src/h2/h2_client_stream.rs index d1bdd81a50..4e7c9eb747 100644 --- a/crates/proto/src/h2/h2_client_stream.rs +++ b/crates/proto/src/h2/h2_client_stream.rs @@ -577,7 +577,7 @@ mod tests { .and_then(RData::as_a) .expect("Expected A record"); - assert_eq!(addr, &A::new(93, 184, 216, 34)); + assert_eq!(addr, &A::new(93, 184, 215, 14)); // // assert that the connection works for a second query @@ -605,7 +605,7 @@ mod tests { assert_eq!( addr, - &AAAA::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946) + &AAAA::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c) ); } } @@ -642,7 +642,7 @@ mod tests { .and_then(RData::as_a) .expect("Expected A record"); - assert_eq!(addr, &A::new(93, 184, 216, 34)); + assert_eq!(addr, &A::new(93, 184, 215, 14)); // // assert that the connection works for a second query @@ -670,7 +670,7 @@ mod tests { assert_eq!( addr, - &AAAA::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946) + &AAAA::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c) ); } } @@ -708,7 +708,7 @@ mod tests { .and_then(RData::as_a) .expect("invalid response, expected A record"); - assert_eq!(addr, &A::new(93, 184, 216, 34)); + assert_eq!(addr, &A::new(93, 184, 215, 14)); // // assert that the connection works for a second query @@ -732,7 +732,7 @@ mod tests { assert_eq!( addr, - &AAAA::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946) + &AAAA::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c) ); } diff --git a/crates/proto/src/h3/h3_client_stream.rs b/crates/proto/src/h3/h3_client_stream.rs index 591edc3c82..83c328bd4a 100644 --- a/crates/proto/src/h3/h3_client_stream.rs +++ b/crates/proto/src/h3/h3_client_stream.rs @@ -493,7 +493,7 @@ mod tests { .and_then(RData::as_a) .expect("Expected A record"); - assert_eq!(addr, &A::new(93, 184, 216, 34)); + assert_eq!(addr, &A::new(93, 184, 215, 14)); // // assert that the connection works for a second query @@ -521,7 +521,7 @@ mod tests { assert_eq!( addr, - &AAAA::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946) + &AAAA::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c) ); } } @@ -558,7 +558,7 @@ mod tests { .and_then(RData::as_a) .expect("Expected A record"); - assert_eq!(addr, &A::new(93, 184, 216, 34)); + assert_eq!(addr, &A::new(93, 184, 215, 14)); // // assert that the connection works for a second query @@ -586,7 +586,7 @@ mod tests { assert_eq!( addr, - &AAAA::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946) + &AAAA::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c) ); } } @@ -625,7 +625,7 @@ mod tests { .and_then(RData::as_a) .expect("invalid response, expected A record"); - assert_eq!(addr, &A::new(93, 184, 216, 34)); + assert_eq!(addr, &A::new(93, 184, 215, 14)); // // assert that the connection works for a second query @@ -649,7 +649,7 @@ mod tests { assert_eq!( addr, - &AAAA::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946) + &AAAA::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c) ); } } diff --git a/crates/proto/src/rr/dnssec/signer.rs b/crates/proto/src/rr/dnssec/signer.rs index a30560f6ce..3661e6288f 100644 --- a/crates/proto/src/rr/dnssec/signer.rs +++ b/crates/proto/src/rr/dnssec/signer.rs @@ -745,7 +745,7 @@ mod tests { #[allow(deprecated)] #[allow(clippy::unreadable_literal)] fn test_calculate_key_tag() { - let test_vectors = vec![ + let test_vectors = [ (vec![33, 3, 21, 11, 3, 1, 1, 1], 9739), ( vec![ diff --git a/crates/proto/src/rr/domain/label.rs b/crates/proto/src/rr/domain/label.rs index 039e8f4081..cd432b2a06 100644 --- a/crates/proto/src/rr/domain/label.rs +++ b/crates/proto/src/rr/domain/label.rs @@ -60,6 +60,7 @@ impl Label { return Self::from_ascii(s); } + #[allow(deprecated)] match idna::Config::default() .use_std3_ascii_rules(true) .transitional_processing(true) @@ -245,6 +246,7 @@ impl Display for Label { if self.as_bytes().starts_with(IDNA_PREFIX) { // this should never be outside the ascii codes... let label = String::from_utf8_lossy(self.borrow()); + #[allow(deprecated)] let (label, e) = idna::Config::default() .use_std3_ascii_rules(false) .transitional_processing(false) diff --git a/crates/proto/src/rr/rr_set.rs b/crates/proto/src/rr/rr_set.rs index 375445cac1..167226b0d6 100644 --- a/crates/proto/src/rr/rr_set.rs +++ b/crates/proto/src/rr/rr_set.rs @@ -293,7 +293,7 @@ impl RecordSet { RecordType::SOA => { assert!(self.records.len() <= 1); - if let Some(soa_record) = self.records.get(0) { + if let Some(soa_record) = self.records.first() { match soa_record.data() { Some(RData::SOA(ref existing_soa)) => { if let Some(RData::SOA(ref new_soa)) = record.data() { @@ -866,7 +866,7 @@ mod test { #[test] #[cfg(feature = "dnssec")] // This tests RFC 6975, a DNSSEC-specific feature. - #[allow(clippy::blocks_in_if_conditions)] + #[allow(clippy::blocks_in_conditions)] fn test_get_filter() { use crate::rr::dnssec::rdata::DNSSECRData; use crate::rr::dnssec::rdata::RRSIG; diff --git a/crates/proto/src/serialize/binary/decoder.rs b/crates/proto/src/serialize/binary/decoder.rs index 1437799333..c02c41f246 100644 --- a/crates/proto/src/serialize/binary/decoder.rs +++ b/crates/proto/src/serialize/binary/decoder.rs @@ -245,7 +245,7 @@ impl<'a> BinDecoder<'a> { } } -#[cfg(tests)] +#[cfg(test)] mod tests { use super::*; @@ -255,13 +255,13 @@ mod tests { let mut decoder = BinDecoder::new(deadbeef); let read = decoder.read_slice(4).expect("failed to read dead"); - assert_eq!(read, "dead"); + assert_eq!(read.unverified(), b"dead"); let read = decoder.read_slice(2).expect("failed to read be"); - assert_eq!(read, "be"); + assert_eq!(read.unverified(), b"be"); let read = decoder.read_slice(0).expect("failed to read nothing"); - assert_eq!(read, ""); + assert_eq!(read.unverified(), b""); // this should fail assert!(decoder.read_slice(3).is_err()); @@ -272,20 +272,18 @@ mod tests { let deadbeef = b"deadbeef"; let mut decoder = BinDecoder::new(deadbeef); - decoder.read_slice_from(4).expect("failed to read dead"); + decoder.read_slice(4).expect("failed to read dead"); let read = decoder.slice_from(0).expect("failed to get slice"); - assert_eq!(read, "dead"); + assert_eq!(read, b"dead"); decoder.read_slice(2).expect("failed to read be"); let read = decoder.slice_from(4).expect("failed to get slice"); - assert_eq!(read, "be"); + assert_eq!(read, b"be"); decoder.read_slice(0).expect("failed to read nothing"); let read = decoder.slice_from(4).expect("failed to get slice"); - assert_eq!(read, "be"); + assert_eq!(read, b"be"); - // this should fail - assert!(decoder.slice_from(6).is_err()); assert!(decoder.slice_from(10).is_err()); } } diff --git a/crates/proto/src/xfer/dns_multiplexer.rs b/crates/proto/src/xfer/dns_multiplexer.rs index f6e7131971..ff6f9de07a 100644 --- a/crates/proto/src/xfer/dns_multiplexer.rs +++ b/crates/proto/src/xfer/dns_multiplexer.rs @@ -553,7 +553,7 @@ mod test { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into()))) + .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 215, 14).into()))) .clone(), ); ( @@ -625,7 +625,7 @@ mod test { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into()))) + .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 215, 14).into()))) .clone(), Record::new() .set_name(origin) @@ -633,7 +633,10 @@ mod test { .set_rr_type(RecordType::AAAA) .set_dns_class(DNSClass::IN) .set_data(Some(RData::AAAA( - Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946).into(), + Ipv6Addr::new( + 0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c, + ) + .into(), ))) .clone(), soa, diff --git a/crates/proto/src/xfer/dnssec_dns_handle.rs b/crates/proto/src/xfer/dnssec_dns_handle.rs index bcda841eed..0f7a0c1538 100644 --- a/crates/proto/src/xfer/dnssec_dns_handle.rs +++ b/crates/proto/src/xfer/dnssec_dns_handle.rs @@ -639,7 +639,7 @@ fn test_preserve() { /// Invalid RRSIGs will be ignored. RRSIGs will only be validated against DNSKEYs which can /// be validated through a chain back to the `trust_anchor`. As long as one RRSIG is valid, /// then the RRSET will be valid. -#[allow(clippy::blocks_in_if_conditions)] +#[allow(clippy::blocks_in_conditions)] async fn verify_default_rrset( handle: &DnssecDnsHandle, rrset: Rrset, @@ -860,7 +860,7 @@ fn verify_rrset_with_dnskey(_: &DNSKEY, _: &RRSIG, _: &Rrset) -> ProtoResult<()> /// corresponding RRSIG RR, a validator MUST ignore the settings of the /// NSEC and RRSIG bits in an NSEC RR. /// ``` -#[allow(clippy::blocks_in_if_conditions)] +#[allow(clippy::blocks_in_conditions)] #[doc(hidden)] pub fn verify_nsec(query: &Query, soa_name: &Name, nsecs: &[&Record]) -> bool { // TODO: consider converting this to Result, and giving explicit reason for the failure diff --git a/crates/proto/src/xfer/mod.rs b/crates/proto/src/xfer/mod.rs index abd66e5c19..3fae41d82e 100644 --- a/crates/proto/src/xfer/mod.rs +++ b/crates/proto/src/xfer/mod.rs @@ -152,6 +152,7 @@ macro_rules! try_oneshot { ($expr:expr) => {{ use std::result::Result; + #[allow(clippy::blocks_in_conditions)] match $expr { Result::Ok(val) => val, Result::Err(err) => return DnsResponseReceiver::Err(Some(ProtoError::from(err))), diff --git a/crates/resolver/examples/custom_provider.rs b/crates/resolver/examples/custom_provider.rs index 4b4a289811..ebd2b99c1c 100644 --- a/crates/resolver/examples/custom_provider.rs +++ b/crates/resolver/examples/custom_provider.rs @@ -64,7 +64,7 @@ async fn lookup_test(resolver: AsyncResolver) { // this can return IPv4 and/or IPv6 addresses let address = response.iter().next().expect("no addresses returned!"); if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, diff --git a/crates/resolver/src/async_resolver.rs b/crates/resolver/src/async_resolver.rs index 5deeee33be..5030fe8f24 100644 --- a/crates/resolver/src/async_resolver.rs +++ b/crates/resolver/src/async_resolver.rs @@ -477,7 +477,7 @@ pub mod testing { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, @@ -592,7 +592,7 @@ pub mod testing { //assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, @@ -665,7 +665,7 @@ pub mod testing { assert_eq!(response.iter().count(), 2); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, @@ -727,7 +727,7 @@ pub mod testing { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { panic!("should only be looking up IPv4"); } @@ -763,7 +763,7 @@ pub mod testing { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { panic!("should only be looking up IPv4"); } @@ -802,7 +802,7 @@ pub mod testing { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { panic!("should only be looking up IPv4"); } @@ -842,7 +842,7 @@ pub mod testing { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { panic!("should only be looking up IPv4"); } @@ -881,7 +881,7 @@ pub mod testing { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { panic!("should only be looking up IPv4"); } diff --git a/crates/resolver/src/dns_lru.rs b/crates/resolver/src/dns_lru.rs index 9321749555..687c685985 100644 --- a/crates/resolver/src/dns_lru.rs +++ b/crates/resolver/src/dns_lru.rs @@ -410,7 +410,7 @@ mod tests { Record::from_rdata(name.clone(), 1, RData::A(A::new(127, 0, 0, 1))), 1, )]; - let ips = vec![RData::A(A::new(127, 0, 0, 1))]; + let ips = [RData::A(A::new(127, 0, 0, 1))]; // configure the cache with a minimum TTL of 2 seconds. let ttls = TtlConfig { @@ -500,7 +500,7 @@ mod tests { Record::from_rdata(name.clone(), 62, RData::A(A::new(127, 0, 0, 1))), 62, )]; - let ips = vec![RData::A(A::new(127, 0, 0, 1))]; + let ips = [RData::A(A::new(127, 0, 0, 1))]; // configure the cache with a maximum TTL of 60 seconds. let ttls = TtlConfig { @@ -589,7 +589,7 @@ mod tests { Record::from_rdata(name, 1, RData::A(A::new(127, 0, 0, 1))), 1, )]; - let ips = vec![RData::A(A::new(127, 0, 0, 1))]; + let ips = [RData::A(A::new(127, 0, 0, 1))]; let lru = DnsLru::new(1, TtlConfig::default()); let rc_ips = lru.insert(query.clone(), ips_ttl, now); @@ -609,7 +609,7 @@ mod tests { Record::from_rdata(name, 10, RData::A(A::new(127, 0, 0, 1))), 10, )]; - let ips = vec![RData::A(A::new(127, 0, 0, 1))]; + let ips = [RData::A(A::new(127, 0, 0, 1))]; let lru = DnsLru::new(1, TtlConfig::default()); let rc_ips = lru.insert(query.clone(), ips_ttl, now); diff --git a/crates/resolver/src/h2.rs b/crates/resolver/src/h2.rs index be823403a1..069803aae8 100644 --- a/crates/resolver/src/h2.rs +++ b/crates/resolver/src/h2.rs @@ -102,7 +102,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, @@ -121,7 +121,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, diff --git a/crates/resolver/src/h3.rs b/crates/resolver/src/h3.rs index 0fd65734f7..1515c84f2c 100644 --- a/crates/resolver/src/h3.rs +++ b/crates/resolver/src/h3.rs @@ -102,7 +102,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, @@ -121,7 +121,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, diff --git a/crates/resolver/src/lib.rs b/crates/resolver/src/lib.rs index bf26ee27f3..58bb561630 100644 --- a/crates/resolver/src/lib.rs +++ b/crates/resolver/src/lib.rs @@ -60,7 +60,7 @@ //! // this can return IPv4 and/or IPv6 addresses //! let address = response.iter().next().expect("no addresses returned!"); //! if address.is_ipv4() { -//! assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); +//! assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); //! } else { //! assert_eq!(address, IpAddr::V6(Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946))); //! } @@ -126,7 +126,7 @@ //! // this can return IPv4 and/or IPv6 addresses //! let address = response.iter().next().expect("no addresses returned!"); //! if address.is_ipv4() { -//! assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); +//! assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); //! } else { //! assert_eq!(address, IpAddr::V6(Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946))); //! } diff --git a/crates/resolver/src/name_server/name_server_pool.rs b/crates/resolver/src/name_server/name_server_pool.rs index da0d2dc6a7..ba832799a1 100644 --- a/crates/resolver/src/name_server/name_server_pool.rs +++ b/crates/resolver/src/name_server/name_server_pool.rs @@ -613,7 +613,7 @@ mod tests { .data() .and_then(RData::as_a) .expect("no a record available"), - Ipv4Addr::new(93, 184, 216, 34).into() + Ipv4Addr::new(93, 184, 215, 14).into() ); assert!( @@ -637,7 +637,7 @@ mod tests { .data() .and_then(RData::as_aaaa) .expect("no aaaa record available"), - Ipv6Addr::new(0x2606, 0x2800, 0x0220, 0x0001, 0x0248, 0x1893, 0x25c8, 0x1946).into() + Ipv6Addr::new(0x2606, 0x2800, 0x021f, 0xcb07, 0x6820, 0x80da, 0xaf6b, 0x8b2c).into() ); assert!( diff --git a/crates/resolver/src/quic.rs b/crates/resolver/src/quic.rs index 33fa29af86..705dc0588e 100644 --- a/crates/resolver/src/quic.rs +++ b/crates/resolver/src/quic.rs @@ -106,7 +106,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, @@ -125,7 +125,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, diff --git a/crates/resolver/src/resolver.rs b/crates/resolver/src/resolver.rs index 169734fff7..45e2070981 100644 --- a/crates/resolver/src/resolver.rs +++ b/crates/resolver/src/resolver.rs @@ -181,7 +181,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, @@ -206,7 +206,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, diff --git a/crates/resolver/src/tls/mod.rs b/crates/resolver/src/tls/mod.rs index 2ec7f4f788..1614c56b1b 100644 --- a/crates/resolver/src/tls/mod.rs +++ b/crates/resolver/src/tls/mod.rs @@ -56,7 +56,7 @@ mod tests { assert_eq!(response.iter().count(), 1); for address in response.iter() { if address.is_ipv4() { - assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34))); + assert_eq!(address, IpAddr::V4(Ipv4Addr::new(93, 184, 215, 14))); } else { assert_eq!( address, diff --git a/crates/server/src/authority/message_request.rs b/crates/server/src/authority/message_request.rs index b2abb65e41..6af05328eb 100644 --- a/crates/server/src/authority/message_request.rs +++ b/crates/server/src/authority/message_request.rs @@ -277,7 +277,7 @@ impl Queries { length: self.queries.len(), // We don't generally support more than one query, but this will at least give us one // cache entry. - first_query: self.queries.get(0), + first_query: self.queries.first(), cached_serialized: self.original.as_ref(), } } diff --git a/crates/server/src/authority/message_response.rs b/crates/server/src/authority/message_response.rs index 8ce90b34ab..a2f5634b6c 100644 --- a/crates/server/src/authority/message_response.rs +++ b/crates/server/src/authority/message_response.rs @@ -272,7 +272,7 @@ mod tests { let answer = Record::new() .set_record_type(RecordType::A) .set_name(Name::from_str("www.example.com.").unwrap()) - .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into()))) + .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 215, 14).into()))) .set_dns_class(DNSClass::NONE) .clone(); @@ -309,7 +309,7 @@ mod tests { let answer = Record::new() .set_record_type(RecordType::A) .set_name(Name::from_str("www.example.com.").unwrap()) - .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into()))) + .set_data(Some(RData::A(Ipv4Addr::new(93, 184, 215, 14).into()))) .set_dns_class(DNSClass::NONE) .clone(); diff --git a/crates/server/src/store/sqlite/authority.rs b/crates/server/src/store/sqlite/authority.rs index 2b1ddcce26..92d32fceea 100644 --- a/crates/server/src/store/sqlite/authority.rs +++ b/crates/server/src/store/sqlite/authority.rs @@ -450,7 +450,7 @@ impl SqliteAuthority { /// #[cfg(feature = "dnssec")] #[cfg_attr(docsrs, doc(cfg(feature = "dnssec")))] - #[allow(clippy::blocks_in_if_conditions)] + #[allow(clippy::blocks_in_conditions)] pub async fn authorize(&self, update_message: &MessageRequest) -> UpdateResult<()> { // 3.3.3 - Pseudocode for Permission Checking // diff --git a/crates/server/tests/forwarder.rs b/crates/server/tests/forwarder.rs index 0c4d3da777..94c6680469 100644 --- a/crates/server/tests/forwarder.rs +++ b/crates/server/tests/forwarder.rs @@ -33,5 +33,5 @@ fn test_lookup() { .data() .and_then(RData::as_a) .expect("not an A record"); - assert_eq!(*address, Ipv4Addr::new(93, 184, 216, 34).into()); + assert_eq!(*address, Ipv4Addr::new(93, 184, 215, 14).into()); } diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000000..369f9966f6 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +1.77.2 diff --git a/scripts/gen_certs.sh b/scripts/gen_certs.sh index 8f01939b41..9a7b96b610 100755 --- a/scripts/gen_certs.sh +++ b/scripts/gen_certs.sh @@ -37,7 +37,7 @@ EOF # CA echo "----> Generating CA <----" -${OPENSSL:?} req -x509 -new -nodes -newkey rsa:4096 -days 365 -keyout ca.key -out ca.pem -config /tmp/ca.conf +${OPENSSL:?} req -x509 -new -nodes -newkey rsa:4096 -days 365 -keyout ca.key -addext basicConstraints=critical,CA:TRUE,pathlen:1 -out ca.pem -config /tmp/ca.conf ${OPENSSL:?} x509 -in ca.pem -out ca.der -outform der cat <<-EOF > /tmp/cert.conf diff --git a/tests/integration-tests/src/example_authority.rs b/tests/integration-tests/src/example_authority.rs index 2d7c8251e1..03673b0317 100644 --- a/tests/integration-tests/src/example_authority.rs +++ b/tests/integration-tests/src/example_authority.rs @@ -88,7 +88,7 @@ pub fn create_example() -> InMemoryAuthority { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(93, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(93, 184, 215, 14)))) .clone(), 0, ); @@ -143,7 +143,7 @@ pub fn create_example() -> InMemoryAuthority { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(93, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(93, 184, 215, 14)))) .clone(), 0, ); diff --git a/tests/integration-tests/tests/catalog_tests.rs b/tests/integration-tests/tests/catalog_tests.rs index bcf3aafdd0..182215a860 100644 --- a/tests/integration-tests/tests/catalog_tests.rs +++ b/tests/integration-tests/tests/catalog_tests.rs @@ -74,7 +74,7 @@ pub fn create_test() -> InMemoryAuthority { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(94, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(94, 184, 215, 14)))) .clone(), 0, ); @@ -98,7 +98,7 @@ pub fn create_test() -> InMemoryAuthority { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(94, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(94, 184, 215, 14)))) .clone(), 0, ); @@ -158,7 +158,7 @@ async fn test_catalog_lookup() { assert_eq!(answers.first().unwrap().record_type(), RecordType::A); assert_eq!( answers.first().unwrap().data().unwrap(), - &RData::A(A::new(93, 184, 216, 34)) + &RData::A(A::new(93, 184, 215, 14)) ); let ns = result.name_servers(); @@ -193,7 +193,7 @@ async fn test_catalog_lookup() { assert_eq!(answers.first().unwrap().record_type(), RecordType::A); assert_eq!( answers.first().unwrap().data().unwrap(), - &RData::A(A::new(94, 184, 216, 34)) + &RData::A(A::new(94, 184, 215, 14)) ); } @@ -449,7 +449,7 @@ async fn test_axfr() { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(94, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(94, 184, 215, 14)))) .clone(), Record::new() .set_name(origin.clone().into()) @@ -465,7 +465,7 @@ async fn test_axfr() { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(94, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(94, 184, 215, 14)))) .clone(), Record::new() .set_name(www_name) @@ -584,7 +584,7 @@ async fn test_cname_additionals() { assert_eq!(additionals.first().unwrap().record_type(), RecordType::A); assert_eq!( additionals.first().unwrap().data().unwrap(), - &RData::A(A::new(93, 184, 216, 34)) + &RData::A(A::new(93, 184, 215, 14)) ); } @@ -645,6 +645,6 @@ async fn test_multiple_cname_additionals() { assert_eq!(additionals.last().unwrap().record_type(), RecordType::A); assert_eq!( additionals.last().unwrap().data().unwrap(), - &RData::A(A::new(93, 184, 216, 34)) + &RData::A(A::new(93, 184, 215, 14)) ); } diff --git a/tests/integration-tests/tests/client_future_tests.rs b/tests/integration-tests/tests/client_future_tests.rs index e145678012..7010167968 100644 --- a/tests/integration-tests/tests/client_future_tests.rs +++ b/tests/integration-tests/tests/client_future_tests.rs @@ -192,7 +192,7 @@ fn test_query(client: &mut AsyncClient) -> impl Future { assert_eq!(record.dns_class(), DNSClass::IN); if let RData::A(ref address) = record.data().unwrap() { - assert_eq!(address, &A::new(93, 184, 216, 34)) + assert_eq!(address, &A::new(93, 184, 215, 14)) } else { panic!(); } @@ -251,7 +251,7 @@ fn test_query_edns(client: &mut AsyncClient) -> impl Future { &EdnsOption::Subnet("1.2.0.0/16".parse().unwrap()) ); if let RData::A(ref address) = *record.data().unwrap() { - assert_eq!(address, &A::new(93, 184, 216, 34)) + assert_eq!(address, &A::new(93, 184, 215, 14)) } else { panic!(); } diff --git a/tests/integration-tests/tests/client_tests.rs b/tests/integration-tests/tests/client_tests.rs index 1c33e1c548..bbbfb93563 100644 --- a/tests/integration-tests/tests/client_tests.rs +++ b/tests/integration-tests/tests/client_tests.rs @@ -126,7 +126,7 @@ where assert_eq!(record.dns_class(), DNSClass::IN); if let RData::A(ref address) = *record.data().unwrap() { - assert_eq!(address, &A::new(93, 184, 216, 34)) + assert_eq!(address, &A::new(93, 184, 215, 14)) } else { panic!(); } @@ -184,7 +184,7 @@ where ); if let RData::A(ref address) = *record.data().unwrap() { - assert_eq!(address, &A::new(93, 184, 216, 34)) + assert_eq!(address, &A::new(93, 184, 215, 14)) } else { panic!(); } @@ -243,7 +243,7 @@ where assert_eq!(record.dns_class(), DNSClass::IN); if let RData::A(ref address) = *record.data().unwrap() { - assert_eq!(address, &A::new(93, 184, 216, 34)) + assert_eq!(address, &A::new(93, 184, 215, 14)) } else { panic!(); } diff --git a/tests/integration-tests/tests/dnssec_client_handle_tests.rs b/tests/integration-tests/tests/dnssec_client_handle_tests.rs index 1fead83ce5..f067fafa14 100644 --- a/tests/integration-tests/tests/dnssec_client_handle_tests.rs +++ b/tests/integration-tests/tests/dnssec_client_handle_tests.rs @@ -64,7 +64,7 @@ where assert_eq!(record.dns_class(), DNSClass::IN); if let RData::A(ref address) = *record.data().unwrap() { - assert_eq!(address, &A::new(93, 184, 216, 34)) + assert_eq!(address, &A::new(93, 184, 215, 14)) } else { panic!(); } diff --git a/tests/integration-tests/tests/lookup_tests.rs b/tests/integration-tests/tests/lookup_tests.rs index 61aa46b725..e4a3c9a183 100644 --- a/tests/integration-tests/tests/lookup_tests.rs +++ b/tests/integration-tests/tests/lookup_tests.rs @@ -51,7 +51,7 @@ fn test_lookup() { assert_eq!( *lookup.iter().next().unwrap(), - RData::A(A::new(93, 184, 216, 34)) + RData::A(A::new(93, 184, 215, 14)) ); } @@ -178,7 +178,7 @@ fn test_mock_lookup() { let resp_query = Query::query(Name::from_str("www.example.com.").unwrap(), RecordType::A); let v4_record = v4_record( Name::from_str("www.example.com.").unwrap(), - Ipv4Addr::new(93, 184, 216, 34), + Ipv4Addr::new(93, 184, 215, 14), ); let message = message(resp_query, vec![v4_record], vec![], vec![]); let client: MockClientHandle<_, ResolveError> = @@ -196,7 +196,7 @@ fn test_mock_lookup() { assert_eq!( *lookup.iter().next().unwrap(), - RData::A(A::new(93, 184, 216, 34)) + RData::A(A::new(93, 184, 215, 14)) ); } @@ -209,7 +209,7 @@ fn test_cname_lookup() { ); let v4_record = v4_record( Name::from_str("v4.example.com.").unwrap(), - Ipv4Addr::new(93, 184, 216, 34), + Ipv4Addr::new(93, 184, 215, 14), ); let message = message(resp_query, vec![cname_record, v4_record], vec![], vec![]); let client: MockClientHandle<_, ResolveError> = @@ -227,7 +227,7 @@ fn test_cname_lookup() { assert_eq!( *lookup.iter().next().unwrap(), - RData::A(A::new(93, 184, 216, 34)) + RData::A(A::new(93, 184, 215, 14)) ); } @@ -240,7 +240,7 @@ fn test_cname_lookup_preserve() { ); let v4_record = v4_record( Name::from_str("v4.example.com.").unwrap(), - Ipv4Addr::new(93, 184, 216, 34), + Ipv4Addr::new(93, 184, 215, 14), ); let message = message( resp_query, @@ -263,7 +263,7 @@ fn test_cname_lookup_preserve() { let mut iter = lookup.iter(); assert_eq!(iter.next().unwrap(), cname_record.data().unwrap()); - assert_eq!(*iter.next().unwrap(), RData::A(A::new(93, 184, 216, 34))); + assert_eq!(*iter.next().unwrap(), RData::A(A::new(93, 184, 215, 14))); } #[test] @@ -275,7 +275,7 @@ fn test_chained_cname_lookup() { ); let v4_record = v4_record( Name::from_str("v4.example.com.").unwrap(), - Ipv4Addr::new(93, 184, 216, 34), + Ipv4Addr::new(93, 184, 215, 14), ); // The first response should be a cname, the second will be the actual record @@ -300,7 +300,7 @@ fn test_chained_cname_lookup() { assert_eq!( *lookup.iter().next().unwrap(), - RData::A(A::new(93, 184, 216, 34)) + RData::A(A::new(93, 184, 215, 14)) ); } @@ -313,7 +313,7 @@ fn test_chained_cname_lookup_preserve() { ); let v4_record = v4_record( Name::from_str("v4.example.com.").unwrap(), - Ipv4Addr::new(93, 184, 216, 34), + Ipv4Addr::new(93, 184, 215, 14), ); // The first response should be a cname, the second will be the actual record @@ -343,7 +343,7 @@ fn test_chained_cname_lookup_preserve() { let mut iter = lookup.iter(); assert_eq!(iter.next().unwrap(), cname_record.data().unwrap()); - assert_eq!(*iter.next().unwrap(), RData::A(A::new(93, 184, 216, 34))); + assert_eq!(*iter.next().unwrap(), RData::A(A::new(93, 184, 215, 14))); } #[test] @@ -387,7 +387,7 @@ fn test_max_chained_lookup_depth() { ); let v4_record = v4_record( Name::from_str("v4.example.com.").unwrap(), - Ipv4Addr::new(93, 184, 216, 34), + Ipv4Addr::new(93, 184, 215, 14), ); // The first response should be a cname, the second will be the actual record @@ -442,6 +442,6 @@ fn test_max_chained_lookup_depth() { assert_eq!( *lookup.iter().next().unwrap(), - RData::A(A::new(93, 184, 216, 34)) + RData::A(A::new(93, 184, 215, 14)) ); } diff --git a/tests/integration-tests/tests/server_future_tests.rs b/tests/integration-tests/tests/server_future_tests.rs index e7999cc078..6f60a10c21 100644 --- a/tests/integration-tests/tests/server_future_tests.rs +++ b/tests/integration-tests/tests/server_future_tests.rs @@ -351,7 +351,7 @@ where assert_eq!(record.dns_class(), DNSClass::IN); if let RData::A(ref address) = *record.data().unwrap() { - assert_eq!(address, &A::new(93, 184, 216, 34)) + assert_eq!(address, &A::new(93, 184, 215, 14)) } else { panic!(); } diff --git a/tests/integration-tests/tests/sqlite_authority_tests.rs b/tests/integration-tests/tests/sqlite_authority_tests.rs index ac434e4bb8..e94eef3c63 100644 --- a/tests/integration-tests/tests/sqlite_authority_tests.rs +++ b/tests/integration-tests/tests/sqlite_authority_tests.rs @@ -52,7 +52,7 @@ async fn test_search() { let record = result.iter().next().unwrap(); assert_eq!(record.record_type(), RecordType::A); assert_eq!(record.dns_class(), DNSClass::IN); - assert_eq!(record.data().unwrap(), &RData::A(A::new(93, 184, 216, 34))); + assert_eq!(record.data().unwrap(), &RData::A(A::new(93, 184, 215, 14))); } else { panic!("expected a result"); // valid panic, in test } @@ -82,7 +82,7 @@ async fn test_search_www() { let record = result.iter().next().unwrap(); assert_eq!(record.record_type(), RecordType::A); assert_eq!(record.dns_class(), DNSClass::IN); - assert_eq!(record.data().unwrap(), &RData::A(A::new(93, 184, 216, 34))); + assert_eq!(record.data().unwrap(), &RData::A(A::new(93, 184, 215, 14))); } else { panic!("expected a result"); // valid panic, in test } @@ -199,7 +199,7 @@ async fn test_authority() { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(93, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(93, 184, 215, 14)))) .clone() ); } @@ -369,7 +369,7 @@ async fn test_prerequisites() { .set_ttl(0) .set_dns_class(DNSClass::IN) .set_rr_type(RecordType::A) - .set_data(Some(RData::A(A::new(93, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(93, 184, 215, 14)))) .clone()]) .await .is_ok()); @@ -381,7 +381,7 @@ async fn test_prerequisites() { .set_ttl(0) .set_dns_class(DNSClass::CH) .set_rr_type(RecordType::A) - .set_data(Some(RData::A(A::new(93, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(93, 184, 215, 14)))) .clone()],) .await, Err(ResponseCode::FormErr) @@ -665,7 +665,7 @@ async fn test_update() { .set_ttl(86400) .set_rr_type(RecordType::A) .set_dns_class(DNSClass::IN) - .set_data(Some(RData::A(A::new(93, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(93, 184, 215, 14)))) .clone(), Record::new() .set_name(www_name.clone()) @@ -1010,7 +1010,7 @@ async fn test_journal() { let delete_record = Record::new() .set_name(delete_name.clone()) .set_record_type(RecordType::A) - .set_data(Some(RData::A(A::new(93, 184, 216, 34)))) + .set_data(Some(RData::A(A::new(93, 184, 215, 14)))) .set_dns_class(DNSClass::NONE) .clone(); authority @@ -1073,7 +1073,7 @@ async fn test_journal() { } #[tokio::test] -#[allow(clippy::blocks_in_if_conditions)] +#[allow(clippy::blocks_in_conditions)] async fn test_recovery() { // test that this message can be inserted let conn = Connection::open_in_memory().expect("could not create in memory DB"); diff --git a/tests/test-data/ca.der b/tests/test-data/ca.der index 5f83c6f115..5208cf2d11 100644 Binary files a/tests/test-data/ca.der and b/tests/test-data/ca.der differ diff --git a/tests/test-data/ca.key b/tests/test-data/ca.key index 35c37cff0c..465c231536 100644 --- a/tests/test-data/ca.key +++ b/tests/test-data/ca.key @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -dGcY+b1yZpoODxeTcCRKEvxWGCl7hA== +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 +DTlr5PIXGDuCviXOjBkiwDnSLbaZ0Mc= -----END PRIVATE KEY----- diff --git a/tests/test-data/ca.pem b/tests/test-data/ca.pem index c4b26b7329..f9e43bdee2 100644 --- a/tests/test-data/ca.pem +++ b/tests/test-data/ca.pem @@ -1,31 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFWTCCA0ECFCjit4xzVF45CewzmKO5a3vtrQ9VMA0GCSqGSIb3DQEBCwUAMGkx -CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4g -RnJhbmNpc2NvMRIwEAYDVQQKDAlUcnVzdC1ETlMxGTAXBgNVBAMMEHJvb3QuZXhh -bXBsZS5jb20wHhcNMjIxMTI3MTE1OTMxWhcNMjMxMTI3MTE1OTMxWjBpMQswCQYD -VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j -aXNjbzESMBAGA1UECgwJVHJ1c3QtRE5TMRkwFwYDVQQDDBByb290LmV4YW1wbGUu -Y29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArX5jEnMaQ/11AU9D -fnPerlgFWCJBY/p4hmLjbDjXQOgZzejR47Z+jwlU3I9RvZ5HAAScOFEQS9nv9eTE -/qLt6qoOULv48LfSgFejhfVodmuAAp/6y4p6bvSqi/hYiBcKxqTwGqTa+ZAGE7L+ -6ZcYkW4aluhY0OGf5ggvr7WhBli+9GC4UkV7eBG1qZNsVZI1/ijEtDmFNmdMvaCm -Ek1jMlmGn8IhYu33HXeyRk8fSy/E5HvtWBJN3nkDD0SqARNq31UaeD6Wvw68Rh1w -fXcqONI/VQ0pLSGHMqpKabdiAPKOPIt+wOKXM2A/8Wb+Q6pmbGN+xtNScX4vP/Nq -RwZqKSEtR0x8thpaIdM1Ec+9k87zJrgDxDY+ZhgK3tIkZhti1VJA1/WWpZGyby4X -jXZQRL2yuKiDPD0HBOvWIiEzviYtt5XkS6AgNWg1luSvytZKQ3wLxZTcTNa5KUC6 -G7qpumS7weIv96oIxiNOA/9DAbPBPCZP6tNsr89pXocRutOCL53H/n0QrLjh+HNS -ZHLOCFyPNyxoeB6NFSj8owYm1IORHG3yYDOP+8TvCuSJNbMmIxva96v9/SVcQJAc -/0ovFEJ9qYYC6OUFRTpBKdFLPalJR/JhG6OXKGQx/XL8n1pNJI181Z+wnW1UVdMQ -vpGQ4jfVTikLeozF4D7Ia6dMMqkCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAC2nO -NZHxdkMlrgvVit6EKJzT+ZeSygbXDnxnPAbAPvCg6+j4L/Ja2mnnWAQHXXd9DoKb -TG2UR61U0Js+2fOe8ZJEL+zsjZYf8U+UC4+eJbTZTFe60kP/PEXCEA0qBhExQeR4 -TVlth36k88gUREZj3fnx+UZVN5aiWVgN1PjB4zJm+6VK1JqabzB56BgddBBB9Mkp -sYxCdlWyNpSdcvy/7S82NTonJ6E7q0oInbzTBLz6h4Sn83Ur3sGsTXatG+TOOZrW -Ougx4ZJMzeHoDnvWK+exjXUEhVP9KSXmIAzxKBjUsMLQuszmLDBmdtfDuT/Mx/2x -YejiYDatPw5Q2HzxkbXCXpOHvUlAAQTKx4RP14NV7FP/knTXGTmTjwE1q1Hh4H+W -MCy8jKH+uNNP5Bo5h/w4ffHCTF8U9vZ0gW1NA23wzHOoGeXU3iNqUoVCOrHs00W/ -ryu8N0nQhcKvy0XvaPAWK6vLnfCcLQ5u5KSjb2kc7fpEGuOC6wuP97DA+12gv+aX -nW1BFXgC2UiK3UscvZQGz3fQudKa1BzuR9YExHgcA5k9aiTdnlkpJ2D951X9dHSZ -smnZtg2KGg/e1Gvzat8MW7lPMqgYf06wpMoiI9G65MpTiB81XW8sZw72W6x2zLJ3 -PAf+Y591HKpqmGR6TpgWQpoASakqqqAjCsbban0= +MIIFmTCCA4GgAwIBAgIUWZO9/SiPkwW27lkZhUi58jO+epgwDQYJKoZIhvcNAQEL +BQAwazELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xFDASBgNVBAoMC0hpY2tvcnkgRE5TMRkwFwYDVQQDDBBy +b290LmV4YW1wbGUuY29tMB4XDTI0MTIxMDE1NDgwMloXDTI1MTIxMDE1NDgwMlow +azELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh +biBGcmFuY2lzY28xFDASBgNVBAoMC0hpY2tvcnkgRE5TMRkwFwYDVQQDDBByb290 +LmV4YW1wbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtTpC +wYouAUIcgVTTHzpWbyMruCf/Ji/g5GK7QZimx0ETZzk5YlDkuocw/Id8El6TlCpJ +TvWAd29V8eBx6sjIhiLzD9jUeKtRxvHYrGSbZAcK2z7L7ktfOnM20O89xv+KxIdU +oDa8jU6iAxSmDSmfzkEzRZpzg2bbVyp02Feb0XcDSM1NKHmO+y/Gj7uTb5rNSe9p +SOtgyTv8YfwmaSamnNOuPsGoI2dLr3JO+MrOMaItMvE+mAn66JTOseW8P4y/OB4A +2Ufd2gUGTY04N3D/GRRnEosvm8DjkmRtC10vVP0bOor5EWS8jn/HmQyqiQEz0ik1 +9XrVktQnhJFBJNsAqMGMMOKhUu7kSlyTuHMI2d1T4E/mznfTx5Seh9FjXrsLnlE4 +BrjvMJccIobyytNqn1iOKiOijeoPH1lgwBMRVFkbJGLsU0ByYnCZyh54SOc23Rl9 +2RZ9EEfiXqL3Cq/gtazw+waxBGEIPwdoHCIweGA/WZ1wYDN2cUkcJ+tJLjCSFA1V +vDMk5uViVkJGQNxu3yhPPEsP0uKIV261KmXa6DfLBGtIihG4OinvuQh2JIbnAnJR +JLCfw5LgNIxWyXjFzWLv01VR0gi/rTQ8geM3s0shgt7AmK7AWXzE2yi4bs5AD1PJ +pY3JtgtgQiONhEjz/GLx7hAQj1vQ3Xxu15e3lcMCAwEAAaM1MDMwEgYDVR0TAQH/ +BAgwBgEB/wIBATAdBgNVHQ4EFgQUCAqkf28QZsBTHKe9j/20rsIr3uAwDQYJKoZI +hvcNAQELBQADggIBAAtPC4h2tofOSc79uK3L2qmUIq/BBmpdqgPHV/LpqCKZFdK8 +WQEW+rmBG2pny2HvYzXAwHunAKK01CYIpcBYZfayzqnmBr6IVTdi4Iip3YGd0dyW +cGjHa2s+Eq5lQ5ojNicvkiqeca2lHpPK5qfZmfeMeZCidNoYQ4Jsn/GE193E46Ts +GPvueX79LG50WtCeX6cBXEeOC/nxj16V1i4jQNvx/Y4Eb7jrxSlwT425KseaSsct +k3mPVihhEdtpA0CXMUjJYKdBtzHzd3FpF2iv36K2Tj67e0AbRGeCtSHS8ZmysIrN +/mnR1Juhax83QQtV1SQZDhFfMXHpyNKVKW32pu4k7niRjvoFlcT4t0Ukvphlj2Kw +v1fECYRFUaAWKu03jV3pK/CPo6Qe0v1AMedWcTUkyRDL9/Tq5L8fM2Pkg8mHlCvf ++DJUH6t4WPU0Tylct9W1HZSiFThwFU02uO6bD/L+4vd+1f3Qo4ogn9srxZCulhCH +i6Xr6UyYfUTkaXjyFwuh9l+ziGi1vK5R19fyMjhRstMNgdAFbEvxN3DqjlskYska +FWEChGOET6JLC99XeIOMu9rKCeGjpoeC2SfQBSC6ERb5Dzlv32xGDPbNLA2//3Xg +70Ldp4Uu67/U01wUvjwV52RvkhXgHzotJl+rgg6o6iOsNcI34qf0jZ3LFwfa -----END CERTIFICATE----- diff --git a/tests/test-data/ca.pubkey b/tests/test-data/ca.pubkey index 040d058e64..9df4b40d66 100644 --- a/tests/test-data/ca.pubkey +++ b/tests/test-data/ca.pubkey @@ -1,14 +1,14 @@ -----BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArX5jEnMaQ/11AU9DfnPe -rlgFWCJBY/p4hmLjbDjXQOgZzejR47Z+jwlU3I9RvZ5HAAScOFEQS9nv9eTE/qLt -6qoOULv48LfSgFejhfVodmuAAp/6y4p6bvSqi/hYiBcKxqTwGqTa+ZAGE7L+6ZcY -kW4aluhY0OGf5ggvr7WhBli+9GC4UkV7eBG1qZNsVZI1/ijEtDmFNmdMvaCmEk1j -MlmGn8IhYu33HXeyRk8fSy/E5HvtWBJN3nkDD0SqARNq31UaeD6Wvw68Rh1wfXcq -ONI/VQ0pLSGHMqpKabdiAPKOPIt+wOKXM2A/8Wb+Q6pmbGN+xtNScX4vP/NqRwZq -KSEtR0x8thpaIdM1Ec+9k87zJrgDxDY+ZhgK3tIkZhti1VJA1/WWpZGyby4XjXZQ -RL2yuKiDPD0HBOvWIiEzviYtt5XkS6AgNWg1luSvytZKQ3wLxZTcTNa5KUC6G7qp -umS7weIv96oIxiNOA/9DAbPBPCZP6tNsr89pXocRutOCL53H/n0QrLjh+HNSZHLO -CFyPNyxoeB6NFSj8owYm1IORHG3yYDOP+8TvCuSJNbMmIxva96v9/SVcQJAc/0ov -FEJ9qYYC6OUFRTpBKdFLPalJR/JhG6OXKGQx/XL8n1pNJI181Z+wnW1UVdMQvpGQ -4jfVTikLeozF4D7Ia6dMMqkCAwEAAQ== +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtTpCwYouAUIcgVTTHzpW +byMruCf/Ji/g5GK7QZimx0ETZzk5YlDkuocw/Id8El6TlCpJTvWAd29V8eBx6sjI +hiLzD9jUeKtRxvHYrGSbZAcK2z7L7ktfOnM20O89xv+KxIdUoDa8jU6iAxSmDSmf +zkEzRZpzg2bbVyp02Feb0XcDSM1NKHmO+y/Gj7uTb5rNSe9pSOtgyTv8YfwmaSam +nNOuPsGoI2dLr3JO+MrOMaItMvE+mAn66JTOseW8P4y/OB4A2Ufd2gUGTY04N3D/ +GRRnEosvm8DjkmRtC10vVP0bOor5EWS8jn/HmQyqiQEz0ik19XrVktQnhJFBJNsA +qMGMMOKhUu7kSlyTuHMI2d1T4E/mznfTx5Seh9FjXrsLnlE4BrjvMJccIobyytNq +n1iOKiOijeoPH1lgwBMRVFkbJGLsU0ByYnCZyh54SOc23Rl92RZ9EEfiXqL3Cq/g +tazw+waxBGEIPwdoHCIweGA/WZ1wYDN2cUkcJ+tJLjCSFA1VvDMk5uViVkJGQNxu +3yhPPEsP0uKIV261KmXa6DfLBGtIihG4OinvuQh2JIbnAnJRJLCfw5LgNIxWyXjF +zWLv01VR0gi/rTQ8geM3s0shgt7AmK7AWXzE2yi4bs5AD1PJpY3JtgtgQiONhEjz +/GLx7hAQj1vQ3Xxu15e3lcMCAwEAAQ== -----END PUBLIC KEY----- diff --git a/tests/test-data/cert.csr b/tests/test-data/cert.csr index 219e2e4c82..7ba11b92e9 100644 --- a/tests/test-data/cert.csr +++ b/tests/test-data/cert.csr @@ -1,29 +1,29 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIE8DCCAtgCAQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx -FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEjAQBgNVBAoMCVRydXN0LUROUzEXMBUG -A1UEAwwObnMuZXhhbXBsZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK -AoICAQC/gFqZ6cpMTEtSWfPo44h0UFu9dukmuGxj/LC43VZxH2JhbLvcl+/29QBd -YFQW1FyAD1mbLQMn2dsQsoU3FaQXklPI5BJfDCDFECs7guCCPx2lE6ICd6jYHsTk -U4VDiaMCzGaR+gF/TD6yTaLf65GYPrJd3E+1FdPAzrYuttduT2nJdkvQMmyRWQGs -dZjZE54JKCzCkAM+H3LRq0QY9i/YA3gxwHJVCpDVXl7v7z2dFXreVR581JBu4Hgp -PdIzSIlnrfOHuLNglNaI0SUH0k2Ys9NcYKHvASq/Lm83hddX7X+gRepq48PGiBbp -A6TvGOSMveHGNK2XkTX0pFTriCBWix9Z817IAQF9LuKb5FBXGmgNll/qEvl4UA+R -l/K/tZ9+1xTGd0Oa+zYqnRAF16fSOkdN9VGOwRXb92cdHlx2zzSH4yyjaJFzyw4o -tu+cFDhEoo+D/dj+bQDooxwf0K72qP6wcs2CRcIl0vLlHBZL8S6IQtQQCX/6SToB -PDxu1y6plrcyiv2SGbg2WT0UAnXPoFSApj6eS6T2UhdCmPLbyoiewPG+3VbwiqPE -IWeiyZtsg6yf1jNbDqEbKzDGAC7fxiLvB+YdL8yi28l/5sdBJ9Uzfn4skVA99N0V -kkVXIFEXC8K8qTvFE5tg7gr/xjgQ4GOd3q8zgLrrUsyaFvzrDQIDAQABoEQwQgYJ -KoZIhvcNAQkOMTUwMzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAZBgNVHREEEjAQ -gg5ucy5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAgEAY/O8JFy4yjlD6LfM -ivxnEbnzSmnQGeN5yOZMzUxG3X3AttB1yEnGz2eXOWqdWaJINmqTWD8ur6378Q8B -r1sqT0cBHCm0h7XcA2eRgLGipTTcC2DNaO0Pd9mbds/kP8oChUC0SOnoZlMK/EwT -m4wbzxx2jmslev95OKleD9ov70xPwDful8IngZN8hjryERsluZt7rGk1Js114Cbu -2O3LDu4WzURpvBuNOg0R8vhmwmL+syrmGp+c7zs19L4RjNykCtBy4PUB+NsKszzK -M57FHgR4Vn+3OLgu9F4n6D8ZC9nH0/inOkxKA415CC6vfKVUmozgHgBgQ241K5vS -Inj4p2usGV/OeGZqSOREsUTX14xmsUDmRi0XxckT2kWTl83taVmMeNLIjJ6daQYG -l5JH46FgaIU1eGY51n3qcFSb1EPSkiWcV6fPPZo5DMEDbHoQV0N2aTEY5pZo/K48 -umPZLdhgHig2YkJqMbQFfmMitdLlNrLZrQICCf0rIQuGhy5AfYIPJobZgb4oM24V -5n6o7OF2M5HIEMUYDmOX/s2CaifuI6ES9Grd0IyZlbFxUBBkdCxF5o7l/3Z9uRCQ -XtXOm6PkBamhCsXab8lqmQgeI7k0TcyxMEPPU+RoCho3K3DLSZ4vtzrJzsV7AMqY -99JpK1/13gudvv1/YKH9g2sy5js= +MIIE8jCCAtoCAQAwaTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xFDASBgNVBAoMC0hpY2tvcnkgRE5TMRcw +FQYDVQQDDA5ucy5leGFtcGxlLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC +AgoCggIBAK3O+BKtc0yZ/ssbOkw8FSx8hQRLZNX/JMnAj4lzuXT7VYq8oYe2p0pN +rONb8dza4+r1MY2KtkmvIzh8HG9ZvEykN2D38Ru6wMqV7SHFsnAh8YgP/Baf5NHQ +5aJbFq+nzdlK0MOZSHGsZWhHe61AV5jtWcyVVtJKalu6naaHaC2yZYlxPIwTCP7c +YbOc6xOueQZ7wY+kXHSmH6tULJbCJR5zBnYDeBoFjbQ2ZxmJcRJ5pKZTeZUXt4mr +mjkBH8WVjnkzRH6QaplJxB3F7llS1xwroGET9c2G9r8rkJMWdT0IS6xEvYK7N/1n +jvlz0JY5bhWCVTgVAIouNyMzLIesopj3Xw03jzTfSpSjq84ptzFq09f85b0aKMpA +2VNfcZ3e76brC/l4AqB6UevLl9nQdLCpohgS3kCdVSHY8pbuip5ZbSh4rd0u5rPg +ncbGH56FMpzl6txusMSLGQBfdlVF4Y2XgT3eaqGntbnVqabJaKk9yeSEOjyABDdB +OUvutS9QnBxxeO4vSq+0V6VAUj+UPvTzTDZKPECqE8jFjPKeybL/OuMWXmFneYeG +Bcbv0JalIq/flLOlxXIHMDEWqy826rj3XBhXQwFHwapkH2sdbU6JENqinzRAwVC3 +SAOJ+3CfLwzIUHPDDM1oYLcmVSIk4GEoExE17/l1vjioOYQ7LQbfAgMBAAGgRDBC +BgkqhkiG9w0BCQ4xNTAzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMBkGA1UdEQQS +MBCCDm5zLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4ICAQCWovHyCqxHqd+9 +/bOauVsZvWSIHMpTbc/NzsgGkfRZvi9IpCcepJjBZb/SPemdQLRPHAavVpTI/zzx +CYhLGt35q5g3Sib3lLkyYPM6z33v3PesHbMSZ3+XSG6459sv8SAX89etJC00Mj8K +3zakxvOQkUPtNPLlQmaDARk+rZNAkwoa2N7AONsSjz3OmYXEvSJNe9nauIYtnyxw +UYOegexXUKoV2yA2YptDNoISWEYYA/Vx/b8X4pH7kEis8SICpdPlq4/qIXsfP7Wt +sW+YIXj3BM69M2EWAb7qc8lIyxTj/jSnqjiaTunobTvSMKBFw6L5L+TxIJVqzrbv +ViC2Fu+ZwFOxyTcS/4Q+Y2V2B3NovHwdS05eYL4rFmrDhjFaBSndRkZKZXTXyg+9 +tiKkze/0BuNyflj/bxVksssb2Fk1thBktHVKrUmXMXQyBTorvUMzXm8pSoDyIBdo +U1zxXXCp8L7zsoX/zB08uZ5UafnCbHQZyuVHnxT8qx85qUL2Iswtz7TP9EEE9mkC +lh+OkXhfnYHXZW+hinEE7wm7KmkJBxp3eMOKgfRCq1zF6qLpeVWb4Lpj7BLxSrZP +sI5W3wf7dK9W5C55cqDhbOancXNA4JW/sVaiKTRQ2+eZPVkf8s2p0vuxnUA4mlik +hZWQRP0gjaQgdx/rkyYn6KgCFvgp0A== -----END CERTIFICATE REQUEST----- diff --git a/tests/test-data/cert.key b/tests/test-data/cert.key index 44331905af..67899b212a 100644 --- a/tests/test-data/cert.key +++ b/tests/test-data/cert.key @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -bPLsMSwzUl5XrzdT74t4xqc40dTzDA== +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 +KuUqYPfEKfA27NzVwfSYllyOEXE0VfU= -----END PRIVATE KEY----- diff --git a/tests/test-data/cert.p12 b/tests/test-data/cert.p12 index affe1b2255..eb577b68e1 100644 Binary files a/tests/test-data/cert.p12 and b/tests/test-data/cert.p12 differ diff --git a/tests/test-data/cert.pem b/tests/test-data/cert.pem index a91f3ba6b7..82ece44b18 100644 --- a/tests/test-data/cert.pem +++ b/tests/test-data/cert.pem @@ -1,36 +1,33 @@ -----BEGIN CERTIFICATE----- -MIIGPDCCBCSgAwIBAgIJAIdx973umC+mMA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNV +MIIFzDCCA7SgAwIBAgIJAIdx973umC+mMA0GCSqGSIb3DQEBCwUAMGsxCzAJBgNV BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMRIwEAYDVQQKDAlUcnVzdC1ETlMxGTAXBgNVBAMMEHJvb3QuZXhhbXBsZS5j -b20wHhcNMjIxMTI3MTE1OTM2WhcNMjMxMTI3MTE1OTM2WjBnMQswCQYDVQQGEwJV -UzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzES -MBAGA1UECgwJVHJ1c3QtRE5TMRcwFQYDVQQDDA5ucy5leGFtcGxlLmNvbTCCAiIw -DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL+AWpnpykxMS1JZ8+jjiHRQW712 -6Sa4bGP8sLjdVnEfYmFsu9yX7/b1AF1gVBbUXIAPWZstAyfZ2xCyhTcVpBeSU8jk -El8MIMUQKzuC4II/HaUTogJ3qNgexORThUOJowLMZpH6AX9MPrJNot/rkZg+sl3c -T7UV08DOti62125Pacl2S9AybJFZAax1mNkTngkoLMKQAz4fctGrRBj2L9gDeDHA -clUKkNVeXu/vPZ0Vet5VHnzUkG7geCk90jNIiWet84e4s2CU1ojRJQfSTZiz01xg -oe8BKr8ubzeF11ftf6BF6mrjw8aIFukDpO8Y5Iy94cY0rZeRNfSkVOuIIFaLH1nz -XsgBAX0u4pvkUFcaaA2WX+oS+XhQD5GX8r+1n37XFMZ3Q5r7NiqdEAXXp9I6R031 -UY7BFdv3Zx0eXHbPNIfjLKNokXPLDii275wUOESij4P92P5tAOijHB/Qrvao/rBy -zYJFwiXS8uUcFkvxLohC1BAJf/pJOgE8PG7XLqmWtzKK/ZIZuDZZPRQCdc+gVICm -Pp5LpPZSF0KY8tvKiJ7A8b7dVvCKo8QhZ6LJm2yDrJ/WM1sOoRsrMMYALt/GIu8H -5h0vzKLbyX/mx0En1TN+fiyRUD303RWSRVcgURcLwrypO8UTm2DuCv/GOBDgY53e -rzOAuutSzJoW/OsNAgMBAAGjgegwgeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw -GQYDVR0RBBIwEIIObnMuZXhhbXBsZS5jb20wHQYDVR0OBBYEFI+OX/cZzkcIT7hR -ffpqG/5IeM4WMIGQBgNVHSMEgYgwgYWhbaRrMGkxCzAJBgNVBAYTAlVTMRMwEQYD -VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMRIwEAYDVQQK -DAlUcnVzdC1ETlMxGTAXBgNVBAMMEHJvb3QuZXhhbXBsZS5jb22CFCjit4xzVF45 -CewzmKO5a3vtrQ9VMA0GCSqGSIb3DQEBCwUAA4ICAQBn6dzJpo1YpAinWX65D7IJ -sIKM5Gazyj33KUNXDKK0xhoS1fJWGiHG3Rg9x8R11MSASueva++h8Ve8eaFbZHrY -lnNHea9x4XGlhhM+XVis2tgk7NtucofZlOnmJq68vxTu3hpKkzX7kNRkytnBGoqD -nZVwKxDFAlAm1oCno1fn85/4h6UCxAe06dGq4yyqAREbv4xquZIsd8Wpyl2aLTLb -2ba2q4v8YZ1jTjpNuQuI/HiNbXJoQR6hswkh4sknP1iv1QFOlRa98KubJQdSJ57Z -e1pyCNvTSzC5G77ZfMzA6jeK4HZRe2yrz75CKRWgo76CSW9A7sCoDBPM3ylN5eqp -rpWnVsaWFTDvhxiXOCDY7rjnM0xLItNWNxnev+ItNmqQkGO9PYFtFzBEz7JV/6lb -ns7y2Q1OpFsIfluT4XTJsNjjzbCTEIrG4fWgZ6W6VDq7qSoTgQElu8gwAwwkj2eF -Jm7BT7+HXD0G+Me2nkezUhy1GVe1dASecTQ+omfI4ubp0+qqVDt1PMIb/0GT2bZo -bzSb+7RuzjIczlgaOFW+8GEY4V0xVKSEe5btMJHAprysnbfniV/Q4wrLa8LB+LbN -WgaUVvt2TuOYjJoJ12HWFc6YttecsvVD4ZXYfosqOt+vMBNhq55k20FTpxXseD8q -J8aHzxshGtoM32JkFwwO3w== +c2NvMRQwEgYDVQQKDAtIaWNrb3J5IEROUzEZMBcGA1UEAwwQcm9vdC5leGFtcGxl +LmNvbTAeFw0yNDEyMTAxNTQ4MDNaFw0yNTEyMTAxNTQ4MDNaMGkxCzAJBgNVBAYT +AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv +MRQwEgYDVQQKDAtIaWNrb3J5IEROUzEXMBUGA1UEAwwObnMuZXhhbXBsZS5jb20w +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtzvgSrXNMmf7LGzpMPBUs +fIUES2TV/yTJwI+Jc7l0+1WKvKGHtqdKTazjW/Hc2uPq9TGNirZJryM4fBxvWbxM +pDdg9/EbusDKle0hxbJwIfGID/wWn+TR0OWiWxavp83ZStDDmUhxrGVoR3utQFeY +7VnMlVbSSmpbup2mh2gtsmWJcTyMEwj+3GGznOsTrnkGe8GPpFx0ph+rVCyWwiUe +cwZ2A3gaBY20NmcZiXESeaSmU3mVF7eJq5o5AR/FlY55M0R+kGqZScQdxe5ZUtcc +K6BhE/XNhva/K5CTFnU9CEusRL2Cuzf9Z475c9CWOW4VglU4FQCKLjcjMyyHrKKY +918NN48030qUo6vOKbcxatPX/OW9GijKQNlTX3Gd3u+m6wv5eAKgelHry5fZ0HSw +qaIYEt5AnVUh2PKW7oqeWW0oeK3dLuaz4J3Gxh+ehTKc5ercbrDEixkAX3ZVReGN +l4E93mqhp7W51ammyWipPcnkhDo8gAQ3QTlL7rUvUJwccXjuL0qvtFelQFI/lD70 +80w2SjxAqhPIxYzynsmy/zrjFl5hZ3mHhgXG79CWpSKv35SzpcVyBzAxFqsvNuq4 +91wYV0MBR8GqZB9rHW1OiRDaop80QMFQt0gDiftwny8MyFBzwwzNaGC3JlUiJOBh +KBMRNe/5db44qDmEOy0G3wIDAQABo3UwczAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF +4DAZBgNVHREEEjAQgg5ucy5leGFtcGxlLmNvbTAdBgNVHQ4EFgQUEYCsDwz3d3GL +i025WLzuztCV9F4wHwYDVR0jBBgwFoAUCAqkf28QZsBTHKe9j/20rsIr3uAwDQYJ +KoZIhvcNAQELBQADggIBAHJIf71vCCB6SIp3NjPQOhlPlQmoVMZ6gEu2sJZ2BrG6 +gRdxnVNINl1yMNOFz1HWpFT6FSaj94iN0ounOr+exWUIF4mSj06aT+hm/spO0ZWf +OQoiIqpB1Nv+hkRzDNJoHyvQwObJs2MuPosJ0pTh6gLHdc6xfpJUgZFYa3VhyDKt +b5bnfVALCLogw1ehWPDd4FSbcGBu7z6M2ynXcOysSPy3eoHQcyCjicw5hCamfB9B +RQZ4TJiQ9zdTpz2/eX5bRB559PRvaUXwF4jS9+zQ6yxTsZAWnq7W0SXs/7lWtEEm +SNXJwQpRYm8XpZa4EbPjMWPrxNrCHTMsMNQtMVqzX/z+u5JWw/SO2fTyJCOKroQe +4ka4xzWbFnapxnsNhJC/wUD1mRGz4Y8/Z/FSQ/XG6s4e8Cqf+oPRVC1g2/jNwrni +DIvx1cGNCGfnF5Qmp+DNezyO2FBGdy4HZjBVlA6oXEDX0gHgYXLqK7W+HxIl0bhw +ysVF+WEuxlXqJs0VB6/uhFNSd+oGaBxipm26PxUR4sBMD6EwUdarZjhYncgX9+XQ +knlySQ/GgS7UmUzNFvHcjqtTO5NTcIFG0EMnh5QyKYe/kfIYbLxoZTkCyi1n+zu8 +0QKo84QEyV2NeSazJ7j7Co8f6ocTYwwxFHtWOkPP4p4NALFOARHAvuoVYWSYHvRJ -----END CERTIFICATE----- diff --git a/tests/test-data/test_configs/sec/example.cert b/tests/test-data/test_configs/sec/example.cert index 8ae9220056..1f9338893c 100644 Binary files a/tests/test-data/test_configs/sec/example.cert and b/tests/test-data/test_configs/sec/example.cert differ diff --git a/tests/test-data/test_configs/sec/example.cert.pem b/tests/test-data/test_configs/sec/example.cert.pem index 0c2b25f4a5..a30f997d95 100644 --- a/tests/test-data/test_configs/sec/example.cert.pem +++ b/tests/test-data/test_configs/sec/example.cert.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDbDCCAlSgAwIBAgIUaAnH/1hgJDhcFRaFGtDzeQJA1akwDQYJKoZIhvcNAQEL -BQAwLTESMBAGA1UECgwJVHJ1c3QtRE5TMRcwFQYDVQQDDA5ucy5leGFtcGxlLmNv -bTAeFw0yMzA5MjUyMzUzMzlaFw0yNDA5MjQyMzUzMzlaMC0xEjAQBgNVBAoMCVRy -dXN0LUROUzEXMBUGA1UEAwwObnMuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQC1cS4WGlWbtQLLW9P9PO3MI+ojbHLvKOLFFCnca8Wx -dSvCCfWU6kSnbcar3C6tJRNpPOZkfZWO0EvUujXu5RNigASDgEzmP+5ZcGhOFUf6 -QCPHRHfF0BzsrL8tuVPjrXwDsMfZ+l8SPAE28vxqWrdS6/lflZGu5UBQdQy6JrDF -OwNz5X4ApvOCY4++G1yAsaD6p2zp6hgYqpYEGwhP9RFgl6+xgCCxDUsjnUexsBV9 -N/uxFHMRvolFfEHTI1snZ4g8fbXlOSMCvbLVDjRQ7TF0HYSYkQi6qlJGPUoYQHa+ -nlAdr5sGvfS/jLse6RME5DnjELWVr9KuHND8NT4qqEIRAgMBAAGjgYMwgYAwHAYD -VR0RAQH/BBIwEIIObnMuZXhhbXBsZS5jb20wDgYDVR0PAQH/BAQDAgKMMCAGA1Ud -JQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAPBgNVHRMBAf8EBTADAgEAMB0G -A1UdDgQWBBTcxDUj2oXnovORfxAq7JHr99/6LzANBgkqhkiG9w0BAQsFAAOCAQEA -D/CJ4wPm2iLP6MkDbB/RGZdl9dMhdK/pi+ozAvn0+fmR1rReYJ52RH++rQbcamK4 -eXytYHvCLDncg6gEmbn/Vzmmq9kuMx4/86LhR2xHHiSM/kdbtp1FndG28z1m/Mk6 -+vuAikU49m7+IHM3b/scsIz1T/xn5RX6w6Bj/Gvt0cMkyCWismtmt6AIi/8FnZxh -s+NBjr2fcOaAf9Vwh46c5YZNiLUkXDfAhtbPbIxIL/bhB4/VDSL9GphkeLItd7Oc -BiVAKl0esp3rKGu1agNwJZt/uyJChjiDFWO+YCcuPcqjn8oN8pLbMEITO9niH0V3 -B6r6bqnHZfIkCc9+FLM/uw== +MIIDcDCCAligAwIBAgIUZRnSQct6eNG2P4RCplY+7/t8+5swDQYJKoZIhvcNAQEL +BQAwLzEUMBIGA1UECgwLSGlja29yeSBETlMxFzAVBgNVBAMMDm5zLmV4YW1wbGUu +Y29tMB4XDTI0MTIxMTA5MzkzNVoXDTI1MTIxMTA5MzkzNVowLzEUMBIGA1UECgwL +SGlja29yeSBETlMxFzAVBgNVBAMMDm5zLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEApbfJfk5zi7oV/QMWunEw1dTDFzWrEOgvEEP7 +06hlrO1JaSb74HKqajbMhW6Tgw0siUZ9/bhP83n6MfUWRWBIa4MuNHsopATUsL38 +/qUBqpQGxBsTIbSYeFEx+DgwNh+aAn0ejzJf4phYAt0GFT0YihFymYLlX/BFvgIe +kUiisv06WsXuNi5Hyg6vTIdBY04INhP73231uW8FReaDBZFp0u2H9AC4Zn8f0dNw +p6CewCFIz/rdHRsQ/SGnLVSnVdG5A8cZoqqo0P/zpUjNA/x0Qx3ei09p7alZI0S6 ++C6pGsUl8vLIgLNyCZpanx2zNIF5HIViF7p72xuNSYzDS37b4QIDAQABo4GDMIGA +MBwGA1UdEQEB/wQSMBCCDm5zLmV4YW1wbGUuY29tMA4GA1UdDwEB/wQEAwICjDAg +BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwIB +ADAdBgNVHQ4EFgQUxS5WGWzoH9j0IXQ9tUJbOtouFNAwDQYJKoZIhvcNAQELBQAD +ggEBAInIBVMUX5a5NDCMQvnXSpxOZQTxZ/RdNWjJ4hVrxs0QZuL1GB2R8wNm3F5W +6xEKsxC1WHDhh9zK8nv7+sE8HZmfnC4oVWxSgZM9WnjsEIAfjuNC+i3mCGiOQiQ+ +gPk+NLrMuPIxah0S2CZ6PDFbrh1BPpQpQrv/mhwU/pHbGbGfVC8geJ/PAxoKCp/R +swmSGDpRD9MP2+fqA4Il4CRNafAicqYwDk0x29d2iNzAxN/nMvpQyrEXW9F897py +1s11Hgwm04OBJWNMbpTaImBMzgezhVYVswa/Iai88fzq/AezEcrn/WN7JHBiMgLt +vmVzlAoFZ1EwQuyQ4LvvlJjjuUM= -----END CERTIFICATE----- diff --git a/tests/test-data/test_configs/sec/example.key b/tests/test-data/test_configs/sec/example.key index b3f6550daf..f97aa18921 100644 Binary files a/tests/test-data/test_configs/sec/example.key and b/tests/test-data/test_configs/sec/example.key differ diff --git a/tests/test-data/test_configs/sec/example.key.pem b/tests/test-data/test_configs/sec/example.key.pem index 1224b5a031..332204ab78 100644 --- a/tests/test-data/test_configs/sec/example.key.pem +++ b/tests/test-data/test_configs/sec/example.key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1cS4WGlWbtQLL -W9P9PO3MI+ojbHLvKOLFFCnca8WxdSvCCfWU6kSnbcar3C6tJRNpPOZkfZWO0EvU -ujXu5RNigASDgEzmP+5ZcGhOFUf6QCPHRHfF0BzsrL8tuVPjrXwDsMfZ+l8SPAE2 -8vxqWrdS6/lflZGu5UBQdQy6JrDFOwNz5X4ApvOCY4++G1yAsaD6p2zp6hgYqpYE -GwhP9RFgl6+xgCCxDUsjnUexsBV9N/uxFHMRvolFfEHTI1snZ4g8fbXlOSMCvbLV -DjRQ7TF0HYSYkQi6qlJGPUoYQHa+nlAdr5sGvfS/jLse6RME5DnjELWVr9KuHND8 -NT4qqEIRAgMBAAECggEAAkGO6z5wYkT2oAgbYDKh2ezeZfD2X7JR84jKWalk/82V -rQF9S/JuLRv71IcJDr6ykzEeXXe3fg5pl8XcktGTxqDerX+EaHgfouQRBluHlbCD -evntq7uCCJCM7Gjs02lrH9g5LyT78D80j3YN0AkiiDjsuy5u085mjAZdXj+Wtht+ -DmnCTgrEWdzIxVLQfVin7wbWo+4oKe1sN+l+wcePn3MkMmIJ28pQm3Qj7IdfiVgm -e04hZnSuLxBo8AwiSnR25XUUKyRwbsoU+AUMvKMi4hAGnWjv4a9OOZywtLQJQRtE -kDFALieG4YICjZik2wgXA/ngSwwDyAzRLTpF+tIeAQKBgQDu6ppFTpgbUVwKa8Z1 -kaDX31WJuUGzrjTwBAezQQ36IIS2ZN1fHf637hu2XXeaDPIBCN3Q9qmYAeWsyLPp -GG09BtVjXsca2ClKso2sGJisvnQ77C5H0bfi0RkndFH7ens+tkMrbRm0SwehxoFa -OAopw1KBplr/e8kwlLNmAZz9UQKBgQDCaoCfA3Z8As6WKFWm5CZ314D9Hf+J/jVD -0Vt4eIORUz+ZigJmxr4nVxLeXjYjEB3SnfflXpEtCFd4FvKHJDJiey++bcA7POvh -BM8lVHyA0ISpQ1FqSs73AeAFrYgE+cVd6Wn+gULq1rHAeHsOoiUJGQXWqCSICCMM -/dfbJYbIwQKBgA9Dh8Wjxs3//axgxFYgjrEcAKAC6PKsz48CAuft4RG44CGzAf2g -sfRYTwbwo8KAzzlHsrw19hHTFTRbwjrDJ799X0aw+HF7m++8xpZXH/HxXQWzCiXm -fSQNjdjacp5pbdRM2q+8kabWIE+ymfMEn4mZg/zqfufRpcHnzipXMgtxAoGBAIaw -OBlx0bUKUMrweJ5dc1UVRLSXAsE8DvTD5uXoP+X/UZFybkV7rKMejODnTgQulyqh -6+rJADS9kbON2knLxug5RZNc/49KnnPO3B+Vj4fCbhXBoHbOCuJPNz9XwGMKEzUD -jz4VmSGOyah5D2/M33GVF1lmNaDUWkwW1GNrdRxBAoGABvgGBVB4/lHSdyPAbn2D -53PIwlBkS9ztONpz32xWXK6JKxNge0XFkg1LeGlg12gaJsY8Gp/PmF5/uNTDZT0h -pXlgG6A5aIU//vA+PiDCCFOTmKYkTubqSmNsgx/+nv2FGz0dBvNjbI989g/DeewO -FD5xQmW3158x1p4yij3bHDQ= +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQClt8l+TnOLuhX9 +Axa6cTDV1MMXNasQ6C8QQ/vTqGWs7UlpJvvgcqpqNsyFbpODDSyJRn39uE/zefox +9RZFYEhrgy40eyikBNSwvfz+pQGqlAbEGxMhtJh4UTH4ODA2H5oCfR6PMl/imFgC +3QYVPRiKEXKZguVf8EW+Ah6RSKKy/Tpaxe42LkfKDq9Mh0FjTgg2E/vfbfW5bwVF +5oMFkWnS7Yf0ALhmfx/R03CnoJ7AIUjP+t0dGxD9IactVKdV0bkDxxmiqqjQ//Ol +SM0D/HRDHd6LT2ntqVkjRLr4LqkaxSXy8siAs3IJmlqfHbM0gXkchWIXunvbG41J +jMNLftvhAgMBAAECggEAJ5rmuD3KHhr9XdBS6oCaTgRxErc0GNCQzOeehA2DLUKx +kIStXk0xPry1gO82KHQp0G4NNunJi9Q7UBy1s6No827wyECl7BsudMYXNImdfhWu +D0i0OBI3/UtUcLEHDqxbS5x5BPqiUV6c7CREK6fEGV1FoPwYUycyl9BcW1b7cWCy +r04eBlFz9pLi/zD8AWuFVGNcmWJO1lQh972SdjFPJ1Z0LYKfhmmo94i1NR1+naxr +56VrtNEKDVACSbLRVt5yRedst44gZvHY02zfd9rAy7VlGBFItBBW4If/Hy29LGG5 +rVe2GA4aygBnaEJxe3WVvWRU7ZFVdleGsbBj64dDZQKBgQDDe69J2QxztnCNmr04 +jOhLICyERF//MNsfJEnvH3U21jDVb4wTpJhS6eYMhXr+cQWMp1Ssi+8KYIDdp62b ++34fO8i8y4+apmt6FfAR36Kmu6qHfDAsaAchlGkOPnv7HxrKG6B7/QLrkl/q6Yx1 +ClThsrZmfB9LlpzMGGajDhDKTQKBgQDZBSqNbOJwl1tfDfoEz2SzZALvMtO9gVmQ +i5rqW2TZVMRSYSvMsuDANhaGvd/KXm5C4JfZjZ37XoWjJ27PeL9IwXkWaHKeH6AF +m4c3cDO50XjC8hq2aZ9fwWGM04IbLLiZEx+wa4NFFPUz1zkgKGZTP7hhnqJC2jxO +MlhD2Qn55QKBgQCYHck7mBDeglt3dbBFLzEcNL8vdd2VwTjiNOTrlPkrYOXDUPgZ +2P1HmAeSOtSI5v5Ag32af5HV616cHX01YjC0sVr1vxnSaCo+aI/V+MajJGoA4BzE +kXbrJIfTs7/anEvGdlUd5ra9BbxqGq9X7GA8+UqC2ZeoxFzjXSGRRMLACQKBgD3k +xk0NZ8tar3l9n/etOngbJucXZOIgOO4LksQSCsIc9dzUz8wSnBzVkDkff+rUYbf7 +G/O0+wCM5aoxfd33/v3+B83HPiEwvc+7mqXJ/0aYoktfBxVNLGH/4hVq4Slk6MTn +elszXn3eS0xcrnMocn59ptVYi8hrO1XF7/xxsvGtAoGBAIaqm9DC9ZVKQe9sNBu3 +1j4MjxcZuio+7bKapk/m/7426nfMCvox1Ctp+vwoXIf2Ji1zMOybrLEcisp5dT9f +I2vN5/aeIW3qNiTiD36i9YSwweHtE90Iuf+kNUr+k1v+6YgcWw7oGSny7PbhjnsX +gF3rNzmEACRYWKHA8VUqkjjE -----END PRIVATE KEY----- diff --git a/tests/test-data/test_configs/sec/example.p12 b/tests/test-data/test_configs/sec/example.p12 index 81b0fceb32..ecf7285771 100644 Binary files a/tests/test-data/test_configs/sec/example.p12 and b/tests/test-data/test_configs/sec/example.p12 differ