Commit 761901d0 authored by Steven Fackler's avatar Steven Fackler
Browse files

Update for vec API changes

parent 53acce7a

crypto/hash.rs

+2 −2
Original line number Diff line number Diff line 
use std::libc::c_uint;

use std::libc;

use std::ptr;

use std::vec;

use std::slice;



pub enum HashType {

    MD5,
@@ -78,7 +78,7 @@ impl Hasher { 
     */

    pub fn final(&self) -> ~[u8] {

        unsafe {

            let mut res = vec::from_elem(self.len, 0u8);

            let mut res = slice::from_elem(self.len, 0u8);

            EVP_DigestFinal(self.ctx, res.as_mut_ptr(), ptr::null());

            res

        }

crypto/hmac.rs

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


use std::libc::{c_uchar, c_int, c_uint};

use std::ptr;

use std::vec;

use std::slice;

use crypto::hash;



#[allow(non_camel_case_types)]
@@ -72,7 +72,7 @@ impl HMAC { 


    pub fn final(&mut self) -> ~[u8] {

        unsafe {

            let mut res = vec::from_elem(self.len, 0u8);

            let mut res = slice::from_elem(self.len, 0u8);

            let mut outlen = 0;

            HMAC_Final(&mut self.ctx, res.as_mut_ptr(), &mut outlen);

            assert!(self.len == outlen as uint)

crypto/pkcs5.rs

+2 −2
Original line number Diff line number Diff line 
use std::libc::c_int;

use std::vec;

use std::slice;



#[link(name = "crypto")]

extern {
@@ -15,7 +15,7 @@ pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint, keylen: uint) -> ~[ 
        assert!(iter >= 1);

        assert!(keylen >= 1);



        let mut out = vec::with_capacity(keylen);

        let mut out = slice::with_capacity(keylen);



        let r = PKCS5_PBKDF2_HMAC_SHA1(

                pass.as_ptr(), pass.len() as c_int,

crypto/pkey.rs

+5 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ use std::cast; 
use std::libc::{c_char, c_int, c_uint};

use std::libc;

use std::ptr;

use std::vec;

use std::slice;

use crypto::hash::{HashType, MD5, SHA1, SHA224, SHA256, SHA384, SHA512};



#[allow(non_camel_case_types)]
@@ -94,7 +94,7 @@ impl PKey { 
        unsafe {

            let len = f(self.evp, ptr::null());

            if len < 0 as c_int { return ~[]; }

            let mut s = vec::from_elem(len as uint, 0u8);

            let mut s = slice::from_elem(len as uint, 0u8);



            let r = f(self.evp, &s.as_mut_ptr());
@@ -219,7 +219,7 @@ impl PKey { 


            assert!(s.len() < self.max_data());



            let mut r = vec::from_elem(len as uint + 1u, 0u8);

            let mut r = slice::from_elem(len as uint + 1u, 0u8);



            let rv = RSA_public_encrypt(

                s.len() as c_uint,
@@ -244,7 +244,7 @@ impl PKey { 


            assert_eq!(s.len() as c_uint, RSA_size(rsa));



            let mut r = vec::from_elem(len as uint + 1u, 0u8);

            let mut r = slice::from_elem(len as uint + 1u, 0u8);



            let rv = RSA_private_decrypt(

                s.len() as c_uint,
@@ -289,7 +289,7 @@ impl PKey { 
        unsafe {

            let rsa = EVP_PKEY_get1_RSA(self.evp);

            let mut len = RSA_size(rsa);

            let mut r = vec::from_elem(len as uint + 1u, 0u8);

            let mut r = slice::from_elem(len as uint + 1u, 0u8);



            let rv = RSA_sign(

                openssl_hash_nid(hash),

crypto/rand.rs

+2 −2
Original line number Diff line number Diff line 
use std::libc::c_int;

use std::vec;

use std::slice;



#[link(name = "crypto")]

extern {
@@ -8,7 +8,7 @@ extern { 


pub fn rand_bytes(len: uint) -> ~[u8] {

    unsafe {

        let mut out = vec::with_capacity(len);

        let mut out = slice::with_capacity(len);



        let r = RAND_bytes(out.as_mut_ptr(), len as c_int);

        if r != 1 as c_int { fail!() }