Merge pull request #139 from vhbit/up-masterv0.2.14

Handle recent breaking changes

8 files changed, 70 insertions, 62 deletions

diff --git a/src/bio/mod.rs b/src/bio/mod.rs
index afc55849..7172b009 100644
--- a/src/bio/mod.rs
+++ b/src/bio/mod.rs
@@ -76,7 +76,7 @@ impl Reader for MemBio {
                 IoError {
                     kind: OtherIoError,
                     desc: "MemBio read error",
-                    detail: Some(format!("{}", SslError::get()))
+                    detail: Some(format!("{:?}", SslError::get()))
                 }
             };
             Err(err)
@@ -96,7 +96,7 @@ impl Writer for MemBio {
             Err(IoError {
                 kind: OtherIoError,
                 desc: "MemBio write error",
-                detail: Some(format!("{}", SslError::get()))
+                detail: Some(format!("{:?}", SslError::get()))
             })
         } else {
             Ok(())
diff --git a/src/bn/mod.rs b/src/bn/mod.rs
index d1a31c0e..7577f0e9 100644
--- a/src/bn/mod.rs
+++ b/src/bn/mod.rs
@@ -1,5 +1,5 @@
 use libc::{c_int, c_ulong, c_void};
-use std::c_str::{CString, ToCStr};
+use std::ffi::{CString, c_str_to_bytes};
 use std::cmp::Ordering;
 use std::{fmt, ptr};
 
@@ -88,7 +88,7 @@ impl BigNum {
 
     pub fn from_dec_str(s: &str) -> Result<BigNum, SslError> {
         BigNum::new().and_then(|v| unsafe {
-            let c_str = s.to_c_str();
+            let c_str = CString::from_slice(s.as_bytes());
             try_ssl!(ffi::BN_dec2bn(v.raw_ptr(), c_str.as_ptr()));
             Ok(v)
         })
@@ -96,7 +96,7 @@ impl BigNum {
 
     pub fn from_hex_str(s: &str) -> Result<BigNum, SslError> {
         BigNum::new().and_then(|v| unsafe {
-            let c_str = s.to_c_str();
+            let c_str = CString::from_slice(s.as_bytes());
             try_ssl!(ffi::BN_hex2bn(v.raw_ptr(), c_str.as_ptr()));
             Ok(v)
         })
@@ -421,8 +421,7 @@ impl BigNum {
         unsafe {
             let buf = ffi::BN_bn2dec(self.raw());
             assert!(!buf.is_null());
-            let c_str = CString::new(buf, false);
-            let str = c_str.as_str().unwrap().to_string();
+            let str = String::from_utf8(c_str_to_bytes(&buf).to_vec()).unwrap();
             ffi::CRYPTO_free(buf as *mut c_void);
             str
         }
@@ -432,8 +431,7 @@ impl BigNum {
         unsafe {
             let buf = ffi::BN_bn2hex(self.raw());
             assert!(!buf.is_null());
-            let c_str = CString::new(buf, false);
-            let str = c_str.as_str().unwrap().to_string();
+            let str = String::from_utf8(c_str_to_bytes(&buf).to_vec()).unwrap();
             ffi::CRYPTO_free(buf as *mut c_void);
             str
         }
diff --git a/src/lib.rs b/src/lib.rs
index 88a848e4..074337e8 100644..100755
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(macro_rules, unsafe_destructor, globs, associated_types, default_type_params, old_orphan_check)]
+#![feature(unsafe_destructor, old_orphan_check)]
 #![crate_name="openssl"]
 #![crate_type="rlib"]
 #![crate_type="dylib"]
diff --git a/src/macros.rs b/src/macros.rs
index 2de14620..3e4bb429 100644..100755
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -1,4 +1,4 @@
-#![macro_escape]
+#![macro_use]
 
 macro_rules! try_ssl_stream {
     ($e:expr) => (
diff --git a/src/ssl/error.rs b/src/ssl/error.rs
index 888a9cdc..c52879a0 100644
--- a/src/ssl/error.rs
+++ b/src/ssl/error.rs
@@ -3,8 +3,8 @@ pub use self::OpensslError::*;
 
 use libc::c_ulong;
 use std::error;
+use std::ffi::c_str_to_bytes;
 use std::io::IoError;
-use std::c_str::CString;
 
 use ffi;
 
@@ -51,15 +51,24 @@ pub enum OpensslError {
 }
 
 fn get_lib(err: c_ulong) -> String {
-    unsafe { CString::new(ffi::ERR_lib_error_string(err), false) }.to_string()
+    unsafe {
+        let bytes = c_str_to_bytes(&ffi::ERR_lib_error_string(err)).to_vec();
+        String::from_utf8(bytes).unwrap()
+    }
 }
 
 fn get_func(err: c_ulong) -> String {
-    unsafe { CString::new(ffi::ERR_func_error_string(err), false).to_string() }
+    unsafe {
+        let bytes = c_str_to_bytes(&ffi::ERR_func_error_string(err)).to_vec();
+        String::from_utf8(bytes).unwrap()
+    }
 }
 
 fn get_reason(err: c_ulong) -> String {
-    unsafe { CString::new(ffi::ERR_reason_error_string(err), false).to_string() }
+    unsafe {
+        let bytes = c_str_to_bytes(&ffi::ERR_reason_error_string(err)).to_vec();
+        String::from_utf8(bytes).unwrap()
+    }
 }
 
 impl SslError {
@@ -100,7 +109,7 @@ fn test_uknown_error_should_have_correct_messages() {
 
     let UnknownError { ref library, ref function, ref reason } = errs[0];
 
-    assert_eq!(library.as_slice(),"SSL routines");
+    assert_eq!(library.as_slice(), "SSL routines");
     assert_eq!(function.as_slice(), "SSL23_GET_SERVER_HELLO");
     assert_eq!(reason.as_slice(), "sslv3 alert handshake failure");
 }
diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs
index 390e8230..4d11ae4a 100644
--- a/src/ssl/mod.rs
+++ b/src/ssl/mod.rs
@@ -1,5 +1,5 @@
 use libc::{c_int, c_void, c_long};
-use std::c_str::ToCStr;
+use std::ffi::{CString, c_str_to_bytes};
 use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer};
 use std::mem;
 use std::num::FromPrimitive;
@@ -237,39 +237,39 @@ impl SslContext {
     #[allow(non_snake_case)]
     /// Specifies the file that contains trusted CA certificates.
     pub fn set_CA_file(&mut self, file: &Path) -> Option<SslError> {
-        wrap_ssl_result(file.with_c_str(|file| {
+        wrap_ssl_result(
             unsafe {
-                ffi::SSL_CTX_load_verify_locations(self.ctx.0, file, ptr::null())
-            }
-        }))
+                let file = CString::from_slice(file.as_vec());
+                ffi::SSL_CTX_load_verify_locations(self.ctx.0, file.as_ptr(), ptr::null())
+            })
     }
 
     /// Specifies the file that contains certificate
     pub fn set_certificate_file(&mut self, file: &Path,
                                 file_type: X509FileType) -> Option<SslError> {
-        wrap_ssl_result(file.with_c_str(|file| {
+        wrap_ssl_result(
             unsafe {
-                ffi::SSL_CTX_use_certificate_file(self.ctx.0, file, file_type as c_int)
-            }
-        }))
+                let file = CString::from_slice(file.as_vec());
+                ffi::SSL_CTX_use_certificate_file(self.ctx.0, file.as_ptr(), file_type as c_int)
+            })
     }
 
     /// Specifies the file that contains private key
     pub fn set_private_key_file(&mut self, file: &Path,
                                 file_type: X509FileType) -> Option<SslError> {
-        wrap_ssl_result(file.with_c_str(|file| {
+        wrap_ssl_result(
             unsafe {
-                ffi::SSL_CTX_use_PrivateKey_file(self.ctx.0, file, file_type as c_int)
-            }
-        }))
+                let file = CString::from_slice(file.as_vec());
+                ffi::SSL_CTX_use_PrivateKey_file(self.ctx.0, file.as_ptr(), file_type as c_int)
+            })
     }
 
     pub fn set_cipher_list(&mut self, cipher_list: &str) -> Option<SslError> {
-        wrap_ssl_result(cipher_list.with_c_str(|cipher_list| {
+        wrap_ssl_result(
             unsafe {
-                ffi::SSL_CTX_set_cipher_list(self.ctx.0, cipher_list)
-            }
-        }))
+                let cipher_list = CString::from_slice(cipher_list.as_bytes());
+                ffi::SSL_CTX_set_cipher_list(self.ctx.0, cipher_list.as_ptr())
+            })
     }
 }
 
@@ -358,17 +358,16 @@ impl Ssl {
 
     /// Set the host name to be used with SNI (Server Name Indication).
     pub fn set_hostname(&self, hostname: &str) -> Result<(), SslError> {
-        let ret = hostname.with_c_str(|hostname| {
-            unsafe {
+        let ret = unsafe {
                 // This is defined as a macro:
                 //      #define SSL_set_tlsext_host_name(s,name) \
                 //          SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
 
+                let hostname = CString::from_slice(hostname.as_bytes());
                 ffi::SSL_ctrl(self.ssl.0, ffi::SSL_CTRL_SET_TLSEXT_HOSTNAME,
                               ffi::TLSEXT_NAMETYPE_host_name,
-                              hostname as *const c_void as *mut c_void)
-            }
-        });
+                              hostname.as_ptr() as *mut c_void)
+        };
 
         // For this case, 0 indicates failure.
         if ret == 0 {
@@ -496,7 +495,7 @@ impl<S: Stream> SslStream<S> {
                 LibSslError::ErrorWantWrite => { try_ssl_stream!(self.flush()) }
                 LibSslError::ErrorZeroReturn => return Err(SslSessionClosed),
                 LibSslError::ErrorSsl => return Err(SslError::get()),
-                err => panic!("unexpected error {}", err),
+                err => panic!("unexpected error {:?}", err),
             }
         }
     }
@@ -521,7 +520,9 @@ impl<S: Stream> SslStream<S> {
         }
 
         let meth = unsafe { ffi::SSL_COMP_get_name(ptr) };
-        let s = unsafe { String::from_raw_buf(meth as *const u8) };
+        let s = unsafe {
+            String::from_utf8(c_str_to_bytes(&meth).to_vec()).unwrap()
+        };
 
         Some(s)
     }
diff --git a/src/ssl/tests.rs b/src/ssl/tests.rs
index 6723fa58..d78e21c5 100644
--- a/src/ssl/tests.rs
+++ b/src/ssl/tests.rs
@@ -27,7 +27,7 @@ fn test_verify_untrusted() {
     ctx.set_verify(SslVerifyPeer, None);
     match SslStream::new(&ctx, stream) {
         Ok(_) => panic!("expected failure"),
-        Err(err) => println!("error {}", err)
+        Err(err) => println!("error {:?}", err)
     }
 }
 
@@ -38,11 +38,11 @@ fn test_verify_trusted() {
     ctx.set_verify(SslVerifyPeer, None);
     match ctx.set_CA_file(&Path::new("test/cert.pem")) {
         None => {}
-        Some(err) => panic!("Unexpected error {}", err)
+        Some(err) => panic!("Unexpected error {:?}", err)
     }
     match SslStream::new(&ctx, stream) {
         Ok(_) => (),
-        Err(err) => panic!("Expected success, got {}", err)
+        Err(err) => panic!("Expected success, got {:?}", err)
     }
 }
 
@@ -56,7 +56,7 @@ fn test_verify_untrusted_callback_override_ok() {
     ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback));
     match SslStream::new(&ctx, stream) {
         Ok(_) => (),
-        Err(err) => panic!("Expected success, got {}", err)
+        Err(err) => panic!("Expected success, got {:?}", err)
     }
 }
 
@@ -81,11 +81,11 @@ fn test_verify_trusted_callback_override_ok() {
     ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback));
     match ctx.set_CA_file(&Path::new("test/cert.pem")) {
         None => {}
-        Some(err) => panic!("Unexpected error {}", err)
+        Some(err) => panic!("Unexpected error {:?}", err)
     }
     match SslStream::new(&ctx, stream) {
         Ok(_) => (),
-        Err(err) => panic!("Expected success, got {}", err)
+        Err(err) => panic!("Expected success, got {:?}", err)
     }
 }
 
