Merge pull request #474 from sfackler/digest

Signature/Digest API

7 files changed, 399 insertions, 659 deletions

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 3faa1e57..6fe44750 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -109,6 +109,7 @@ pub const CRYPTO_LOCK: c_int = 1;
 
 pub const EVP_MAX_MD_SIZE: c_uint = 64;
 pub const EVP_PKEY_RSA: c_int = NID_rsaEncryption;
+pub const EVP_PKEY_HMAC: c_int = NID_hmac;
 
 pub const MBSTRING_ASC:  c_int = MBSTRING_FLAG | 1;
 pub const MBSTRING_BMP:  c_int = MBSTRING_FLAG | 2;
@@ -119,6 +120,7 @@ pub const MBSTRING_UTF8: c_int = MBSTRING_FLAG;
 pub const NID_rsaEncryption: c_int = 6;
 pub const NID_ext_key_usage: c_int = 126;
 pub const NID_key_usage:     c_int = 83;
+pub const NID_hmac:          c_int = 855;
 
 pub const PKCS5_SALT_LEN: c_int = 8;
 
@@ -489,6 +491,28 @@ extern {
     pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
     pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
 
+    pub fn EVP_DigestSignInit(ctx: *mut EVP_MD_CTX,
+                              pctx: *mut *mut EVP_PKEY_CTX,
+                              type_: *const EVP_MD,
+                              e: *mut ENGINE,
+                              pkey: *mut EVP_PKEY) -> c_int;
+    pub fn EVP_DigestSignFinal(ctx: *mut EVP_MD_CTX,
+                               sig: *mut c_uchar,
+                               siglen: *mut size_t) -> c_int;
+    pub fn EVP_DigestVerifyInit(ctx: *mut EVP_MD_CTX,
+                                pctx: *mut *mut EVP_PKEY_CTX,
+                                type_: *const EVP_MD,
+                                e: *mut ENGINE,
+                                pkey: *mut EVP_PKEY) -> c_int;
+    #[cfg(ossl101)]
+    pub fn EVP_DigestVerifyFinal(ctx: *mut EVP_MD_CTX,
+                                 sigret: *mut c_uchar,
+                                 siglen: size_t) -> c_int;
+    #[cfg(not(ossl101))]
+    pub fn EVP_DigestVerifyFinal(ctx: *mut EVP_MD_CTX,
+                                 sigret: *const c_uchar,
+                                 siglen: size_t) -> c_int;
+
     pub fn EVP_MD_CTX_copy_ex(dst: *mut EVP_MD_CTX, src: *const EVP_MD_CTX) -> c_int;
 
     pub fn EVP_PKEY_new() -> *mut EVP_PKEY;
@@ -498,6 +522,10 @@ extern {
     pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;
     pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int;
     pub fn EVP_PKEY_cmp(a: *const EVP_PKEY, b: *const EVP_PKEY) -> c_int;
+    pub fn EVP_PKEY_new_mac_key(type_: c_int,
+                                e: *mut ENGINE,
+                                key: *const c_uchar,
+                                keylen: c_int) -> *mut EVP_PKEY;
 
     pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *mut HMAC_CTX) -> c_int;
 
diff --git a/openssl-sys/src/ossl10x.rs b/openssl-sys/src/ossl10x.rs
index 16d669b0..595b673b 100644
--- a/openssl-sys/src/ossl10x.rs
+++ b/openssl-sys/src/ossl10x.rs
@@ -2,7 +2,9 @@ use std::sync::{Mutex, MutexGuard};
 use std::sync::{Once, ONCE_INIT};
 use std::mem;
 
-use libc::{c_int, c_char, c_void, c_long, c_uchar, size_t, c_uint, c_ulong, time_t};
+use libc::{c_int, c_char, c_void, c_long, c_uchar, size_t, c_uint, c_ulong};
+#[cfg(not(ossl101))]
+use libc::time_t;
 
 #[repr(C)]
 pub struct stack_st_ASN1_OBJECT {
diff --git a/openssl/src/crypto/hmac.rs b/openssl/src/crypto/hmac.rs
deleted file mode 100644
index 8f44ed7f..00000000
--- a/openssl/src/crypto/hmac.rs
+++ /dev/null
@@ -1,565 +0,0 @@
-// Copyright 2013 Jack Lloyd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-use libc::{c_int};
-use std::io;
-use std::io::prelude::*;
-use ffi;
-
-use HashTypeInternals;
-use crypto::hash::Type;
-use error::ErrorStack;
-
-#[derive(PartialEq, Copy, Clone)]
-enum State {
-    Reset,
-    Updated,
-    Finalized,
-}
-
-use self::State::*;
-
-/// Provides HMAC computation.
-///
-/// Requires the `hmac` feature.
-///
-/// # Examples
-///
-/// Calculate a HMAC in one go.
-///
-/// ```
-/// use openssl::crypto::hash::Type;
-/// use openssl::crypto::hmac::hmac;
-/// let key = b"Jefe";
-/// let data = b"what do ya want for nothing?";
-/// let spec = b"\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38";
-/// let res = hmac(Type::MD5, key, data).unwrap();
-/// assert_eq!(res, spec);
-/// ```
-///
-/// Use the `Write` trait to supply the input in chunks.
-///
-/// ```
-/// use openssl::crypto::hash::Type;
-/// use openssl::crypto::hmac::HMAC;
-/// let key = b"Jefe";
-/// let data: &[&[u8]] = &[b"what do ya ", b"want for nothing?"];
-/// let spec = b"\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38";
-/// let mut h = HMAC::new(Type::MD5, &*key).unwrap();
-/// h.update(data[0]).unwrap();
-/// h.update(data[1]).unwrap();
-/// let res = h.finish().unwrap();
-/// assert_eq!(res, spec);
-/// ```
-pub struct HMAC {
-    ctx: compat::HMAC_CTX,
-    state: State,
-}
-
-impl HMAC {
-    /// Creates a new `HMAC` with the specified hash type using the `key`.
-    pub fn new(ty: Type, key: &[u8]) -> Result<HMAC, ErrorStack> {
-        ffi::init();
-
-        let ctx = compat::HMAC_CTX::new();
-        let md = ty.evp_md();
-
-        let mut h = HMAC {
-            ctx: ctx,
-            state: Finalized,
-        };
-        try!(h.init_once(md, key));
-        Ok(h)
-    }
-
-    fn init_once(&mut self, md: *const ffi::EVP_MD, key: &[u8]) -> Result<(), ErrorStack> {
-        unsafe {
-            try_ssl!(ffi::HMAC_Init_ex(self.ctx.get(),
-                                       key.as_ptr() as *const _,
-                                       key.len() as c_int,
-                                       md,
-                                       0 as *mut _));
-        }
-        self.state = Reset;
-        Ok(())
-    }
-
-    fn init(&mut self) -> Result<(), ErrorStack> {
-        match self.state {
-            Reset => return Ok(()),
-            Updated => {
-                try!(self.finish());
-            }
-            Finalized => (),
-        }
-        // If the key and/or md is not supplied it's reused from the last time
-        // avoiding redundant initializations
-        unsafe {
-            try_ssl!(ffi::HMAC_Init_ex(self.ctx.get(),
-                                       0 as *const _,
-                                       0,
-                                       0 as *const _,
-                                       0 as *mut _));
-        }
-        self.state = Reset;
-        Ok(())
-    }
-
-    pub fn update(&mut self, data: &[u8]) -> Result<(), ErrorStack> {
-        if self.state == Finalized {
-            try!(self.init());
-        }
-        unsafe {
-            try_ssl!(ffi::HMAC_Update(self.ctx.get(),
-                                      data.as_ptr(),
-                                      data.len()));
-        }
-        self.state = Updated;
-        Ok(())
-    }
-
-    /// Returns the hash of the data written since creation or
-    /// the last `finish` and resets the hasher.
-    pub fn finish(&mut self) -> Result<Vec<u8>, ErrorStack> {
-        if self.state == Finalized {
-            try!(self.init());
-        }
-        unsafe {
-            let mut len = ffi::EVP_MAX_MD_SIZE;
-            let mut res = vec![0; len as usize];
-            try_ssl!(ffi::HMAC_Final(self.ctx.get(),
-                                     res.as_mut_ptr(),
-                                     &mut len));
-            res.truncate(len as usize);
-            self.state = Finalized;
-            Ok(res)
-        }
-    }
-}
-
-impl Write for HMAC {
-    #[inline]
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        try!(self.update(buf));
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-impl Clone for HMAC {
-    fn clone(&self) -> HMAC {
-        let ctx = compat::HMAC_CTX::new();
-        unsafe {
-            let r = ffi::HMAC_CTX_copy(ctx.get(), self.ctx.get());
-            assert_eq!(r, 1);
-        }
-        HMAC {
-            ctx: ctx,
-            state: self.state,
-        }
-    }
-}
-
-impl Drop for HMAC {
-    fn drop(&mut self) {
-        if self.state != Finalized {
-            drop(self.finish());
-        }
-    }
-}
-
-/// Computes the HMAC of the `data` with the hash `t` and `key`.
-pub fn hmac(t: Type, key: &[u8], data: &[u8]) -> Result<Vec<u8>, ErrorStack> {
-    let mut h = try!(HMAC::new(t, key));
-    try!(h.update(data));
-    h.finish()
-}
-
-#[cfg(ossl110)]
-#[allow(bad_style)]
-mod compat {
-    use ffi;
-
-    pub struct HMAC_CTX {
-        ctx: *mut ffi::HMAC_CTX,
-    }
-
-    impl HMAC_CTX {
-        pub fn new() -> HMAC_CTX {
-            unsafe {
-                let ctx = ffi::HMAC_CTX_new();
-                assert!(!ctx.is_null());
-                HMAC_CTX { ctx: ctx }
-            }
-        }
-
-        pub fn get(&self) -> *mut ffi::HMAC_CTX {
-            self.ctx
-        }
-    }
-
-    impl Drop for HMAC_CTX {
-        fn drop(&mut self) {
-            unsafe {
-                ffi::HMAC_CTX_free(self.ctx);
-            }
-        }
-    }
-}
-
-#[cfg(ossl10x)]
-#[allow(bad_style)]
-mod compat {
-    use std::mem;
-    use std::cell::UnsafeCell;
-
-    use ffi;
-
-    pub struct HMAC_CTX {
-        ctx: UnsafeCell<ffi::HMAC_CTX>,
-    }
-
-    impl HMAC_CTX {
-        pub fn new() -> HMAC_CTX {
-            unsafe {
-                let mut ctx = mem::zeroed();
-                ffi::HMAC_CTX_init(&mut ctx);
-                HMAC_CTX { ctx: UnsafeCell::new(ctx) }
-            }
-        }
-
-        pub fn get(&self) -> *mut ffi::HMAC_CTX {
-            self.ctx.get()
-        }
-    }
-
-    impl Drop for HMAC_CTX {
-        fn drop(&mut self) {
-            unsafe {
-                ffi::HMAC_CTX_cleanup(self.get());
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::iter::repeat;
-    use serialize::hex::FromHex;
-    use crypto::hash::Type;
-    use crypto::hash::Type::*;
-    use super::{hmac, HMAC};
-    use std::io::prelude::*;
-
-    fn test_hmac(ty: Type, tests: &[(Vec<u8>, Vec<u8>, Vec<u8>)]) {
-        for &(ref key, ref data, ref res) in tests.iter() {
-            assert_eq!(hmac(ty, &**key, &**data).unwrap(), *res);
-        }
-    }
-
-    fn test_hmac_recycle(h: &mut HMAC, test: &(Vec<u8>, Vec<u8>, Vec<u8>)) {
-        let &(_, ref data, ref res) = test;
-        h.write_all(&**data).unwrap();
-        assert_eq!(h.finish().unwrap(), *res);
-    }
-
-    #[test]
-    fn test_hmac_md5() {
-        // test vectors from RFC 2202
-        let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] =
-            [(repeat(0x0b_u8).take(16).collect(),
-              b"Hi There".to_vec(),
-              "9294727a3638bb1c13f48ef8158bfc9d".from_hex().unwrap()),
-             (b"Jefe".to_vec(),
-              b"what do ya want for nothing?".to_vec(),
-              "750c783e6ab0b503eaa86e310a5db738".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(16).collect(),
-              repeat(0xdd_u8).take(50).collect(),
-              "56be34521d144c88dbb8c733f0e8b3f6".from_hex().unwrap()),
-             ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
-              repeat(0xcd_u8).take(50).collect(),
-              "697eaf0aca3a3aea3a75164746ffaa79".from_hex().unwrap()),
-             (repeat(0x0c_u8).take(16).collect(),
-              b"Test With Truncation".to_vec(),
-              "56461ef2342edc00f9bab995690efd4c".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
-              "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key \
-               and Larger Than One Block-Size Data"
-                  .to_vec(),
-              "6f630fad67cda0ee1fb1f562db3aa53e".from_hex().unwrap())];
-
-        test_hmac(MD5, &tests);
-    }
-
-    #[test]
-    fn test_hmac_md5_recycle() {
-        let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 2] =
-            [(repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
-              "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key \
-               and Larger Than One Block-Size Data"
-                  .to_vec(),
-              "6f630fad67cda0ee1fb1f562db3aa53e".from_hex().unwrap())];
-
-        let mut h = HMAC::new(MD5, &*tests[0].0).unwrap();
-        for i in 0..100usize {
-            let test = &tests[i % 2];
-            test_hmac_recycle(&mut h, test);
-        }
-    }
-
-    #[test]
-    fn test_finish_twice() {
-        let test: (Vec<u8>, Vec<u8>, Vec<u8>) =
-            (repeat(0xaa_u8).take(80).collect(),
-             b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
-             "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap());
-
-        let mut h = HMAC::new(Type::MD5, &*test.0).unwrap();
-        h.write_all(&*test.1).unwrap();
-        h.finish().unwrap();
-        let res = h.finish().unwrap();
-        let null = hmac(Type::MD5, &*test.0, &[]).unwrap();
-        assert_eq!(res, null);
-    }
-
-    #[test]
-    fn test_clone() {
-        let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 2] =
-            [(repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
-              "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key \
-               and Larger Than One Block-Size Data"
-                  .to_vec(),
-              "6f630fad67cda0ee1fb1f562db3aa53e".from_hex().unwrap())];
-        let p = tests[0].0.len() / 2;
-        let h0 = HMAC::new(Type::MD5, &*tests[0].0).unwrap();
-
-        println!("Clone a new hmac");
-        let mut h1 = h0.clone();
-        h1.write_all(&tests[0].1[..p]).unwrap();
-        {
-            println!("Clone an updated hmac");
-            let mut h2 = h1.clone();
-            h2.write_all(&tests[0].1[p..]).unwrap();
-            let res = h2.finish().unwrap();
-            assert_eq!(res, tests[0].2);
-        }
-        h1.write_all(&tests[0].1[p..]).unwrap();
-        let res = h1.finish().unwrap();
-        assert_eq!(res, tests[0].2);
-
-        println!("Clone a finished hmac");
-        let mut h3 = h1.clone();
-        h3.write_all(&*tests[1].1).unwrap();
-        let res = h3.finish().unwrap();
-        assert_eq!(res, tests[1].2);
-    }
-
-    #[test]
-    fn test_hmac_sha1() {
-        // test vectors from RFC 2202
-        let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] =
-            [(repeat(0x0b_u8).take(20).collect(),
-              b"Hi There".to_vec(),
-              "b617318655057264e28bc0b6fb378c8ef146be00".from_hex().unwrap()),
-             (b"Jefe".to_vec(),
-              b"what do ya want for nothing?".to_vec(),
-              "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(20).collect(),
-              repeat(0xdd_u8).take(50).collect(),
-              "125d7342b9ac11cd91a39af48aa17b4f63f175d3".from_hex().unwrap()),
-             ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
-              repeat(0xcd_u8).take(50).collect(),
-              "4c9007f4026250c6bc8414f9bf50c86c2d7235da".from_hex().unwrap()),
-             (repeat(0x0c_u8).take(20).collect(),
-              b"Test With Truncation".to_vec(),
-              "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
-              "aa4ae5e15272d00e95705637ce8a3b55ed402112".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key \
-               and Larger Than One Block-Size Data"
-                  .to_vec(),
-              "e8e99d0f45237d786d6bbaa7965c7808bbff1a91".from_hex().unwrap())];
-
-        test_hmac(SHA1, &tests);
-    }
-
-    #[test]
-    fn test_hmac_sha1_recycle() {
-        let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 2] =
-            [(repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
-              "aa4ae5e15272d00e95705637ce8a3b55ed402112".from_hex().unwrap()),
-             (repeat(0xaa_u8).take(80).collect(),
-              b"Test Using Larger Than Block-Size Key \
-               and Larger Than One Block-Size Data"
-                  .to_vec(),
-              "e8e99d0f45237d786d6bbaa7965c7808bbff1a91".from_hex().unwrap())];
-
-        let mut h = HMAC::new(SHA1, &*tests[0].0).unwrap();
-        for i in 0..100usize {
-            let test = &tests[i % 2];
-            test_hmac_recycle(&mut h, test);
-        }
-    }
-
-
-
-    fn test_sha2(ty: Type, results: &[Vec<u8>]) {
-        // test vectors from RFC 4231
-        let tests: [(Vec<u8>, Vec<u8>); 6] =
-            [(repeat(0xb_u8).take(20).collect(), b"Hi There".to_vec()),
-             (b"Jefe".to_vec(), b"what do ya want for nothing?".to_vec()),
-             (repeat(0xaa_u8).take(20).collect(), repeat(0xdd_u8).take(50).collect()),
-             ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
-              repeat(0xcd_u8).take(50).collect()),
-             (repeat(0xaa_u8).take(131).collect(),
-              b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec()),
-             (repeat(0xaa_u8).take(131).collect(),
-              b"This is a test using a larger than block-size key and a \
-               larger than block-size data. The key needs to be hashed \
-               before being used by the HMAC algorithm."
-                  .to_vec())];
-
-        for (&(ref key, ref data), res) in tests.iter().zip(results.iter()) {
-            assert_eq!(hmac(ty, &**key, &**data).unwrap(), *res);
-        }
-
-        // recycle test
-        let mut h = HMAC::new(ty, &*tests[5].0).unwrap();
-        for i in 0..100usize {
-            let test = &tests[4 + i % 2];
-            let tup = (test.0.clone(), test.1.clone(), results[4 + i % 2].clone());
-            test_hmac_recycle(&mut h, &tup);
-        }
-    }
-
-    #[test]
-    fn test_hmac_sha224() {
-        let results = ["896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22"
-                           .from_hex()
-                           .unwrap(),
-                       "a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44"
-                           .from_hex()
-                           .unwrap(),
-                       "7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea"
-                           .from_hex()
-                           .unwrap(),
-                       "6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a"
-                           .from_hex()
-                           .unwrap(),
-                       "95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e"
-                           .from_hex()
-                           .unwrap(),
-                       "3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1"
-                           .from_hex()
-                           .unwrap()];
-        test_sha2(SHA224, &results);
-    }
-
-    #[test]
-    fn test_hmac_sha256() {
-        let results = ["b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7"
-                           .from_hex()
-                           .unwrap(),
-                       "5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843"
-                           .from_hex()
-                           .unwrap(),
-                       "773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe"
-                           .from_hex()
-                           .unwrap(),
-                       "82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b"
-                           .from_hex()
-                           .unwrap(),
-                       "60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54"
-                           .from_hex()
-                           .unwrap(),
-                       "9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2"
-                           .from_hex()
-                           .unwrap()];
-        test_sha2(SHA256, &results);
-    }
-
-    #[test]
-    fn test_hmac_sha384() {
-        let results = ["afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea90\
-                        76ede7f4af152e8b2fa9cb6"
-                           .from_hex()
-                           .unwrap(),
-                       "af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5\
-                        e69e2c78b3239ecfab21649"
-                           .from_hex()
-                           .unwrap(),
-                       "88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc\
-                        13814b94e3ab6e101a34f27"
-                           .from_hex()
-                           .unwrap(),
-                       "3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e1f573b4e6801dd23c\
-                        4a7d679ccf8a386c674cffb"
-                           .from_hex()
-                           .unwrap(),
-                       "4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4\
-                        030fe8296248df163f44952"
-                           .from_hex()
-                           .unwrap(),
-                       "6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e\
-                        799176d3860e6110c46523e"
-                           .from_hex()
-                           .unwrap()];
-        test_sha2(SHA384, &results);
-    }
-
-    #[test]
-    fn test_hmac_sha512() {
-        let results = ["87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d\
-                        6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854"
-                           .from_hex()
-                           .unwrap(),
-                       "164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c\
-                        05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737"
-                           .from_hex()
-                           .unwrap(),
-                       "fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e84827\
-                        9a722c806b485a47e67c807b946a337bee8942674278859e13292fb"
-                           .from_hex()
-                           .unwrap(),
-                       "b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11\
-                        aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd"
-                           .from_hex()
-                           .unwrap(),
-                       "80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e\
-                        05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598"
-                           .from_hex()
-                           .unwrap(),
-                       "e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3\
-                        c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58"
-                           .from_hex()
-                           .unwrap()];
-        test_sha2(SHA512, &results);
-    }
-}
diff --git a/openssl/src/crypto/mod.rs b/openssl/src/crypto/mod.rs
index 389b7cc9..0db23bcc 100644
--- a/openssl/src/crypto/mod.rs
+++ b/openssl/src/crypto/mod.rs
@@ -14,14 +14,15 @@
 // limitations under the License.
 //
 
