diff options
| author | Steven Fackler <[email protected]> | 2018-08-19 20:02:00 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-19 20:02:00 -0700 |
| commit | b1d01fbc0c8d3ea4742817139d022c6e53a60b19 (patch) | |
| tree | f2ba96394bb573c5f9559ad66942159b7b109f8f /openssl-sys/src/openssl/v110.rs | |
| parent | Merge pull request #975 from eun-ice/master (diff) | |
| parent | SRTP cleanup (diff) | |
| download | rust-openssl-b1d01fbc0c8d3ea4742817139d022c6e53a60b19.tar.xz rust-openssl-b1d01fbc0c8d3ea4742817139d022c6e53a60b19.zip | |
Merge pull request #978 from sfackler/srtp-cleanup
SRTP cleanup
Diffstat (limited to 'openssl-sys/src/openssl/v110.rs')
| -rw-r--r-- | openssl-sys/src/openssl/v110.rs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/openssl-sys/src/openssl/v110.rs b/openssl-sys/src/openssl/v110.rs index b3bca4a2..c86a863a 100644 --- a/openssl-sys/src/openssl/v110.rs +++ b/openssl-sys/src/openssl/v110.rs @@ -1,7 +1,6 @@ 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; } |