@@ -99,7 +99,7 @@ fn test_verify_trusted_callback_override_bad() {
     ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback));
     match ctx.set_CA_file(&Path::new("test/cert.pem")) {
         None => {}
-        Some(err) => panic!("Unexpected error {}", err)
+        Some(err) => panic!("Unexpected error {:?}", err)
     }
     assert!(SslStream::new(&ctx, stream).is_err());
 }
@@ -127,7 +127,7 @@ fn test_verify_trusted_get_error_ok() {
     ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback));
     match ctx.set_CA_file(&Path::new("test/cert.pem")) {
         None => {}
-        Some(err) => panic!("Unexpected error {}", err)
+        Some(err) => panic!("Unexpected error {:?}", err)
     }
     assert!(SslStream::new(&ctx, stream).is_ok());
 }
@@ -170,7 +170,7 @@ fn test_verify_callback_data() {
 
     match SslStream::new(&ctx, stream) {
         Ok(_) => (),
-        Err(err) => panic!("Expected success, got {}", err)
+        Err(err) => panic!("Expected success, got {:?}", err)
     }
 }
 
diff --git a/src/x509/mod.rs b/src/x509/mod.rs
index 4537e553..2792ca1c 100644
--- a/src/x509/mod.rs
+++ b/src/x509/mod.rs
@@ -1,6 +1,6 @@
-use libc::{c_int, c_long, c_uint};
-use std::c_str::ToCStr;
+use libc::{c_char, c_int, c_long, c_uint};
 use std::cmp::Ordering;
