.github/workflows/issues.yml

@@ -1,17 +0,0 @@
-name: Close inactive issues
-on:
-  schedule:
-    - cron: "30 1 * * *"
-
-jobs:
-  close-issues:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - uses: actions/stale@v9
-        with:
-          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
-          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - uses: mlugg/setup-zig@v1
+      - uses: goto-bus-stop/setup-zig@v2
         with:
           version: 0.10.1
 
@@ -46,7 +46,7 @@ jobs:
           mkdir doh-proxy
           mv target/x86_64-unknown-linux-musl/release/doh-proxy doh-proxy/
           cp README.md localhost.pem doh-proxy/
-          tar cjpf doh-proxy_${{ steps.get_version.outputs.VERSION }}_linux-x86_64.tar.bz2 doh-proxy
+          tar cJpf doh-proxy_${{ steps.get_version.outputs.VERSION }}_linux-x86_64.tar.bz2 doh-proxy
           rm -fr doh-proxy
 
       - name: Release build Linux-aarch64
@@ -56,7 +56,7 @@ jobs:
           mkdir doh-proxy
           mv target/aarch64-unknown-linux-musl/release/doh-proxy doh-proxy/
           cp README.md localhost.pem doh-proxy/
-          tar cjpf doh-proxy_${{ steps.get_version.outputs.VERSION }}_linux-aarch64.tar.bz2 doh-proxy
+          tar cJpf doh-proxy_${{ steps.get_version.outputs.VERSION }}_linux-aarch64.tar.bz2 doh-proxy
           rm -fr doh-proxy
 
       - name: Release build Windows-x86_64

Cargo.toml

@@ -18,8 +18,8 @@ tls = ["libdoh/tls"]
 [dependencies]
 libdoh = { path = "src/libdoh", version = "0.9.9", default-features = false }
 clap = { version = "4", features = ["std", "cargo", "wrap_help", "string"] }
