Upgrade hyper, reqwest, rustls.

Cargo.toml

@@ -17,25 +17,28 @@ bytes           = "1"
 chrono          = "0.4.31"
 clap            = { version = "~4.4", features = [ "cargo", "derive" ] }
 crossbeam-utils = "0.8.4"
-daemonbase      = "0.1.0"
-futures         = "0.3"
-hyper           = { version = "0.14.8", features = [ "server", "stream" ] }
+#daemonbase      = "0.1.0"
+daemonbase      = { git = "https://github.com/NLnetLabs/daemonbase.git" }
+futures-util    = "0.3"
+http-body-util  = "0.1"
+hyper           = { version = "1.3.1", features = [ "server" ] }
+hyper-util      = { version = "0.1", features = [ "server", "server-auto", "tokio" ] }
 log             = "0.4"
 pin-project-lite = "0.2.4"
 rand            = "0.8.3"
-reqwest         = { version = "0.11.3", default-features = false, features = ["blocking", "rustls-tls"] }
-rpki            = { version = "0.17.2", features = ["crypto", "rtr", "slurm"] }
-rustls-pemfile  = "1.0"
-rustls-webpki   = "0.101.6"
+reqwest         = { version = "0.12.4", default-features = false, features = ["blocking", "rustls-tls"] }
+#rpki            = { version = "0.17.2", features = ["crypto", "rtr", "slurm"] }
+rpki            = { git = "https://github.com/NLnetLabs/rpki-rs.git", features = [ "repository", "rrdp", "rtr", "serde", "slurm" ] }
+rustls-pemfile  = "2.1.2"
 serde           = { version = "1.0", features = ["derive"] }
 serde_json      = "1.0"
 slab            = "0.4.2"
 tokio           = { version = "1.6", features = ["fs", "io-util", "macros", "net", "rt", "rt-multi-thread", "sync", "time"]}
-tokio-rustls    = "0.24.1"
+tokio-rustls    = { version = "0.25.0", default-features = false, features = [ "ring", "logging", "tls12" ] }
 tokio-stream    = { version = "0.1", features = ["net"] }
-toml            = "0.8.2"
+toml            = "0.8.12"
 url             = { version = "2.2", features = ["serde"] }
-webpki-roots    = "0.25.2"
+webpki-roots    = "0.26.1"
 
 [features]
 default = [ "socks" ]

src/comms.rs

@@ -19,8 +19,8 @@ use std::sync::Arc;
 use std::sync::atomic::AtomicUsize;
 use chrono::{DateTime, Utc};
 use crossbeam_utils::atomic::AtomicCell;
-use futures::pin_mut;
-use futures::future::{select, Either, Future};
+use futures_util::pin_mut;
+use futures_util::future::{pending, select, Either, Future};
 use slab::Slab;
 use serde::Deserialize;
 use tokio::sync::{mpsc, oneshot};
@@ -436,7 +436,7 @@ impl Link {
         let conn = match self.connection {
             ConnectionStatus::Active(ref mut conn) => conn,
             ConnectionStatus::Unconnected | ConnectionStatus::Gone => {
-                return futures::future::pending().await
+                return pending().await
             }
         };
         match conn.updates.recv().await {

src/formats/output.rs

@@ -3,6 +3,7 @@
 
 use serde::Deserialize;
 use crate::payload;
+use crate::http::ContentType;
 use super::json;
 
 //------------ Format --------------------------------------------------------
@@ -16,9 +17,9 @@ pub enum Format {
 }
 
 impl Format {
-    pub fn content_type(self) -> &'static str {
+    pub fn content_type(self) -> ContentType {
         match self {
-            Format::Json => "application/json",
+            Format::Json => ContentType::JSON,
         }
     }