+mod util;
+pub mod dsa;
 pub mod hash;
-pub mod hmac;
-pub mod pkcs5;
+pub mod memcmp;
 pub mod pkcs12;
+pub mod pkcs5;
 pub mod pkey;
 pub mod rand;
-pub mod symm;
-pub mod memcmp;
 pub mod rsa;
-pub mod dsa;
-mod util;
+pub mod sign;
+pub mod symm;
+
diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs
index a2a6f9c1..8b408d29 100644
--- a/openssl/src/crypto/pkey.rs
+++ b/openssl/src/crypto/pkey.rs
@@ -1,4 +1,4 @@
-use libc::{c_void, c_char};
+use libc::{c_void, c_char, c_int};
 use std::ptr;
 use std::mem;
 use ffi;
@@ -26,6 +26,18 @@ impl PKey {
         }
     }
 
+    /// Create a new `PKey` containing an HMAC key.
+    pub fn hmac(key: &[u8]) -> Result<PKey, ErrorStack> {
+        unsafe {
+            assert!(key.len() <= c_int::max_value() as usize);
+            let key = try_ssl_null!(ffi::EVP_PKEY_new_mac_key(ffi::EVP_PKEY_HMAC,
+                                                              ptr::null_mut(),
+                                                              key.as_ptr() as *const _,
+                                                              key.len() as c_int));
+            Ok(PKey(key))
+        }
+    }
+
     pub unsafe fn from_ptr(handle: *mut ffi::EVP_PKEY) -> PKey {
         PKey(handle)
     }
