diff options
| author | Steven Fackler <[email protected]> | 2014-09-25 02:43:36 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-09-25 02:43:36 -0400 |
| commit | fa53c79e4892dfc260bc6d1e2b52892f5607de72 (patch) | |
| tree | d099a2732f2702423220b686b2cc010386da4f62 /src | |
| parent | Merge pull request #51 from ebfe/deprecated (diff) | |
| parent | TLS 1_1, 1_2, Ssl 2 is enabled by features (diff) | |
| download | rust-openssl-fa53c79e4892dfc260bc6d1e2b52892f5607de72.tar.xz rust-openssl-fa53c79e4892dfc260bc6d1e2b52892f5607de72.zip | |
Merge pull request #46 from vhbit/tls1-2-support
Enabling TLS1.2 support
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ssl/ffi.rs | 16 | ||||
| -rw-r--r-- | src/ssl/mod.rs | 15 |
2 files changed, 27 insertions, 4 deletions
diff --git a/src/ssl/ffi.rs b/src/ssl/ffi.rs index 2e21a24b..a40af35e 100755 --- a/src/ssl/ffi.rs +++ b/src/ssl/ffi.rs @@ -103,8 +103,18 @@ pub static X509_FILETYPE_PEM: c_int = 1; pub static X509_FILETYPE_ASN1: c_int = 2; pub static X509_FILETYPE_DEFAULT: c_int = 3; +#[cfg(target_os = "macos", feature = "tlsv1_1")] +#[cfg(target_os = "macos", feature = "tlsv1_2")] +#[link(name="ssl.1.0.0")] +#[link(name="crypto.1.0.0")] +extern {} + +#[cfg(not(target_os = "macos"))] +#[cfg(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))] #[link(name="ssl")] #[link(name="crypto")] +extern {} + extern "C" { pub fn CRYPTO_num_locks() -> c_int; pub fn CRYPTO_set_locking_callback(func: extern "C" fn(mode: c_int, @@ -116,10 +126,14 @@ extern "C" { pub fn SSL_library_init() -> c_int; - #[cfg(sslv2)] + #[cfg(feature = "sslv2")] pub fn SSLv2_method() -> *const SSL_METHOD; pub fn SSLv3_method() -> *const SSL_METHOD; pub fn TLSv1_method() -> *const SSL_METHOD; + #[cfg(feature = "tlsv1_1")] + pub fn TLSv1_1_method() -> *const SSL_METHOD; + #[cfg(feature = "tlsv1_2")] + pub fn TLSv1_2_method() -> *const SSL_METHOD; pub fn SSLv23_method() -> *const SSL_METHOD; pub fn SSL_CTX_new(method: *const SSL_METHOD) -> *mut SSL_CTX; diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs index 785b8dfc..fc775a32 100644 --- a/src/ssl/mod.rs +++ b/src/ssl/mod.rs @@ -48,8 +48,9 @@ fn init() { /// Determines the SSL method supported #[deriving(Show, Hash, PartialEq, Eq)] +#[allow(non_camel_case_types)] pub enum SslMethod { - #[cfg(sslv2)] + #[cfg(feature = "sslv2")] /// Only support the SSLv2 protocol Sslv2, /// Only support the SSLv3 protocol @@ -58,16 +59,24 @@ pub enum SslMethod { Tlsv1, /// Support the SSLv2, SSLv3 and TLSv1 protocols Sslv23, + #[cfg(feature = "tlsv1_1")] + Tlsv1_1, + #[cfg(feature = "tlsv1_2")] + Tlsv1_2, } impl SslMethod { unsafe fn to_raw(&self) -> *const ffi::SSL_METHOD { match *self { - #[cfg(sslv2)] + #[cfg(feature = "sslv2")] Sslv2 => ffi::SSLv2_method(), Sslv3 => ffi::SSLv3_method(), Tlsv1 => ffi::TLSv1_method(), - Sslv23 => ffi::SSLv23_method() + Sslv23 => ffi::SSLv23_method(), + #[cfg(feature = "tlsv1_1")] + Tlsv1_1 => ffi::TLSv1_1_method(), + #[cfg(feature = "tlsv1_2")] + Tlsv1_2 => ffi::TLSv1_2_method() } } } |