aboutsummaryrefslogtreecommitdiff
path: root/pkcs5.rs
diff options
context:
space:
mode:
authorKevin Ballard <[email protected]>2013-08-22 20:31:02 -0700
committerKevin Ballard <[email protected]>2013-08-22 20:31:02 -0700
commitec7474c895f967ed67a33fd69708af68745fe078 (patch)
treeb2ecf0bc44e5d6ee5e31b69850c25ebfa9c6674f /pkcs5.rs
parentMerge pull request #2 from erickt/master (diff)
downloadrust-openssl-ec7474c895f967ed67a33fd69708af68745fe078.tar.xz
rust-openssl-ec7474c895f967ed67a33fd69708af68745fe078.zip
Update to latest rust master (0.8-pre 063a005)
Diffstat (limited to 'pkcs5.rs')
-rw-r--r--pkcs5.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkcs5.rs b/pkcs5.rs
index 400d3207..f9e2a48d 100644
--- a/pkcs5.rs
+++ b/pkcs5.rs
@@ -13,9 +13,9 @@ mod libcrypto {
}
}
-#[doc = "
-Derives a key from a password and salt using the PBKDF2-HMAC-SHA1 algorithm.
-"]
+/// Derives a key from a password and salt using the PBKDF2-HMAC-SHA1 algorithm.
+#[fixed_stack_segment]
+#[inline(never)]
pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint,
keylen: uint) -> ~[u8] {
assert!(iter >= 1u);