aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Anderson <[email protected]>2012-10-02 16:00:06 -0700
committerBrian Anderson <[email protected]>2012-10-02 16:00:06 -0700
commit39cd493434a4ff0a3fd7e82720b0b7015abb62bc (patch)
treeb36fb8f0654d2d240a4b3b2c96e9abdb4b709002
parentUpdate to rust HEAD (diff)
downloadrust-openssl-39cd493434a4ff0a3fd7e82720b0b7015abb62bc.tar.xz
rust-openssl-39cd493434a4ff0a3fd7e82720b0b7015abb62bc.zip
Update for language changes
-rw-r--r--pkcs5.rs4
-rw-r--r--pkey.rs2
-rw-r--r--rand.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/pkcs5.rs b/pkcs5.rs
index e5438ea7..8ce32c54 100644
--- a/pkcs5.rs
+++ b/pkcs5.rs
@@ -29,10 +29,10 @@ pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint,
out_buf);
if r != 1 as c_int { fail; }
-
- unsafe { vec::raw::set_len(out, keylen); }
}
+ unsafe { vec::raw::set_len(&mut out, keylen); }
+
out
}
}
diff --git a/pkey.rs b/pkey.rs
index 2917a318..5fe399b0 100644
--- a/pkey.rs
+++ b/pkey.rs
@@ -260,7 +260,7 @@ pub impl PKey {
do vec::as_mut_buf(r) |pr, _len| {
do vec::as_imm_buf(s) |ps, s_len| {
- let plen = ptr::addr_of(len);
+ let plen = ptr::addr_of(&len);
// XXX: 672 == NID_sha256
let rv = libcrypto::RSA_sign(
diff --git a/rand.rs b/rand.rs
index 4f018be3..c6e0c4a0 100644
--- a/rand.rs
+++ b/rand.rs
@@ -14,7 +14,7 @@ pub fn rand_bytes(len: uint) -> ~[u8] {
if r != 1 as c_int { fail }
}
- unsafe { vec::raw::set_len(out, len); }
+ unsafe { vec::raw::set_len(&mut out, len); }
out
}