Bindgen support w/ OPENSSL_NO_SRTP (e77285a5) · Commits · Public Repositories / Rust Openssl

openssl-sys/build/expando.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,10 @@ RUST_CONF_OPENSSL_NO_SHA
		RUST_CONF_OPENSSL_NO_SRP
		#endif

		#ifdef OPENSSL_NO_SRTP
		RUST_CONF_OPENSSL_NO_SRTP
		#endif

		#ifdef OPENSSL_NO_SSL3_METHOD
		RUST_CONF_OPENSSL_NO_SSL3_METHOD
		#endif

openssl-sys/build/main.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ fn check_ssl_kind() {
		}

		fn main() {
		println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_COMP\", \"OPENSSL_NO_SOCK\", \"OPENSSL_NO_STDIO\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_SSL3_METHOD\", \"OPENSSL_NO_KRB5\", \"OPENSSL_NO_TLSEXT\", \"OPENSSL_NO_SRP\", \"OPENSSL_NO_RFC3779\", \"OPENSSL_NO_SHA\", \"OPENSSL_NO_NEXTPROTONEG\", \"OPENSSL_NO_ENGINE\", \"OPENSSL_NO_BUF_FREELISTS\", \"OPENSSL_NO_RC2\"))");
		println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_COMP\", \"OPENSSL_NO_SOCK\", \"OPENSSL_NO_STDIO\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_SSL3_METHOD\", \"OPENSSL_NO_KRB5\", \"OPENSSL_NO_TLSEXT\", \"OPENSSL_NO_SRP\", \"OPENSSL_NO_SRTP\", \"OPENSSL_NO_RFC3779\", \"OPENSSL_NO_SHA\", \"OPENSSL_NO_NEXTPROTONEG\", \"OPENSSL_NO_ENGINE\", \"OPENSSL_NO_BUF_FREELISTS\", \"OPENSSL_NO_RC2\"))");

		println!("cargo:rustc-check-cfg=cfg(openssl)");
		println!("cargo:rustc-check-cfg=cfg(libressl)");

openssl-sys/src/tls1.rs

+1 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ pub unsafe fn SSL_CTX_set_tlsext_status_cb(
		)
		}

		#[cfg(not(osslconf = "OPENSSL_NO_SRTP"))]
		pub unsafe fn SSL_CTX_set_tlsext_status_arg(ctx: mut SSL_CTX, arg: mut c_void) -> c_long {
		SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG, 0, arg)
		}

openssl/build.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		use std::env;

		fn main() {
		println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_ARGON2\", \"OPENSSL_NO_RC2\"))");
		println!("cargo:rustc-check-cfg=cfg(osslconf, values(\"OPENSSL_NO_OCB\", \"OPENSSL_NO_SM4\", \"OPENSSL_NO_SEED\", \"OPENSSL_NO_CHACHA\", \"OPENSSL_NO_CAST\", \"OPENSSL_NO_IDEA\", \"OPENSSL_NO_CAMELLIA\", \"OPENSSL_NO_RC4\", \"OPENSSL_NO_BF\", \"OPENSSL_NO_PSK\", \"OPENSSL_NO_DEPRECATED_3_0\", \"OPENSSL_NO_SCRYPT\", \"OPENSSL_NO_SM3\", \"OPENSSL_NO_RMD160\", \"OPENSSL_NO_EC2M\", \"OPENSSL_NO_OCSP\", \"OPENSSL_NO_SRTP\", \"OPENSSL_NO_CMS\", \"OPENSSL_NO_EC\", \"OPENSSL_NO_ARGON2\", \"OPENSSL_NO_RC2\"))");

		println!("cargo:rustc-check-cfg=cfg(libressl)");
		println!("cargo:rustc-check-cfg=cfg(boringssl)");

openssl/src/ssl/mod.rs

+5 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ use crate::nid::Nid;
		use crate::pkey::{HasPrivate, PKeyRef, Params, Private};
		#[cfg(ossl300)]
		use crate::pkey::{PKey, Public};
		#[cfg(not(osslconf = "OPENSSL_NO_SRTP"))]
		use crate::srtp::{SrtpProtectionProfile, SrtpProtectionProfileRef};
		use crate::ssl::bio::BioMethod;
		use crate::ssl::callbacks::*;
		@@ -1269,6 +1270,7 @@ impl SslContextBuilder {
		}

		/// Enables the DTLS extension "use_srtp" as defined in RFC5764.
		#[cfg(not(osslconf = "OPENSSL_NO_SRTP"))]
		#[corresponds(SSL_CTX_set_tlsext_use_srtp)]
		pub fn set_tlsext_use_srtp(&mut self, protocols: &str) -> Result<(), ErrorStack> {
		unsafe {
		@@ -2675,6 +2677,7 @@ impl SslRef {
		}

		/// Enables the DTLS extension "use_srtp" as defined in RFC5764.
		#[cfg(not(osslconf = "OPENSSL_NO_SRTP"))]
		#[corresponds(SSL_set_tlsext_use_srtp)]
		pub fn set_tlsext_use_srtp(&mut self, protocols: &str) -> Result<(), ErrorStack> {
		unsafe {
		@@ -2693,6 +2696,7 @@ impl SslRef {
		/// Gets all SRTP profiles that are enabled for handshake via set_tlsext_use_srtp
		///
		/// DTLS extension "use_srtp" as defined in RFC5764 has to be enabled.
		#[cfg(not(osslconf = "OPENSSL_NO_SRTP"))]
		#[corresponds(SSL_get_srtp_profiles)]
		pub fn srtp_profiles(&self) -> Option<&StackRef<SrtpProtectionProfile>> {
		unsafe {
		@@ -2705,6 +2709,7 @@ impl SslRef {
		/// Gets the SRTP profile selected by handshake.
		///
		/// DTLS extension "use_srtp" as defined in RFC5764 has to be enabled.
		#[cfg(not(osslconf = "OPENSSL_NO_SRTP"))]
		#[corresponds(SSL_get_selected_srtp_profile)]
		pub fn selected_srtp_profile(&self) -> Option<&SrtpProtectionProfileRef> {
		unsafe {