diff --git a/openssl/src/crypto/rsa.rs b/openssl/src/crypto/rsa.rs
index f91f39fb..eebb9622 100644
--- a/openssl/src/crypto/rsa.rs
+++ b/openssl/src/crypto/rsa.rs
@@ -7,8 +7,6 @@ use libc::{c_int, c_void, c_char};
 use bn::{BigNum, BigNumRef};
 use bio::{MemBio, MemBioSlice};
 use error::ErrorStack;
-use HashTypeInternals;
-use crypto::hash;
 use crypto::util::{CallbackState, invoke_passwd_cb};
 
 /// Type of encryption padding to use.
@@ -248,36 +246,6 @@ impl RSA {
         }
     }
 
-     pub fn sign(&self, hash: hash::Type, message: &[u8]) -> Result<Vec<u8>, ErrorStack> {
-        assert!(self.d().is_some(), "private components missing");
-        let k_len = self.size().expect("RSA missing an n");
-        let mut sig = vec![0; k_len as usize];
-        let mut sig_len = k_len;
-
-        unsafe {
-            try_ssl!(ffi::RSA_sign(hash.as_nid() as c_int,
-                                   message.as_ptr(),
-                                   message.len() as u32,
-                                   sig.as_mut_ptr(),
-                                   &mut sig_len,
-                                   self.0));
-            assert!(sig_len == k_len);
-            Ok(sig)
-        }
-    }
-
-    pub fn verify(&self, hash: hash::Type, message: &[u8], sig: &[u8]) -> Result<(), ErrorStack> {
-        unsafe {
-            try_ssl!(ffi::RSA_verify(hash.as_nid() as c_int,
-                                     message.as_ptr(),
-                                     message.len() as u32,
-                                     sig.as_ptr(),
-                                     sig.len() as u32,
-                                     self.0));
-        }
-        Ok(())
-    }
-
     pub fn as_ptr(&self) -> *mut ffi::RSA {
         self.0
     }