+use std::ffi::CString;
 use std::iter::repeat;
 use std::mem;
 use std::num::SignedInt;
@@ -243,11 +243,11 @@ impl X509Generator {
             let mut ctx: ffi::X509V3_CTX = mem::zeroed();
             ffi::X509V3_set_ctx(&mut ctx, x509, x509,
                                 ptr::null_mut(), ptr::null_mut(), 0);
-            let ext = value.with_c_str(|value|
-                                       ffi::X509V3_EXT_conf_nid(ptr::null_mut(),
-                                                                mem::transmute(&ctx),
-                                                                extension,
-                                                                mem::transmute(value)));
+            let value = CString::from_slice(value.as_bytes());
+            let ext = ffi::X509V3_EXT_conf_nid(ptr::null_mut(),
+                                               mem::transmute(&ctx),
+                                               extension,
+                                               value.as_ptr() as *mut c_char);
 
             let mut success = false;
             if ext != ptr::null_mut() {
@@ -260,12 +260,12 @@ impl X509Generator {
 
     fn add_name(name: *mut ffi::X509_NAME, key: &str, value: &str) -> Result<(), SslError> {
         let value_len = value.len() as c_int;
-        lift_ssl!(key.with_c_str(|key| {
-            value.with_c_str(|value| unsafe {
-                    ffi::X509_NAME_add_entry_by_txt(name, key, ffi::MBSTRING_UTF8,
-                                                    value, value_len, -1, 0)
-            })
-        }))
+        lift_ssl!(unsafe {
+            let key = CString::from_slice(key.as_bytes());
+            let value = CString::from_slice(value.as_bytes());
+            ffi::X509_NAME_add_entry_by_txt(name, key.as_ptr(), ffi::MBSTRING_UTF8,
+                                            value.as_ptr(), value_len, -1, 0)
+        })
     }
 
     fn random_serial() -> c_long {