min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import shim'd HMAC stuff with the original name

This commit is contained in:
Steven Fackler 2015-06-27 15:23:19 -07:00
parent d0b769c93c
commit cb7248d8cb
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openssl-sys/src/lib.rs
View File

@ -415,10 +415,20 @@ extern "C" {
pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *const HMAC_CTX) -> c_int; pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *const HMAC_CTX) -> c_int;
// Pre-1.0 versions of these didn't return anything, so the shims bridge that gap // Pre-1.0 versions of these didn't return anything, so the shims bridge that gap
#[cfg_attr(not(target_os = "nacl"), link_name = "HMAC_Init_ex_shim")]
pub fn HMAC_Init_ex(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE) -> c_int;
#[cfg_attr(not(target_os = "nacl"), link_name = "HMAC_Final_shim")]
pub fn HMAC_Final(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint) -> c_int;
#[cfg_attr(not(target_os = "nacl"), link_name = "HMAC_Update_shim")]
pub fn HMAC_Update(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int;
/// Deprecated - use the non "_shim" version
#[cfg_attr(target_os = "nacl", link_name = "HMAC_Init_ex")] #[cfg_attr(target_os = "nacl", link_name = "HMAC_Init_ex")]
pub fn HMAC_Init_ex_shim(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE) -> c_int; pub fn HMAC_Init_ex_shim(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE) -> c_int;
/// Deprecated - use the non "_shim" version
#[cfg_attr(target_os = "nacl", link_name = "HMAC_Final")] #[cfg_attr(target_os = "nacl", link_name = "HMAC_Final")]
pub fn HMAC_Final_shim(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint) -> c_int; pub fn HMAC_Final_shim(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint) -> c_int;
/// Deprecated - use the non "_shim" version
#[cfg_attr(target_os = "nacl", link_name = "HMAC_Update")] #[cfg_attr(target_os = "nacl", link_name = "HMAC_Update")]
pub fn HMAC_Update_shim(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int; pub fn HMAC_Update_shim(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int;

10
openssl/src/crypto/hmac.rs
View File

@ -88,7 +88,7 @@ impl HMAC {
#[inline] #[inline]
fn init_once(&mut self, md: *const ffi::EVP_MD, key: &[u8]) { fn init_once(&mut self, md: *const ffi::EVP_MD, key: &[u8]) {
unsafe { unsafe {
let r = ffi::HMAC_Init_ex_shim(&mut self.ctx, let r = ffi::HMAC_Init_ex(&mut self.ctx,
key.as_ptr(), key.len() as c_int, key.as_ptr(), key.len() as c_int,
md, 0 as *const _); md, 0 as *const _);
assert_eq!(r, 1); assert_eq!(r, 1);
@ -106,7 +106,7 @@ impl HMAC {
// If the key and/or md is not supplied it's reused from the last time // If the key and/or md is not supplied it's reused from the last time
// avoiding redundant initializations // avoiding redundant initializations
unsafe { unsafe {
let r = ffi::HMAC_Init_ex_shim(&mut self.ctx, let r = ffi::HMAC_Init_ex(&mut self.ctx,
0 as *const _, 0, 0 as *const _, 0,
0 as *const _, 0 as *const _); 0 as *const _, 0 as *const _);
assert_eq!(r, 1); assert_eq!(r, 1);
@ -120,7 +120,7 @@ impl HMAC {
self.init(); self.init();
} }
unsafe { unsafe {
let r = ffi::HMAC_Update_shim(&mut self.ctx, data.as_ptr(), data.len() as c_uint); let r = ffi::HMAC_Update(&mut self.ctx, data.as_ptr(), data.len() as c_uint);
assert_eq!(r, 1); assert_eq!(r, 1);
} }
self.state = Updated; self.state = Updated;
@ -135,7 +135,7 @@ impl HMAC {
let mut res: Vec<u8> = repeat(0).take(md_len).collect(); let mut res: Vec<u8> = repeat(0).take(md_len).collect();
unsafe { unsafe {
let mut len = 0; let mut len = 0;
let r = ffi::HMAC_Final_shim(&mut self.ctx, res.as_mut_ptr(), &mut len); let r = ffi::HMAC_Final(&mut self.ctx, res.as_mut_ptr(), &mut len);
self.state = Finalized; self.state = Finalized;
assert_eq!(len as usize, md_len); assert_eq!(len as usize, md_len);
assert_eq!(r, 1); assert_eq!(r, 1);
@ -181,7 +181,7 @@ impl Drop for HMAC {
if self.state != Finalized { if self.state != Finalized {
let mut buf: Vec<u8> = repeat(0).take(self.type_.md_len()).collect(); let mut buf: Vec<u8> = repeat(0).take(self.type_.md_len()).collect();
let mut len = 0; let mut len = 0;
ffi::HMAC_Final_shim(&mut self.ctx, buf.as_mut_ptr(), &mut len); ffi::HMAC_Final(&mut self.ctx, buf.as_mut_ptr(), &mut len);
} }
ffi::HMAC_CTX_cleanup(&mut self.ctx); ffi::HMAC_CTX_cleanup(&mut self.ctx);
} }