aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Gehring <[email protected]>2014-05-11 16:03:55 +0200
committerMichael Gehring <[email protected]>2014-05-11 16:03:55 +0200
commit2eccb83f4fcd3125d55b8a334c5d5449da6673ec (patch)
treea36a3ddf261f867bd41ea8f72bb609f3819ac864
parentFix tests for upstream changes (diff)
downloadrust-openssl-2eccb83f4fcd3125d55b8a334c5d5449da6673ec.tar.xz
rust-openssl-2eccb83f4fcd3125d55b8a334c5d5449da6673ec.zip
Update for extern unsafe changes
-rw-r--r--crypto/pkey.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkey.rs b/crypto/pkey.rs
index a65e9131..1fd88061 100644
--- a/crypto/pkey.rs
+++ b/crypto/pkey.rs
@@ -89,7 +89,7 @@ impl PKey {
}
}
- fn _tostr(&self, f: extern "C" unsafe fn(*EVP_PKEY, **mut u8) -> c_int) -> Vec<u8> {
+ fn _tostr(&self, f: unsafe extern "C" fn(*EVP_PKEY, **mut u8) -> c_int) -> Vec<u8> {
unsafe {
let len = f(self.evp, ptr::null());
if len < 0 as c_int { return vec!(); }
@@ -102,7 +102,7 @@ impl PKey {
}
}
- fn _fromstr(&mut self, s: &[u8], f: extern "C" unsafe fn(c_int, **EVP_PKEY, **u8, c_uint) -> *EVP_PKEY) {
+ fn _fromstr(&mut self, s: &[u8], f: unsafe extern "C" fn(c_int, **EVP_PKEY, **u8, c_uint) -> *EVP_PKEY) {
unsafe {
let evp = ptr::null();
f(6 as c_int, &evp, &s.as_ptr(), s.len() as c_uint);