Merge pull request #978 from sfackler/srtp-cleanup (b1d01fbc) · Commits · Public Repositories / Rust Openssl

openssl-sys/src/lib.rs

+5 −3

Original line number	Diff line number	Diff line
		@@ -197,9 +197,6 @@ pub struct SRTP_PROTECTION_PROFILE {
		pub id: c_ulong,
		}

		/// fake free method, since SRTP_PROTECTION_PROFILE is static
		pub unsafe fn SRTP_PROTECTION_PROFILE_free(_profile: *mut SRTP_PROTECTION_PROFILE) {}

		pub type SHA_LONG = c_uint;
		pub type SHA_LONG64 = u64;

		@@ -2899,4 +2896,9 @@ extern "C" {

		pub fn SSL_set_connect_state(s: *mut SSL);
		pub fn SSL_set_accept_state(s: *mut SSL);

		pub fn SSL_set_tlsext_use_srtp(ssl: mut ::SSL, profiles: const c_char) -> c_int;
		pub fn SSL_CTX_set_tlsext_use_srtp(ctx: mut ::SSL_CTX, profiles: const c_char) -> c_int;
		pub fn SSL_get_srtp_profiles(ssl: mut ::SSL) -> mut stack_st_SRTP_PROTECTION_PROFILE;
		pub fn SSL_get_selected_srtp_profile(ssl: mut ::SSL) -> mut SRTP_PROTECTION_PROFILE;
		}

openssl-sys/src/libressl/mod.rs

+0 −7

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ pub use libressl::v250::*;
		pub use libressl::v251::*;
		#[cfg(libressl273)]
		pub use libressl::v273::*;
		use SRTP_PROTECTION_PROFILE;

		#[cfg(not(libressl251))]
		mod v250;
		@@ -68,7 +67,6 @@ pub struct stack_st_SRTP_PROTECTION_PROFILE {
		pub stack: _STACK,
		}


		#[repr(C)]
		pub struct _STACK {
		pub num: c_int,
		@@ -639,9 +637,4 @@ extern "C" {

		pub fn SSLeay() -> c_ulong;
		pub fn SSLeay_version(key: c_int) -> *const c_char;

		pub fn SSL_set_tlsext_use_srtp(ssl: mut ::SSL, profiles: const c_char) -> c_int;
		pub fn SSL_CTX_set_tlsext_use_srtp(ctx: mut ::SSL_CTX, profiles: const c_char) -> c_int;
		pub fn SSL_get_srtp_profiles(ssl: mut ::SSL) -> mut stack_st_SRTP_PROTECTION_PROFILE;
		pub fn SSL_get_selected_srtp_profile(ssl: mut ::SSL) -> mut SRTP_PROTECTION_PROFILE;
		}

openssl-sys/src/openssl/v10x.rs

+76 −25

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ use std::process;
		use std::ptr;
		use std::sync::{Mutex, MutexGuard};
		use std::sync::{Once, ONCE_INIT};
		use SRTP_PROTECTION_PROFILE;

		#[cfg(ossl102)]
		use libc::time_t;
		@@ -55,7 +54,6 @@ pub struct stack_st_OPENSSL_STRING {
		pub stack: _STACK,
		}


		#[repr(C)]
		pub struct stack_st_SRTP_PROTECTION_PROFILE {
		pub stack: _STACK,
		@@ -433,13 +431,25 @@ pub struct SSL {
		tlsext_ocsp_resplen: c_int,
		#[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
		tlsext_ticket_expected: c_int,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ecpointformatlist_length: size_t,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ecpointformatlist: *mut c_uchar,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ellipticcurvelist_length: size_t,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ellipticcurvelist: *mut c_uchar,
		#[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
		tlsext_opaque_prf_input: *mut c_void,
		@@ -457,9 +467,15 @@ pub struct SSL {
		tls_session_secret_cb_arg: *mut c_void,
		#[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
		initial_ctx: *mut ::SSL_CTX,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
		))]
		next_proto_negotiated: *mut c_uchar,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
		))]
		next_proto_negotiated_len: c_uchar,
		#[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
		srtp_profiles: *mut c_void,
		@@ -569,13 +585,25 @@ pub struct SSL_CTX {
		#[cfg(not(osslconf = "OPENSSL_NO_SRP"))]
		srp_ctx: SRP_CTX,

		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
		))]
		next_protos_advertised_cb: *mut c_void,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
		))]
		next_protos_advertised_cb_arg: *mut c_void,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
		))]
		next_proto_select_cb: *mut c_void,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
		))]
		next_proto_select_cb_arg: *mut c_void,

		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl101))]
		@@ -589,13 +617,29 @@ pub struct SSL_CTX {
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))]
		alpn_client_proto_list_len: c_uint,

		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC"),
		ossl102
		))]
		tlsext_ecpointformatlist_length: size_t,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC"),
		ossl102
		))]
		tlsext_ecpointformatlist: *mut c_uchar,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC"),
		ossl102
		))]
		tlsext_ellipticcurvelist_length: size_t,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC"),
		ossl102
		))]
		tlsext_ellipticcurvelist: *mut c_uchar,
		}

		@@ -634,13 +678,25 @@ pub struct SSL_SESSION {
		next: *mut c_void,
		#[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
		tlsext_hostname: *mut c_char,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ecpointformatlist_length: size_t,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ecpointformatlist: *mut c_uchar,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ellipticcurvelist_length: size_t,
		#[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))]
		#[cfg(all(
		not(osslconf = "OPENSSL_NO_TLSEXT"),
		not(osslconf = "OPENSSL_NO_EC")
		))]
		tlsext_ellipticcurvelist: *mut c_uchar,
		#[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
		tlsext_tick: *mut c_uchar,
		@@ -1009,9 +1065,4 @@ extern "C" {

		#[cfg(ossl102)]
		pub fn SSL_extension_supported(ext_type: c_uint) -> c_int;

		pub fn SSL_set_tlsext_use_srtp(ssl: mut ::SSL, profiles: const c_char) -> c_int;
		pub fn SSL_CTX_set_tlsext_use_srtp(ctx: mut ::SSL_CTX, profiles: const c_char) -> c_int;
		pub fn SSL_get_srtp_profiles(ssl: mut ::SSL) -> mut stack_st_SRTP_PROTECTION_PROFILE;
		pub fn SSL_get_selected_srtp_profile(ssl: mut ::SSL) -> mut SRTP_PROTECTION_PROFILE;
		}

