diff options
| author | Richard Diamond <[email protected]> | 2014-11-09 23:07:59 -0600 |
|---|---|---|
| committer | Richard Diamond <[email protected]> | 2014-11-09 23:07:59 -0600 |
| commit | 019e47020a52c0e4409739837ef653f7837f2e1c (patch) | |
| tree | 3d02d332142d3011720c3ef58b7abf6a666c6a3a | |
| parent | Add overrideable platform ssl. (diff) | |
| download | rust-openssl-019e47020a52c0e4409739837ef653f7837f2e1c.tar.xz rust-openssl-019e47020a52c0e4409739837ef653f7837f2e1c.zip | |
Support PNaCl/NaCl.
| -rw-r--r-- | Cargo.toml | 17 | ||||
| -rw-r--r-- | src/ffi.rs | 34 |
2 files changed, 29 insertions, 22 deletions
@@ -26,11 +26,12 @@ sslv2 = [] git = "https://github.com/alexcrichton/openssl-sys" [target.x86_64-unknown-freebsd.dependencies.openssl-sys] git = "https://github.com/alexcrichton/openssl-sys" -[target.le32-unknown-nacl.dependencies.openssl-sys] - git = "https://github.com/alexcrichton/openssl-sys" -[target.arm-unknown-nacl.dependencies.openssl-sys] - git = "https://github.com/alexcrichton/openssl-sys" -[target.i686-unknown-nacl.dependencies.openssl-sys] - git = "https://github.com/alexcrichton/openssl-sys" -[target.x86_64-unknown-nacl.dependencies.openssl-sys] - git = "https://github.com/alexcrichton/openssl-sys" + +[target.le32-unknown-nacl.dependencies.libressl-pnacl-sys] +git = "https://github.com/DiamondLovesYou/libressl-pnacl-sys.git" +[target.arm-unknown-nacl.dependencies.libressl-pnacl-sys] +git = "https://github.com/DiamondLovesYou/libressl-pnacl-sys.git" +[target.i686-unknown-nacl.dependencies.libressl-pnacl-sys] +git = "https://github.com/DiamondLovesYou/libressl-pnacl-sys.git" +[target.x86_64-unknown-nacl.dependencies.libressl-pnacl-sys] +git = "https://github.com/DiamondLovesYou/libressl-pnacl-sys.git" @@ -176,20 +176,26 @@ pub const X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: c_int = 45; pub const X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53; pub const X509_V_OK: c_int = 0; -#[cfg( any( all(target_os = "macos", feature = "tlsv1_1"),all(target_os = "macos", feature = "tlsv1_2")))] -#[link(name="ssl.1.0.0")] -#[link(name="crypto.1.0.0")] -extern {} - -#[cfg(any( not( target_os = "macos"), all(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))))] -#[link(name="ssl")] -#[link(name="crypto")] -extern {} - -#[cfg(target_os = "win32")] -#[link(name="gdi32")] -#[link(name="wsock32")] -extern { } +#[cfg(not(target_os = "nacl"))] +mod link { + #[cfg( any( all(target_os = "macos", feature = "tlsv1_1"), + all(target_os = "macos", feature = "tlsv1_2")))] + #[link(name="ssl.1.0.0")] + #[link(name="crypto.1.0.0")] + extern {} + + #[cfg(any( not( target_os = "macos"), + all(target_os = "macos", not(feature = "tlsv1_1"), + not(feature = "tlsv1_2"))))] + #[link(name="ssl")] + #[link(name="crypto")] + extern {} + + #[cfg(target_os = "win32")] + #[link(name="gdi32")] + #[link(name="wsock32")] + extern { } +} static mut MUTEXES: *mut Vec<NativeMutex> = 0 as *mut Vec<NativeMutex>; |