diff options
| author | Steven Fackler <[email protected]> | 2014-03-20 19:09:39 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-03-20 19:09:39 -0700 |
| commit | 761901d0e409304450a49d784bae989d125c68b2 (patch) | |
| tree | af3fc7d28f78c8245c851edda27737e057c037fb /ssl | |
| parent | Clean up locking code a bit (diff) | |
| download | rust-openssl-761901d0e409304450a49d784bae989d125c68b2.tar.xz rust-openssl-761901d0e409304450a49d784bae989d125c68b2.zip | |
Update for vec API changes
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/error.rs | 1 | ||||
| -rw-r--r-- | ssl/ffi.rs | 2 | ||||
| -rw-r--r-- | ssl/mod.rs | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/ssl/error.rs b/ssl/error.rs index 6a89b678..9cd58a2d 100644 --- a/ssl/error.rs +++ b/ssl/error.rs @@ -1,6 +1,5 @@ use std::libc::c_ulong; use std::io::IoError; -use std::vec_ng::Vec; use ssl::ffi; @@ -124,7 +124,7 @@ extern "C" { pub fn SSL_CTX_new(method: *SSL_METHOD) -> *SSL_CTX; pub fn SSL_CTX_free(ctx: *SSL_CTX); pub fn SSL_CTX_set_verify(ctx: *SSL_CTX, mode: c_int, - verify_callback: Option<extern "C" fn(c_int, *X509_STORE_CTX) -> c_int>); + verify_callback: Option<extern fn(c_int, *X509_STORE_CTX) -> c_int>); pub fn SSL_CTX_load_verify_locations(ctx: *SSL_CTX, CAfile: *c_char, CApath: *c_char) -> c_int; pub fn SSL_CTX_get_ex_new_index(argl: c_long, argp: *c_void, @@ -2,9 +2,8 @@ use sync::one::{Once, ONCE_INIT}; use std::cast; use std::libc::{c_int, c_void, c_char}; use std::ptr; -use std::io::{IoResult, IoError, OtherIoError, EndOfFile, Stream, Reader, Writer}; +use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer}; use std::unstable::mutex::NativeMutex; -use std::vec_ng::Vec; use ssl::error::{SslError, SslSessionClosed, StreamError}; @@ -91,7 +90,7 @@ pub enum SslVerifyMode { } extern fn locking_function(mode: c_int, n: c_int, _file: *c_char, - _line: c_int) { + _line: c_int) { unsafe { inner_lock(mode, (*MUTEXES).get_mut(n as uint)); } } |