From e141e834f197425df3034968e350fca372eb7397 Mon Sep 17 00:00:00 2001 From: BiagioFesta <15035284+BiagioFesta@users.noreply.github.com> Date: Wed, 27 Apr 2022 13:16:39 +0200 Subject: [PATCH] Update boringssl deps for quiche 0.12.0 compatibility - ExtensionType::TOKEN_BINDING removed from implementation https://github.com/google/boringssl/commit/d89ec688f2296f41b4999b9db6e8bfba79c18050 - ExtensionType::ECH_IS_INNER removed from implementation https://github.com/google/boringssl/commit/18b6836b2f6340187a7981c82be9be9d092d36d6 --- boring-sys/deps/boringssl | 2 +- boring/src/ssl/mod.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/boring-sys/deps/boringssl b/boring-sys/deps/boringssl index 067cfd92..f1c75347 160000 --- a/boring-sys/deps/boringssl +++ b/boring-sys/deps/boringssl @@ -1 +1 @@ -Subproject commit 067cfd92f4d7da0edfa073b096d090b98a83b860 +Subproject commit f1c75347daa2ea81a941e953f2263e0a4d970c8d diff --git a/boring/src/ssl/mod.rs b/boring/src/ssl/mod.rs index 027678b9..c13bdbb6 100644 --- a/boring/src/ssl/mod.rs +++ b/boring/src/ssl/mod.rs @@ -486,7 +486,6 @@ impl ExtensionType { Self(ffi::TLSEXT_TYPE_application_layer_protocol_negotiation as u16); pub const PADDING: Self = Self(ffi::TLSEXT_TYPE_padding as u16); pub const EXTENDED_MASTER_SECRET: Self = Self(ffi::TLSEXT_TYPE_extended_master_secret as u16); - pub const TOKEN_BINDING: Self = Self(ffi::TLSEXT_TYPE_token_binding as u16); #[cfg(not(feature = "fips"))] pub const QUIC_TRANSPORT_PARAMETERS_LEGACY: Self = Self(ffi::TLSEXT_TYPE_quic_transport_parameters_legacy as u16); @@ -511,8 +510,6 @@ impl ExtensionType { pub const APPLICATION_SETTINGS: Self = Self(ffi::TLSEXT_TYPE_application_settings as u16); #[cfg(not(feature = "fips"))] pub const ENCRYPTED_CLIENT_HELLO: Self = Self(ffi::TLSEXT_TYPE_encrypted_client_hello as u16); - #[cfg(not(feature = "fips"))] - pub const ECH_IS_INNER: Self = Self(ffi::TLSEXT_TYPE_ech_is_inner as u16); pub const CERTIFICATE_TIMESTAMP: Self = Self(ffi::TLSEXT_TYPE_certificate_timestamp as u16); pub const NEXT_PROTO_NEG: Self = Self(ffi::TLSEXT_TYPE_next_proto_neg as u16); pub const CHANNEL_ID: Self = Self(ffi::TLSEXT_TYPE_channel_id as u16); @@ -2507,7 +2504,7 @@ impl SslRef { if chain.is_null() { None } else { - Some(StackRef::from_ptr(chain)) + Some(StackRef::from_ptr(chain as *mut _)) } } }