3 files changed, 10 insertions, 2 deletions
diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
index 5c37c054..fd1e425a 100644
--- a/openssl-sys/Cargo.toml
+++ b/openssl-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openssl-sys"
-version = "0.6.0"
+version = "0.6.2"
 authors = ["Alex Crichton <[email protected]>",
            "Steven Fackler <[email protected]>"]
 license = "MIT"
diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs
index e0d88309..aadaa361 100644
--- a/openssl-sys/build.rs
+++ b/openssl-sys/build.rs
@@ -5,6 +5,11 @@ use std::env;
 use std::path::PathBuf;
 
 fn main() {
+    let target = env::var("TARGET").unwrap();
+
+    // libressl_pnacl_sys links the libs needed.
+    if target.ends_with("nacl") { return; }
+
     let lib_dir = env::var("OPENSSL_LIB_DIR").ok();
     let include_dir = env::var("OPENSSL_INCLUDE_DIR").ok();
 
@@ -15,7 +20,7 @@ fn main() {
         }
     }
 
-    let (libcrypto, libssl) = if env::var("TARGET").unwrap().contains("windows") {
+    let (libcrypto, libssl) = if target.contains("windows") {
     	("eay32", "ssl32")
     } else {
     	("crypto", "ssl")
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 598a3c59..9365704e 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -440,8 +440,11 @@ extern "C" {
     pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *const HMAC_CTX) -> c_int;
 
     // Pre-1.0 versions of these didn't return anything, so the shims bridge that gap
+    #[cfg_attr(target_os = "nacl", link_name = "HMAC_Init_ex")]
     pub fn HMAC_Init_ex_shim(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE) -> c_int;
+    #[cfg_attr(target_os = "nacl", link_name = "HMAC_Final")]
     pub fn HMAC_Final_shim(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint) -> c_int;
+    #[cfg_attr(target_os = "nacl", link_name = "HMAC_Update")]
     pub fn HMAC_Update_shim(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int;