fixup hmac constructors

Author: Synss

mbedtls/hmac.pyx

@@ -70,45 +70,45 @@ def new(key, buffer=None, digestmod=None):
 
 def md2(key, buffer=None):
     """MD2 message-digest algorithm."""
-    return Hash(key, buffer, digestmod="md2")
+    return Hmac(key, "md2", buffer)
 
 
 def md4(key, buffer=None):
     """MD4 message-digest algorithm."""
-    return Hash(key, buffer, digestmod="md4")
+    return Hmac(key, "md4", buffer)
 
 
 def md5(key, buffer=None):
     """MD5 message-digest algorithm."""
-    return Hash(key, buffer, digestmod="md5")
+    return Hmac(key, "md5", buffer)
 
 
 def sha1(key, buffer=None):
-    """Secure Hash Algorithm 1 (SHA-1)."""
-    return Hash(key, buffer, digestmod="sha1")
+    """Secure Hmac Algorithm 1 (SHA-1)."""
+    return Hmac(key, "sha1", buffer)
 
 
 def sha224(key, buffer=None):
-    """Secure Hash Algorithm 2 (SHA-2) with 224 bits hash value."""
-    return Hash(key, buffer, digestmod="sha224")
+    """Secure Hmac Algorithm 2 (SHA-2) with 224 bits hash value."""
+    return Hmac(key, "sha224", buffer)
 
 
 def sha256(key, buffer=None):
-    """Secure Hash Algorithm 2 (SHA-2) with 256 bits hash value."""
-    return Hash(key, buffer, digestmod="sha256")
+    """Secure Hmac Algorithm 2 (SHA-2) with 256 bits hash value."""
+    return Hmac(key, "sha256", buffer)
 
 
 def sha384(key, buffer=None):
-    """Secure Hash Algorithm 2 (SHA-2) with 384 bits hash value."""
-    return Hash(key, buffer, digestmod="sha384")
+    """Secure Hmac Algorithm 2 (SHA-2) with 384 bits hash value."""
+    return Hmac(key, "sha384", buffer)
 
 
 def sha512(key, buffer=None):
-    """Secure Hash Algorithm 2 (SHA-2) with 512 bits hash value."""
-    return Hash(key, buffer, digestmod="sha512")
+    """Secure Hmac Algorithm 2 (SHA-2) with 512 bits hash value."""
+    return Hmac(key, "sha512", buffer)
 
 
 def ripemd160(key, buffer=None):
     """RACE Integrity Primitives Evaluation Message Digest (RIPEMD) with
     160 bits hash value."""
-    return Hash(key, buffer, digestmod="ripemd160")
+    return Hmac(key, "ripemd160", buffer)

tests/test_md.py

@@ -127,7 +127,7 @@ def test_check_against_hmac_buf():
         yield test
 
 
-def test_instantiation():
+def test_hash_instantiation():
     import inspect
 
     def check_instantiation(fun, name):
@@ -139,5 +139,22 @@ def check_instantiation(fun, name):
     for name, member in inspect.getmembers(md_hash):
         if name in md_hash.algorithms_available:
             test = partial(check_instantiation, member, name)
-            test.description = "check_instantiation(%s)" % name
+            test.description = "check_hash_instantiation(%s)" % name
+            yield test
+
+
+def test_hmac_instantiation():
+    import inspect
+
+    def check_instantiation(fun, name):
+        key = _rnd(16)
+        alg1 = fun(key)
+        alg2 = md_hmac.new(key, digestmod=name)
+        assert_equal(type(alg1), type(alg2))
+        assert_equal(alg1.name, alg2.name)
+
+    for name, member in inspect.getmembers(md_hmac):
+        if name in md_hmac.algorithms_available:
+            test = partial(check_instantiation, member, name)
+            test.description = "check_hmac_instantiation(%s)" % name
             yield test