Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ serde_with = { version="3.0.0", optional=true }
hex = "0.4"
priority-queue = "1.3.2"
sfv = { version = "0.9", optional=true }
brotli = "8.0.1"
flate2 = "1.1.2"

[target."cfg(windows)".dependencies]
winapi = { version = "0.3", features = ["wincrypt", "ws2def", "ws2ipdef", "ws2tcpip"] }
Expand Down
13 changes: 8 additions & 5 deletions tools/src/bin/tquic_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ use tquic::error::Error;
use tquic::h3::connection::Http3Connection;
use tquic::h3::Header;
use tquic::h3::Http3Config;
use tquic::CertCompressionAlgorithm;
use tquic::Config;
use tquic::CongestionControlAlgorithm;
use tquic::Connection;
Expand All @@ -65,7 +66,6 @@ use tquic::MultipathAlgorithm;
use tquic::PacketInfo;
use tquic::TlsConfig;
use tquic::TransportHandler;
use tquic::CertCompressionAlgorithm;
use tquic_tools::ApplicationProto;
use tquic_tools::CertCompressionAlgorithmArg;
use tquic_tools::QuicSocket;
Expand Down Expand Up @@ -561,24 +561,27 @@ impl Worker {
ApplicationProto::convert_to_vec(&option.alpn),
option.enable_early_data,
)?;

// Configure certificate compression if specified
if !option.certificate_compression.is_empty() {
let compression_algorithms: Vec<CertCompressionAlgorithm> = option
.certificate_compression
.iter()
.map(|&arg| arg.into())
.collect();

tls_config.enable_certificate_compression(compression_algorithms)?;
let algorithm_names: Vec<String> = option
.certificate_compression
.iter()
.map(|arg| format!("{:?}", arg).to_lowercase())
.collect();
info!("Enabled certificate compression: {}", algorithm_names.join(", "));
info!(
"Enabled certificate compression: {}",
algorithm_names.join(", ")
);
}

config.set_tls_config(tls_config);

let poll = mio::Poll::new()?;
Expand Down
13 changes: 8 additions & 5 deletions tools/src/bin/tquic_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use tquic::h3::connection::Http3Connection;
use tquic::h3::Header;
use tquic::h3::Http3Config;
use tquic::h3::NameValue;
use tquic::CertCompressionAlgorithm;
use tquic::Config;
use tquic::CongestionControlAlgorithm;
use tquic::Connection;
Expand All @@ -45,7 +46,6 @@ use tquic::MultipathAlgorithm;
use tquic::PacketInfo;
use tquic::TlsConfig;
use tquic::TransportHandler;
use tquic::CertCompressionAlgorithm;
use tquic_tools::ApplicationProto;
use tquic_tools::CertCompressionAlgorithmArg;
use tquic_tools::QuicSocket;
Expand Down Expand Up @@ -316,24 +316,27 @@ impl Server {
let mut ticket_key = option.ticket_key.clone().into_bytes();
ticket_key.resize(48, 0);
tls_config.set_ticket_key(&ticket_key)?;

// Configure certificate compression if specified
if !option.certificate_compression.is_empty() {
let compression_algorithms: Vec<CertCompressionAlgorithm> = option
.certificate_compression
.iter()
.map(|&arg| arg.into())
.collect();

tls_config.enable_certificate_compression(compression_algorithms)?;
let algorithm_names: Vec<String> = option
.certificate_compression
.iter()
.map(|arg| format!("{:?}", arg).to_lowercase())
.collect();
info!("Enabled certificate compression: {}", algorithm_names.join(", "));
info!(
"Enabled certificate compression: {}",
algorithm_names.join(", ")
);
}

config.set_tls_config(tls_config);

let poll = mio::Poll::new()?;
Expand Down
2 changes: 1 addition & 1 deletion tools/src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ use mio::Token;
use rustc_hash::FxHashMap;
use slab::Slab;

use tquic::CertCompressionAlgorithm;
use tquic::PacketInfo;
use tquic::PacketSendHandler;
use tquic::CertCompressionAlgorithm;

pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;

Expand Down
Loading