From 867433a09778a55fa4f92a36c3fe7e70fa815bb7 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Wed, 10 Jul 2013 10:16:53 -0700 Subject: [PATCH] Update for 0.8-pre (f503e53) --- hash.rs | 4 ++-- hmac.rs | 4 ++-- pkcs5.rs | 4 ++-- pkey.rs | 20 ++++++++++---------- rand.rs | 2 +- symm.rs | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/hash.rs b/hash.rs index 688ef7fd..c55515d1 100644 --- a/hash.rs +++ b/hash.rs @@ -73,7 +73,7 @@ impl Hasher { /// Update this hasher with more input bytes pub fn update(&self, data: &[u8]) { unsafe { - do vec::as_imm_buf(data) |pdata, len| { + do data.as_imm_buf |pdata, len| { EVP_DigestUpdate(self.ctx, pdata, len as c_uint) } } @@ -86,7 +86,7 @@ impl Hasher { pub fn final(&self) -> ~[u8] { unsafe { let mut res = vec::from_elem(self.len, 0u8); - do vec::as_mut_buf(res) |pres, _len| { + do res.as_mut_buf |pres, _len| { EVP_DigestFinal(self.ctx, pres, ptr::null()); } res diff --git a/hmac.rs b/hmac.rs index ec9c40c8..1e71ed1b 100644 --- a/hmac.rs +++ b/hmac.rs @@ -68,7 +68,7 @@ pub fn HMAC(ht: HashType, key: ~[u8]) -> HMAC { impl HMAC { pub fn update(&mut self, data: &[u8]) { unsafe { - do vec::as_imm_buf(data) |pdata, len| { + do data.as_imm_buf |pdata, len| { HMAC_Update(&mut self.ctx, pdata, len as libc::c_uint) } } @@ -78,7 +78,7 @@ impl HMAC { unsafe { let mut res = vec::from_elem(self.len, 0u8); let mut outlen: libc::c_uint = 0; - do vec::as_mut_buf(res) |pres, _len| { + do res.as_mut_buf |pres, _len| { HMAC_Final(&mut self.ctx, pres, &mut outlen); assert!(self.len == outlen as uint) } diff --git a/pkcs5.rs b/pkcs5.rs index 1d68661a..ed370b8c 100644 --- a/pkcs5.rs +++ b/pkcs5.rs @@ -19,10 +19,10 @@ pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint, assert!(keylen >= 1u); do str::as_buf(pass) |pass_buf, pass_len| { - do vec::as_imm_buf(salt) |salt_buf, salt_len| { + do salt.as_imm_buf |salt_buf, salt_len| { let mut out = vec::with_capacity(keylen); - do vec::as_mut_buf(out) |out_buf, _out_len| { + do out.as_mut_buf |out_buf, _out_len| { unsafe { let r = PKCS5_PBKDF2_HMAC_SHA1( pass_buf, pass_len as c_int, diff --git a/pkey.rs b/pkey.rs index d9cdbdf1..05832d02 100644 --- a/pkey.rs +++ b/pkey.rs @@ -106,7 +106,7 @@ impl PKey { if len < 0 as c_int { return ~[]; } let mut s = vec::from_elem(len as uint, 0u8); - let r = do vec::as_mut_buf(s) |ps, _len| { + let r = do s.as_mut_buf |ps, _len| { f(self.evp, &ps) }; @@ -118,7 +118,7 @@ impl PKey { s: &[u8], f: extern "C" unsafe fn(c_int, &*EVP_PKEY, &*u8, c_uint) -> *EVP_PKEY ) { - do vec::as_imm_buf(s) |ps, len| { + do s.as_imm_buf |ps, len| { let evp = ptr::null(); f(6 as c_int, &evp, &ps, len as c_uint); self.evp = evp; @@ -242,8 +242,8 @@ impl PKey { let mut r = vec::from_elem(len as uint + 1u, 0u8); - let rv = do vec::as_mut_buf(r) |pr, _len| { - do vec::as_imm_buf(s) |ps, s_len| { + let rv = do r.as_mut_buf |pr, _len| { + do s.as_imm_buf |ps, s_len| { RSA_public_encrypt( s_len as c_uint, ps, @@ -270,8 +270,8 @@ impl PKey { let mut r = vec::from_elem(len as uint + 1u, 0u8); - let rv = do vec::as_mut_buf(r) |pr, _len| { - do vec::as_imm_buf(s) |ps, s_len| { + let rv = do r.as_mut_buf |pr, _len| { + do s.as_imm_buf |ps, s_len| { RSA_private_decrypt( s_len as c_uint, ps, @@ -319,8 +319,8 @@ impl PKey { let len = RSA_size(rsa); let mut r = vec::from_elem(len as uint + 1u, 0u8); - let rv = do vec::as_mut_buf(r) |pr, _len| { - do vec::as_imm_buf(s) |ps, s_len| { + let rv = do r.as_mut_buf |pr, _len| { + do s.as_imm_buf |ps, s_len| { RSA_sign( openssl_hash_nid(hash), ps, @@ -343,8 +343,8 @@ impl PKey { unsafe { let rsa = EVP_PKEY_get1_RSA(self.evp); - do vec::as_imm_buf(m) |pm, m_len| { - do vec::as_imm_buf(s) |ps, s_len| { + do m.as_imm_buf |pm, m_len| { + do s.as_imm_buf |ps, s_len| { let rv = RSA_verify( openssl_hash_nid(hash), pm, diff --git a/rand.rs b/rand.rs index 74d88952..1d8bbff8 100644 --- a/rand.rs +++ b/rand.rs @@ -10,7 +10,7 @@ extern { pub fn rand_bytes(len: uint) -> ~[u8] { let mut out = vec::with_capacity(len); - do vec::as_mut_buf(out) |out_buf, len| { + do out.as_mut_buf |out_buf, len| { unsafe { let r = RAND_bytes(out_buf, len as c_int); if r != 1 as c_int { fail!() } diff --git a/symm.rs b/symm.rs index dc4288a7..29861cdd 100644 --- a/symm.rs +++ b/symm.rs @@ -111,8 +111,8 @@ impl Crypter { }; assert!(key.len() == self.keylen); - do vec::as_imm_buf(key) |pkey, _len| { - do vec::as_imm_buf(iv) |piv, _len| { + do key.as_imm_buf |pkey, _len| { + do iv.as_imm_buf |piv, _len| { EVP_CipherInit( self.ctx, self.evp, @@ -131,10 +131,10 @@ impl Crypter { */ pub fn update(&self, data: &[u8]) -> ~[u8] { unsafe { - do vec::as_imm_buf(data) |pdata, len| { + do data.as_imm_buf |pdata, len| { let mut res = vec::from_elem(len + self.blocksize, 0u8); - let reslen = do vec::as_mut_buf(res) |pres, _len| { + let reslen = do res.as_mut_buf |pres, _len| { let mut reslen = (len + self.blocksize) as u32; EVP_CipherUpdate( @@ -160,7 +160,7 @@ impl Crypter { unsafe { let mut res = vec::from_elem(self.blocksize, 0u8); - let reslen = do vec::as_mut_buf(res) |pres, _len| { + let reslen = do res.as_mut_buf |pres, _len| { let mut reslen = self.blocksize as c_int; EVP_CipherFinal(self.ctx, pres, &mut reslen); reslen