@@ -429,63 +397,9 @@ mod compat {
 
 #[cfg(test)]
 mod test {
-    use std::io::Write;
     use libc::c_char;
 
     use super::*;
-    use crypto::hash::*;
-
-    fn signing_input_rs256() -> Vec<u8> {
-        vec![101, 121, 74, 104, 98, 71, 99, 105, 79, 105, 74, 83, 85, 122, 73, 49, 78, 105, 74, 57,
-             46, 101, 121, 74, 112, 99, 51, 77, 105, 79, 105, 74, 113, 98, 50, 85, 105, 76, 65, 48,
-             75, 73, 67, 74, 108, 101, 72, 65, 105, 79, 106, 69, 122, 77, 68, 65, 52, 77, 84, 107,
-             122, 79, 68, 65, 115, 68, 81, 111, 103, 73, 109, 104, 48, 100, 72, 65, 54, 76, 121,
-             57, 108, 101, 71, 70, 116, 99, 71, 120, 108, 76, 109, 78, 118, 98, 83, 57, 112, 99,
-             49, 57, 121, 98, 50, 57, 48, 73, 106, 112, 48, 99, 110, 86, 108, 102, 81]
-    }
-
-    fn signature_rs256() -> Vec<u8> {
-        vec![112, 46, 33, 137, 67, 232, 143, 209, 30, 181, 216, 45, 191, 120, 69, 243, 65, 6, 174,
-             27, 129, 255, 247, 115, 17, 22, 173, 209, 113, 125, 131, 101, 109, 66, 10, 253, 60,
-             150, 238, 221, 115, 162, 102, 62, 81, 102, 104, 123, 0, 11, 135, 34, 110, 1, 135, 237,
-             16, 115, 249, 69, 229, 130, 173, 252, 239, 22, 216, 90, 121, 142, 232, 198, 109, 219,
-             61, 184, 151, 91, 23, 208, 148, 2, 190, 237, 213, 217, 217, 112, 7, 16, 141, 178, 129,
-             96, 213, 248, 4, 12, 167, 68, 87, 98, 184, 31, 190, 127, 249, 217, 46, 10, 231, 111,
-             36, 242, 91, 51, 187, 230, 244, 74, 230, 30, 177, 4, 10, 203, 32, 4, 77, 62, 249, 18,
-             142, 212, 1, 48, 121, 91, 212, 189, 59, 65, 238, 202, 208, 102, 171, 101, 25, 129,
-             253, 228, 141, 247, 127, 55, 45, 195, 139, 159, 175, 221, 59, 239, 177, 139, 93, 163,
-             204, 60, 46, 176, 47, 158, 58, 65, 214, 18, 202, 173, 21, 145, 18, 115, 160, 95, 35,
-             185, 232, 56, 250, 175, 132, 157, 105, 132, 41, 239, 90, 30, 136, 121, 130, 54, 195,
-             212, 14, 96, 69, 34, 165, 68, 200, 242, 122, 122, 45, 184, 6, 99, 209, 108, 247, 202,
-             234, 86, 222, 64, 92, 178, 33, 90, 69, 178, 194, 85, 102, 181, 90, 193, 167, 72, 160,
-             112, 223, 200, 163, 42, 70, 149, 67, 208, 25, 238, 251, 71]
-    }
-
-    #[test]
-    pub fn test_sign() {
-        let key = include_bytes!("../../test/rsa.pem");
-        let private_key = RSA::private_key_from_pem(key).unwrap();
-
-        let mut sha = Hasher::new(Type::SHA256).unwrap();
-        sha.write_all(&signing_input_rs256()).unwrap();
-        let digest = sha.finish().unwrap();
-
-        let result = private_key.sign(Type::SHA256, &digest).unwrap();
-
-        assert_eq!(result, signature_rs256());
-    }
-
-    #[test]
-    pub fn test_verify() {
-        let key = include_bytes!("../../test/rsa.pem.pub");
-        let public_key = RSA::public_key_from_pem(key).unwrap();
-
-        let mut sha = Hasher::new(Type::SHA256).unwrap();
-        sha.write_all(&signing_input_rs256()).unwrap();
-        let digest = sha.finish().unwrap();
-
-        assert!(public_key.verify(Type::SHA256, &digest, &signature_rs256()).is_ok());
-    }
 
     #[test]
     pub fn test_password() {
diff --git a/openssl/src/crypto/sign.rs b/openssl/src/crypto/sign.rs
new file mode 100644
index 00000000..c5d54597
--- /dev/null
+++ b/openssl/src/crypto/sign.rs
@@ -0,0 +1,348 @@
+//! Message signatures.
+//!
+//! The `Signer` allows for the computation of cryptographic signatures of
+//! data given a private key. The `Verifier` can then be used with the
+//! corresponding public key to verify the integrity and authenticity of that
+//! data given the signature.
+//!
+//! # Examples
+//!
+//! Sign and verify data given an RSA keypair:
+//!
+//! ```rust
+//! use openssl::crypto::sign::{Signer, Verifier};
+//! use openssl::crypto::rsa::RSA;
+//! use openssl::crypto::pkey::PKey;
+//! use openssl::crypto::hash::Type;
+//!
+//! // Generate a keypair
+//! let keypair = RSA::generate(2048).unwrap();
+//! let keypair = PKey::from_rsa(keypair).unwrap();
+//!
+//! let data = b"hello, world!";
+//! let data2 = b"hola, mundo!";
+//!
+//! // Sign the data
+//! let mut signer = Signer::new(Type::SHA256, &keypair).unwrap();
+//! signer.update(data).unwrap();
+//! signer.update(data2).unwrap();
+//! let signature = signer.finish().unwrap();
+//!
+//! // Verify the data
+//! let mut verifier = Verifier::new(Type::SHA256, &keypair).unwrap();
+//! verifier.update(data).unwrap();
+//! verifier.update(data2).unwrap();
+//! assert!(verifier.finish(&signature).unwrap());
+//! ```
+//!
+//! Compute an HMAC (note that `Verifier` cannot be used with HMACs):
+//!
+//! ```rust
+//! use openssl::crypto::sign::Signer;
+//! use openssl::crypto::pkey::PKey;
+//! use openssl::crypto::hash::Type;
+//!
+//! // Create a PKey
+//! let key = PKey::hmac(b"my secret").unwrap();
+//!
+//! let data = b"hello, world!";
+//! let data2 = b"hola, mundo!";
+//!
+//! // Compute the HMAC
+//! let mut signer = Signer::new(Type::SHA256, &key).unwrap();
+//! signer.update(data).unwrap();
+//! signer.update(data2).unwrap();
+//! let hmac = signer.finish().unwrap();
+//! ```
+use ffi;
+use std::io::{self, Write};
+use std::marker::PhantomData;
+use std::ptr;
+
+use HashTypeInternals;
+use crypto::hash::Type;
+use crypto::pkey::PKey;
+use error::ErrorStack;
+
+#[cfg(ossl110)]
+use ffi::{EVP_MD_CTX_new, EVP_MD_CTX_free};
+#[cfg(any(ossl101, ossl102))]
+use ffi::{EVP_MD_CTX_create as EVP_MD_CTX_new, EVP_MD_CTX_destroy as EVP_MD_CTX_free};
+
+pub struct Signer<'a>(*mut ffi::EVP_MD_CTX, PhantomData<&'a PKey>);
+
+impl<'a> Drop for Signer<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            EVP_MD_CTX_free(self.0);
+        }
+    }
+}
+
+impl<'a> Signer<'a> {
+    pub fn new(type_: Type, pkey: &'a PKey) -> Result<Signer<'a>, ErrorStack> {
+        unsafe {
+            ffi::init();
+
+            let ctx = try_ssl_null!(EVP_MD_CTX_new());
+            let r = ffi::EVP_DigestSignInit(ctx,
+                                            ptr::null_mut(),
+                                            type_.evp_md(),
+                                            ptr::null_mut(),
+                                            pkey.as_ptr());
+            if r != 1 {
+                EVP_MD_CTX_free(ctx);
+                return Err(ErrorStack::get());
+            }
+
+            Ok(Signer(ctx, PhantomData))
+        }
+    }
+
+    pub fn update(&mut self, buf: &[u8]) -> Result<(), ErrorStack> {
+        unsafe {
+            try_ssl_if!(ffi::EVP_DigestUpdate(self.0, buf.as_ptr() as *const _, buf.len()) != 1);
+            Ok(())
+        }
+    }
+
+    pub fn finish(&self) -> Result<Vec<u8>, ErrorStack> {
+        unsafe {
+            let mut len = 0;
+            try_ssl_if!(ffi::EVP_DigestSignFinal(self.0, ptr::null_mut(), &mut len) != 1);
+            let mut buf = vec![0; len];
+            try_ssl_if!(ffi::EVP_DigestSignFinal(self.0, buf.as_mut_ptr() as *mut _, &mut len)
+                    != 1);
+            Ok(buf)
+        }
+    }
+}
+
+impl<'a> Write for Signer<'a> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        try!(self.update(buf));
+        Ok(buf.len())
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+pub struct Verifier<'a>(*mut ffi::EVP_MD_CTX, PhantomData<&'a PKey>);
+
+impl<'a> Drop for Verifier<'a> {
+    fn drop(&mut self) {
+        unsafe {
+            EVP_MD_CTX_free(self.0);
+        }
+    }
+}
+
+impl<'a> Verifier<'a> {
+    pub fn new(type_: Type, pkey: &'a PKey) -> Result<Verifier<'a>, ErrorStack> {
+        unsafe {
+            ffi::init();
+
+            let ctx = try_ssl_null!(EVP_MD_CTX_new());
+            let r = ffi::EVP_DigestVerifyInit(ctx,
+                                              ptr::null_mut(),
+                                              type_.evp_md(),
+                                              ptr::null_mut(),
+                                              pkey.as_ptr());
+            if r != 1 {
+                EVP_MD_CTX_free(ctx);
+                return Err(ErrorStack::get());
+            }
+
+            Ok(Verifier(ctx, PhantomData))
+        }
+    }
+
+    pub fn update(&mut self, buf: &[u8]) -> Result<(), ErrorStack> {
+        unsafe {
+            try_ssl_if!(ffi::EVP_DigestUpdate(self.0, buf.as_ptr() as *const _, buf.len()) != 1);
+            Ok(())
+        }
+    }
+
+    pub fn finish(&self, signature: &[u8]) -> Result<bool, ErrorStack> {
+        unsafe {
+            let r = EVP_DigestVerifyFinal(self.0,
+                                          signature.as_ptr() as *const _,
+                                          signature.len());
+            match r {
+                1 => Ok(true),
+                0 => {
+                    ErrorStack::get(); // discard error stack
+                    Ok(false)
+                }
+                _ => Err(ErrorStack::get()),
+            }
+        }
+    }
+}
+
+impl<'a> Write for Verifier<'a> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        try!(self.update(buf));
+        Ok(buf.len())
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+#[cfg(not(ossl101))]
+use ffi::EVP_DigestVerifyFinal;
+
+#[cfg(ossl101)]
+#[allow(bad_style)]
+unsafe fn EVP_DigestVerifyFinal(ctx: *mut ffi::EVP_MD_CTX,
+                                sigret: *const ::libc::c_uchar,
+                                siglen: ::libc::size_t) -> ::libc::c_int {
+    ffi::EVP_DigestVerifyFinal(ctx, sigret as *mut _, siglen)
+}
+
+#[cfg(test)]
+mod test {
+    use serialize::hex::FromHex;
+    use std::iter;
+
+    use crypto::hash::Type;
+    use crypto::sign::{Signer, Verifier};
+    use crypto::rsa::RSA;
+    use crypto::pkey::PKey;
+
+    static INPUT: &'static [u8] =
+        &[101, 121, 74, 104, 98, 71, 99, 105, 79, 105, 74, 83, 85, 122, 73, 49, 78, 105, 74, 57,
+             46, 101, 121, 74, 112, 99, 51, 77, 105, 79, 105, 74, 113, 98, 50, 85, 105, 76, 65, 48,
+             75, 73, 67, 74, 108, 101, 72, 65, 105, 79, 106, 69, 122, 77, 68, 65, 52, 77, 84, 107,
+             122, 79, 68, 65, 115, 68, 81, 111, 103, 73, 109, 104, 48, 100, 72, 65, 54, 76, 121,
+             57, 108, 101, 71, 70, 116, 99, 71, 120, 108, 76, 109, 78, 118, 98, 83, 57, 112, 99,
+             49, 57, 121, 98, 50, 57, 48, 73, 106, 112, 48, 99, 110, 86, 108, 102, 81];
+
+    static SIGNATURE: &'static [u8] =
+        &[112, 46, 33, 137, 67, 232, 143, 209, 30, 181, 216, 45, 191, 120, 69, 243, 65, 6, 174,
+             27, 129, 255, 247, 115, 17, 22, 173, 209, 113, 125, 131, 101, 109, 66, 10, 253, 60,
+             150, 238, 221, 115, 162, 102, 62, 81, 102, 104, 123, 0, 11, 135, 34, 110, 1, 135, 237,
+             16, 115, 249, 69, 229, 130, 173, 252, 239, 22, 216, 90, 121, 142, 232, 198, 109, 219,
+             61, 184, 151, 91, 23, 208, 148, 2, 190, 237, 213, 217, 217, 112, 7, 16, 141, 178, 129,
+             96, 213, 248, 4, 12, 167, 68, 87, 98, 184, 31, 190, 127, 249, 217, 46, 10, 231, 111,
+             36, 242, 91, 51, 187, 230, 244, 74, 230, 30, 177, 4, 10, 203, 32, 4, 77, 62, 249, 18,
+             142, 212, 1, 48, 121, 91, 212, 189, 59, 65, 238, 202, 208, 102, 171, 101, 25, 129,
+             253, 228, 141, 247, 127, 55, 45, 195, 139, 159, 175, 221, 59, 239, 177, 139, 93, 163,
+             204, 60, 46, 176, 47, 158, 58, 65, 214, 18, 202, 173, 21, 145, 18, 115, 160, 95, 35,
+             185, 232, 56, 250, 175, 132, 157, 105, 132, 41, 239, 90, 30, 136, 121, 130, 54, 195,
+             212, 14, 96, 69, 34, 165, 68, 200, 242, 122, 122, 45, 184, 6, 99, 209, 108, 247, 202,
+             234, 86, 222, 64, 92, 178, 33, 90, 69, 178, 194, 85, 102, 181, 90, 193, 167, 72, 160,
+             112, 223, 200, 163, 42, 70, 149, 67, 208, 25, 238, 251, 71];
+
+    #[test]
+    fn test_sign() {
+        let key = include_bytes!("../../test/rsa.pem");
+        let private_key = RSA::private_key_from_pem(key).unwrap();
+        let pkey = PKey::from_rsa(private_key).unwrap();
+
+        let mut signer = Signer::new(Type::SHA256, &pkey).unwrap();
+        signer.update(INPUT).unwrap();
+        let result = signer.finish().unwrap();
+
+        assert_eq!(result, SIGNATURE);
+    }
+
+    #[test]
+    fn test_verify_ok() {
+        let key = include_bytes!("../../test/rsa.pem");
+        let private_key = RSA::private_key_from_pem(key).unwrap();
+        let pkey = PKey::from_rsa(private_key).unwrap();
+
+        let mut verifier = Verifier::new(Type::SHA256, &pkey).unwrap();
+        verifier.update(INPUT).unwrap();
+        assert!(verifier.finish(SIGNATURE).unwrap());
+    }
+
+    #[test]
+    fn test_verify_invalid() {
+        let key = include_bytes!("../../test/rsa.pem");
+        let private_key = RSA::private_key_from_pem(key).unwrap();
+        let pkey = PKey::from_rsa(private_key).unwrap();
+
+        let mut verifier = Verifier::new(Type::SHA256, &pkey).unwrap();
+        verifier.update(INPUT).unwrap();
+        verifier.update(b"foobar").unwrap();
+        assert!(!verifier.finish(SIGNATURE).unwrap());
+    }
+
+    fn test_hmac(ty: Type, tests: &[(Vec<u8>, Vec<u8>, Vec<u8>)]) {
+        for &(ref key, ref data, ref res) in tests.iter() {
+            let pkey = PKey::hmac(key).unwrap();
+            let mut signer = Signer::new(ty, &pkey).unwrap();
+            signer.update(data).unwrap();
+            assert_eq!(signer.finish().unwrap(), *res);
+        }
+    }
+
+    #[test]
+    fn hmac_md5() {
+        // test vectors from RFC 2202
+        let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] =
+        [(iter::repeat(0x0b_u8).take(16).collect(),
+          b"Hi There".to_vec(),
+          "9294727a3638bb1c13f48ef8158bfc9d".from_hex().unwrap()),
+            (b"Jefe".to_vec(),
+             b"what do ya want for nothing?".to_vec(),
+             "750c783e6ab0b503eaa86e310a5db738".from_hex().unwrap()),
+            (iter::repeat(0xaa_u8).take(16).collect(),
+             iter::repeat(0xdd_u8).take(50).collect(),
+             "56be34521d144c88dbb8c733f0e8b3f6".from_hex().unwrap()),
+            ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
+             iter::repeat(0xcd_u8).take(50).collect(),
+             "697eaf0aca3a3aea3a75164746ffaa79".from_hex().unwrap()),
+            (iter::repeat(0x0c_u8).take(16).collect(),
+             b"Test With Truncation".to_vec(),
+             "56461ef2342edc00f9bab995690efd4c".from_hex().unwrap()),
+            (iter::repeat(0xaa_u8).take(80).collect(),
+             b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
+             "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd".from_hex().unwrap()),
+            (iter::repeat(0xaa_u8).take(80).collect(),
+             b"Test Using Larger Than Block-Size Key \
+              and Larger Than One Block-Size Data"
+                 .to_vec(),
+             "6f630fad67cda0ee1fb1f562db3aa53e".from_hex().unwrap())];
+
+        test_hmac(Type::MD5, &tests);
+    }
+
+    #[test]
+    fn hmac_sha1() {
+        // test vectors from RFC 2202
+        let tests: [(Vec<u8>, Vec<u8>, Vec<u8>); 7] =
+        [(iter::repeat(0x0b_u8).take(20).collect(),
+          b"Hi There".to_vec(),
+          "b617318655057264e28bc0b6fb378c8ef146be00".from_hex().unwrap()),
+            (b"Jefe".to_vec(),
+             b"what do ya want for nothing?".to_vec(),
+             "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79".from_hex().unwrap()),
+            (iter::repeat(0xaa_u8).take(20).collect(),
+             iter::repeat(0xdd_u8).take(50).collect(),
+             "125d7342b9ac11cd91a39af48aa17b4f63f175d3".from_hex().unwrap()),
+            ("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
+             iter::repeat(0xcd_u8).take(50).collect(),
+             "4c9007f4026250c6bc8414f9bf50c86c2d7235da".from_hex().unwrap()),
+            (iter::repeat(0x0c_u8).take(20).collect(),
+             b"Test With Truncation".to_vec(),
+             "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04".from_hex().unwrap()),
+            (iter::repeat(0xaa_u8).take(80).collect(),
+             b"Test Using Larger Than Block-Size Key - Hash Key First".to_vec(),
+             "aa4ae5e15272d00e95705637ce8a3b55ed402112".from_hex().unwrap()),
+            (iter::repeat(0xaa_u8).take(80).collect(),
+             b"Test Using Larger Than Block-Size Key \
+              and Larger Than One Block-Size Data"
+                 .to_vec(),
+             "e8e99d0f45237d786d6bbaa7965c7808bbff1a91".from_hex().unwrap())];
+
+        test_hmac(Type::SHA1, &tests);
+    }
+}