-dnsstamps = "0.1.10"
-mimalloc = { version = "0.1.44", default-features = false }
+dnsstamps = "0.1.9"
+mimalloc = { version = "0.1.43", default-features = false }
 
 [package.metadata.generate-rpm]
 assets = [

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2025 Frank Denis
+Copyright (c) 2018-2023 Frank Denis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/config.rs

@@ -240,42 +240,39 @@ pub fn parse_opts(globals: &mut Globals) {
             .or_else(|| globals.tls_cert_path.clone());
     }
 
-    match matches.get_one::<String>("hostname") {
-        Some(hostname) => {
-            let mut builder =
-                dnsstamps::DoHBuilder::new(hostname.to_string(), globals.path.to_string());
-            if let Some(public_address) = matches.get_one::<String>("public_address") {
-                builder = builder.with_address(public_address.to_string());
-            }
-            if let Some(public_port) = matches.get_one::<String>("public_port") {
-                let public_port = public_port.parse().expect("Invalid public port");
-                builder = builder.with_port(public_port);
-            }
-            println!(
-                "Test DNS stamp to reach [{}] over DoH: [{}]\n",
-                hostname,
-                builder.serialize().unwrap()
-            );
-
-            let mut builder =
-                dnsstamps::ODoHTargetBuilder::new(hostname.to_string(), globals.path.to_string());
-            if let Some(public_port) = matches.get_one::<String>("public_port") {
-                let public_port = public_port.parse().expect("Invalid public port");
-                builder = builder.with_port(public_port);
-            }
-            println!(
-                "Test DNS stamp to reach [{}] over Oblivious DoH: [{}]\n",
-                hostname,
-                builder.serialize().unwrap()
-            );
-
-            println!("Check out https://dnscrypt.info/stamps/ to compute the actual stamps.\n")
+    if let Some(hostname) = matches.get_one::<String>("hostname") {
+        let mut builder =
+            dnsstamps::DoHBuilder::new(hostname.to_string(), globals.path.to_string());
+        if let Some(public_address) = matches.get_one::<String>("public_address") {
+            builder = builder.with_address(public_address.to_string());
         }
-        _ => {
-            println!(
+        if let Some(public_port) = matches.get_one::<String>("public_port") {
+            let public_port = public_port.parse().expect("Invalid public port");
+            builder = builder.with_port(public_port);
+        }
+        println!(
+            "Test DNS stamp to reach [{}] over DoH: [{}]\n",
+            hostname,
+            builder.serialize().unwrap()
+        );
+
+        let mut builder =
+            dnsstamps::ODoHTargetBuilder::new(hostname.to_string(), globals.path.to_string());
+        if let Some(public_port) = matches.get_one::<String>("public_port") {
+            let public_port = public_port.parse().expect("Invalid public port");
+            builder = builder.with_port(public_port);
+        }
+        println!(
+            "Test DNS stamp to reach [{}] over Oblivious DoH: [{}]\n",
+            hostname,
+            builder.serialize().unwrap()
+        );
+
+        println!("Check out https://dnscrypt.info/stamps/ to compute the actual stamps.\n")
+    } else {
+        println!(
             "Please provide a fully qualified hostname (-H <hostname> command-line option) to get \
              test DNS stamps for your server.\n"
         );
-        }
     }
 }

src/libdoh/Cargo.toml

@@ -15,13 +15,13 @@ default = ["tls"]
 tls = ["tokio-rustls"]
 
 [dependencies]
-anyhow = "1.0.97"
+anyhow = "1.0.86"
 arc-swap = "1.7.1"
 base64 = "0.22.1"
 byteorder = "1.5.0"
-bytes = "1.10.1"
-futures = "0.3.31"
-hyper = { version = "^0.14.32", default-features = false, features = [
+bytes = "1.6.0"
+futures = "0.3.30"
+hyper = { version = "^0.14.29", default-features = false, features = [
     "server",
     "http1",
     "http2",
@@ -29,8 +29,8 @@ hyper = { version = "^0.14.32", default-features = false, features = [
     "runtime",
 ] }
 odoh-rs = "1.0.3"
-rand = "^0.8.5"
-tokio = { version = "1.44.1", features = [
+rand = "0.8.5"
+tokio = { version = "1.38.0", features = [
     "net",
     "rt-multi-thread",
     "time",

src/libdoh/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2025 Frank Denis
+Copyright (c) 2018-2023 Frank Denis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/libdoh/src/lib.rs

@@ -257,7 +257,10 @@ impl DoH {
         content_types: &[&'static str],
     ) -> Option<&'static str> {
         let accept = headers.get(hyper::header::ACCEPT);
-        let accept = accept?;
+        let accept = match accept {
+            None => return None,
+            Some(accept) => accept,
+        };
         for part in accept.to_str().unwrap_or("").split(',').map(|s| s.trim()) {
             if let Some(found) = part
                 .split(';')

src/libdoh/src/odoh.rs

@@ -77,7 +77,7 @@ impl ODoHPublicKey {
 
 impl ODoHQueryContext {
     pub fn encrypt_response(self, response_body: Vec<u8>) -> Result<Vec<u8>, DoHError> {
-        let response_nonce = rand::thread_rng().r#gen::<ResponseNonce>();
+        let response_nonce = rand::thread_rng().gen::<ResponseNonce>();
         let response_body_ = ObliviousDoHMessagePlaintext::new(response_body, 0);
         let encrypted_response = odoh_rs::encrypt_response(
             &self.query,

src/libdoh/src/tls.rs

@@ -87,9 +87,12 @@ where
             let server_config_builder = ServerConfig::builder()
                 .with_safe_defaults()
                 .with_no_client_auth();
-            match server_config_builder.with_single_cert(certs.clone(), certs_key) {
-                Ok(found_config) => Some(found_config),
-                _ => None,
+            if let Ok(found_config) =
+                server_config_builder.with_single_cert(certs.clone(), certs_key)
+            {
+                Some(found_config)
+            } else {
+                None
             }
         })
         .ok_or_else(|| {