From 80a265485819476a2e11dbdbdd4c0624477bfc80 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Fri, 26 Jul 2013 22:58:08 -0700
Subject: [PATCH] Update to latest master (0.8-pre 4989799)

---
 pkcs5.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkcs5.rs b/pkcs5.rs
index ed370b8c..366cd71a 100644
--- a/pkcs5.rs
+++ b/pkcs5.rs
@@ -1,5 +1,5 @@
 use std::libc::c_int;
-use std::{vec,str};
+use std::vec;
 
 #[link_args = "-lcrypto"]
 #[abi = "cdecl"]
@@ -18,7 +18,7 @@ pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint,
     assert!(iter >= 1u);
     assert!(keylen >= 1u);
 
-    do str::as_buf(pass) |pass_buf, pass_len| {
+    do pass.as_imm_buf |pass_buf, pass_len| {
         do salt.as_imm_buf |salt_buf, salt_len| {
             let mut out = vec::with_capacity(keylen);