From dfdd4c0e4f647cf47c4a1cdb52de7e231dbfc86e Mon Sep 17 00:00:00 2001
From: Samuel Fredrickson <kinghajj@gmail.com>
Date: Tue, 30 Dec 2014 16:39:49 -0800
Subject: Change to use updated Mutex API in latest Rust master.

---
 openssl-sys/src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'openssl-sys/src')

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 104f71b5..f4173aff 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -9,7 +9,7 @@ extern crate "libressl-pnacl-sys" as _for_linkage;
 use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t};
 use std::mem;
 use std::ptr;
-use std::sync::{StaticMutex, StaticMutexGuard, MUTEX_INIT};
+use std::sync::{StaticMutex, MutexGuard, MUTEX_INIT};
 use std::sync::{Once, ONCE_INIT};
 
 pub type ASN1_INTEGER = c_void;
@@ -192,7 +192,7 @@ pub const X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53;
 pub const X509_V_OK: c_int = 0;
 
 static mut MUTEXES: *mut Vec<StaticMutex> = 0 as *mut Vec<StaticMutex>;
-static mut GUARDS: *mut Vec<Option<StaticMutexGuard>> = 0 as *mut Vec<Option<StaticMutexGuard>>;
+static mut GUARDS: *mut Vec<Option<MutexGuard<'static, ()>>> = 0 as *mut Vec<Option<MutexGuard<'static, ()>>>;
 
 extern fn locking_function(mode: c_int, n: c_int, _file: *const c_char,
                                _line: c_int) {
@@ -200,7 +200,7 @@ extern fn locking_function(mode: c_int, n: c_int, _file: *const c_char,
         let mutex = &(*MUTEXES)[n as uint];
 
         if mode & CRYPTO_LOCK != 0 {
-            (*GUARDS)[n as uint] = Some(mutex.lock());
+            (*GUARDS)[n as uint] = Some(mutex.lock().unwrap());
         } else {
             &(*GUARDS)[n as uint].take();
         }
@@ -218,7 +218,7 @@ pub fn init() {
             let num_locks = CRYPTO_num_locks();
             let mutexes = box Vec::from_fn(num_locks as uint, |_| MUTEX_INIT);
             MUTEXES = mem::transmute(mutexes);
-            let guards: Box<Vec<Option<StaticMutexGuard>>> = box Vec::from_fn(num_locks as uint, |_| None);
+            let guards: Box<Vec<Option<MutexGuard<()>>>> = box Vec::from_fn(num_locks as uint, |_| None);
             GUARDS = mem::transmute(guards);
 
             CRYPTO_set_locking_callback(locking_function);
-- 
cgit v1.2.3


From 8a7e7b67d89561176d813f318a6f2e72e0c8fae6 Mon Sep 17 00:00:00 2001
From: Richard Diamond <wichard@vitalitystudios.com>
Date: Fri, 2 Jan 2015 03:36:33 -0600
Subject: OpenSSL-sys: Cfg off target_os instead off feature.

It seems cargo doesn't provide --cfg entries for dep crates after all.
---
 openssl-sys/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openssl-sys/src')

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index f4173aff..6c4c9bbe 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -3,7 +3,7 @@
 
 extern crate libc;
 
-#[cfg(feature = "libressl-pnacl-sys")]
+#[cfg(target_os = "nacl")]
 extern crate "libressl-pnacl-sys" as _for_linkage;
 
 use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t};
-- 
cgit v1.2.3


From afffffc730729248582a2231afdbd9ddeedcc343 Mon Sep 17 00:00:00 2001
From: Valerii Hiora <valerii.hiora@gmail.com>
Date: Fri, 2 Jan 2015 13:50:52 +0200
Subject: Array syntax fallout

---
 openssl-sys/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openssl-sys/src')

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index f4173aff..0fbbb6f7 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -57,7 +57,7 @@ pub struct HMAC_CTX {
     i_ctx: EVP_MD_CTX,
     o_ctx: EVP_MD_CTX,
     key_length: c_uint,
-    key: [c_uchar, ..128]
+    key: [c_uchar; 128]
 }
 
 impl Copy for HMAC_CTX {}
-- 
cgit v1.2.3