change api.supports_hash to take a hash class rather than a str

* This change means hash class names will be byte strings and we no
  longer need to encode to ascii on hashobject.name in
  create_hash_context

2 files changed, 4 insertions, 4 deletions

diff --git a/cryptography/bindings/openssl/api.py b/cryptography/bindings/openssl/api.py
index 548a9e66..84458367 100644
--- a/cryptography/bindings/openssl/api.py
+++ b/cryptography/bindings/openssl/api.py
@@ -139,14 +139,14 @@ class API(object):
         assert res != 0
         return self.ffi.buffer(buf)[:outlen[0]]
 
-    def supports_hash(self, hashname):
+    def supports_hash(self, hash_cls):
         return (self.ffi.NULL !=
-                self.lib.EVP_get_digestbyname(hashname.encode("ascii")))
+                self.lib.EVP_get_digestbyname(hash_cls.name))
 
     def create_hash_context(self, hashobject):
         ctx = self.lib.EVP_MD_CTX_create()
         ctx = self.ffi.gc(ctx, self.lib.EVP_MD_CTX_destroy)
-        evp_md = self.lib.EVP_get_digestbyname(hashobject.name.encode("ascii"))
+        evp_md = self.lib.EVP_get_digestbyname(hashobject.name)
         assert evp_md != self.ffi.NULL
         res = self.lib.EVP_DigestInit_ex(ctx, evp_md, self.ffi.NULL)
         assert res != 0
diff --git a/cryptography/primitives/hashes.py b/cryptography/primitives/hashes.py
index d74287f9..f5cf135a 100644
--- a/cryptography/primitives/hashes.py
+++ b/cryptography/primitives/hashes.py
@@ -43,6 +43,6 @@ class BaseHash(object):
 
 
 class SHA1(BaseHash):
-    name = "sha1"
+    name = b"sha1"
     digest_size = 20
     block_size = 64