aboutsummaryrefslogtreecommitdiff
path: root/src/x509
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-01-28 08:47:16 -0800
committerSteven Fackler <[email protected]>2015-01-28 08:47:16 -0800
commit030cf5fe88f292a48b71789f5d0e9a9b133c5c09 (patch)
treee105f6e7ddf28efbc6f58f8424f87b1b1bc46da6 /src/x509
parentRelease v0.2.17 (diff)
downloadrust-openssl-030cf5fe88f292a48b71789f5d0e9a9b133c5c09.tar.xz
rust-openssl-030cf5fe88f292a48b71789f5d0e9a9b133c5c09.zip
Fix for IO changes
Diffstat (limited to 'src/x509')
-rw-r--r--src/x509/mod.rs8
-rw-r--r--src/x509/tests.rs4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/x509/mod.rs b/src/x509/mod.rs
index 70cbe453..d4fdc34a 100644
--- a/src/x509/mod.rs
+++ b/src/x509/mod.rs
@@ -149,8 +149,8 @@ impl<'a, T: AsStr<'a>> ToStr for Vec<T> {
/// ```
/// # #[allow(unstable)]
/// # fn main() {
-/// use std::io::{File, Open, Write};
-/// # use std::io::fs;
+/// use std::old_io::{File, Open, Write};
+/// # use std::old_io::fs;
///
/// use openssl::crypto::hash::HashType;
/// use openssl::x509::{KeyUsage, X509Generator};
@@ -371,7 +371,7 @@ impl<'ctx> X509<'ctx> {
pub fn from_pem<R>(reader: &mut R) -> Result<X509<'ctx>, SslError> where R: Reader {
let mut mem_bio = try!(MemBio::new());
let buf = try!(reader.read_to_end().map_err(StreamError));
- try!(mem_bio.write(buf.as_slice()).map_err(StreamError));
+ try!(mem_bio.write_all(buf.as_slice()).map_err(StreamError));
unsafe {
let handle = try_ssl_null!(ffi::PEM_read_bio_X509(mem_bio.get_handle(),
@@ -417,7 +417,7 @@ impl<'ctx> X509<'ctx> {
self.handle));
}
let buf = try!(mem_bio.read_to_end().map_err(StreamError));
- writer.write(buf.as_slice()).map_err(StreamError)
+ writer.write_all(buf.as_slice()).map_err(StreamError)
}
}
diff --git a/src/x509/tests.rs b/src/x509/tests.rs
index 4e7fc925..c9a655f2 100644
--- a/src/x509/tests.rs
+++ b/src/x509/tests.rs
@@ -1,6 +1,6 @@
use serialize::hex::FromHex;
-use std::io::{File, Open, Read};
-use std::io::util::NullWriter;
+use std::old_io::{File, Open, Read};
+use std::old_io::util::NullWriter;
use crypto::hash::HashType::{SHA256};
use x509::{X509, X509Generator};