Commit e7460886 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #94 from DiamondLovesYou/master 

PNaCl/NaCl targets support.
parents 766ce4b7 c2717cd9

Cargo.toml

+22 −0
Original line number Diff line number Diff line
@@ -13,3 +13,25 @@ path = "src/lib.rs" 
tlsv1_2 = []

tlsv1_1 = []

sslv2 = []



[target.i686-apple-darwin.dependencies.openssl-sys]

  git = "https://github.com/alexcrichton/openssl-sys"

[target.x86_64-apple-darwin.dependencies.openssl-sys]

  git = "https://github.com/alexcrichton/openssl-sys"

[target.i686-unknown-linux-gnu.dependencies.openssl-sys]

  git = "https://github.com/alexcrichton/openssl-sys"

[target.x86_64-unknown-linux-gnu.dependencies.openssl-sys]

  git = "https://github.com/alexcrichton/openssl-sys"

[target.i686-unknown-freebsd.dependencies.openssl-sys]

  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.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"

src/ffi.rs

+20 −14
Original line number Diff line number Diff line
@@ -176,12 +176,17 @@ 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")))]

#[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"))))]

    #[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 {}
@@ -190,6 +195,7 @@ extern {} 
    #[link(name="gdi32")]

    #[link(name="wsock32")]

    extern { }

}



static mut MUTEXES: *mut Vec<NativeMutex> = 0 as *mut Vec<NativeMutex>;

src/lib.rs

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ extern crate libc; 
extern crate serialize;

extern crate sync;



#[cfg(target_os = "nacl")]

extern crate "openssl-sys" as _unused;



mod macros;



pub mod asn1;