openssl-sys/src/openssl/v110.rs

+1 −12

Original line number	Diff line number	Diff line
		use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t};
		use std::ptr;
		use std::sync::{Once, ONCE_INIT};
		use SRTP_PROTECTION_PROFILE;

		pub enum BIGNUM {}
		pub enum BIO {}
		@@ -142,7 +141,6 @@ pub unsafe fn SSL_get_max_proto_version(s: *mut ::SSL) -> c_int {
		::SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, ptr::null_mut()) as c_int
		}


		extern "C" {
		pub fn BIO_new(type_: const BIO_METHOD) -> mut BIO;
		pub fn BIO_s_file() -> *const BIO_METHOD;
		@@ -251,11 +249,7 @@ extern "C" {
		pub_key: mut const ::BIGNUM,
		priv_key: mut const ::BIGNUM,
		);
		pub fn DSA_set0_key(
		d: *mut ::DSA,
		pub_key: *mut ::BIGNUM,
		priv_key: *mut ::BIGNUM,
		) -> c_int;
		pub fn DSA_set0_key(d: mut ::DSA, pub_key: mut ::BIGNUM, priv_key: *mut ::BIGNUM) -> c_int;
		pub fn RSA_get0_key(
		r: *const ::RSA,
		n: mut const ::BIGNUM,
		@@ -395,9 +389,4 @@ extern "C" {

		pub fn SSL_CIPHER_get_cipher_nid(c: *const ::SSL_CIPHER) -> c_int;
		pub fn SSL_CIPHER_get_digest_nid(c: *const ::SSL_CIPHER) -> c_int;

		pub fn SSL_set_tlsext_use_srtp(ssl: mut ::SSL, profiles: const c_char) -> c_int;
		pub fn SSL_CTX_set_tlsext_use_srtp(ctx: mut ::SSL_CTX, profiles: const c_char) -> c_int;
		pub fn SSL_get_srtp_profiles(ssl: mut ::SSL) -> mut stack_st_SRTP_PROTECTION_PROFILE;
		pub fn SSL_get_selected_srtp_profile(ssl: mut ::SSL) -> mut SRTP_PROTECTION_PROFILE;
		}

openssl/src/srtp.rs

+8 −5

Original line number	Diff line number	Diff line
		@@ -5,10 +5,13 @@ use stack::Stackable;
		use std::ffi::CStr;
		use std::str;

		/// fake free method, since SRTP_PROTECTION_PROFILE is static
		unsafe fn free(_profile: *mut ffi::SRTP_PROTECTION_PROFILE) {}

		#[allow(unused_unsafe)]
		foreign_type_and_impl_send_sync! {
		type CType = ffi::SRTP_PROTECTION_PROFILE;
		fn drop = ffi::SRTP_PROTECTION_PROFILE_free;
		fn drop = free;

		pub struct SrtpProtectionProfile;
		/// Reference to `SrtpProtectionProfile`.
		@@ -19,18 +22,18 @@ impl Stackable for SrtpProtectionProfile {
		type StackType = ffi::stack_st_SRTP_PROTECTION_PROFILE;
		}


		impl SrtpProtectionProfileRef {
		pub fn id(&self) -> SrtpProfileId {
		SrtpProfileId::from_raw(unsafe { (*self.as_ptr()).id })
		}
		pub fn name(&self) -> &'static str {
		unsafe { CStr::from_ptr((self.as_ptr()).name as const _) }.to_str().expect("should be UTF-8")
		unsafe { CStr::from_ptr((self.as_ptr()).name as const _) }
		.to_str()
		.expect("should be UTF-8")
		}
		}


		/// type of SRTP profile to use.
		/// An identifier of an SRTP protection profile.
		#[derive(Debug, Copy, Clone, PartialEq, Eq)]
		pub struct SrtpProfileId(c_ulong);