commit 3b7730cf90c6a5114391d2d5a2ccc1cdb448da9e
author Paul Kehrer <paul.l.kehrer@gmail.com> Fri Oct 18 20:59:25 2013 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Fri Oct 18 20:59:25 2013 -0500
tree f0dde11f18ffa325f1c6a6cadca433a8c30c4199
parent ba3b471e4b0f56e65acdb9d5daf64eb726d9c371

change name to str

cryptography/bindings/openssl/api.py

diff --git a/cryptography/bindings/openssl/api.py b/cryptography/bindings/openssl/api.py
index 8445836..cf3389d 100644
--- a/cryptography/bindings/openssl/api.py
+++ b/cryptography/bindings/openssl/api.py
@@ -141,12 +141,12 @@
 
     def supports_hash(self, hash_cls):
         return (self.ffi.NULL !=
-                self.lib.EVP_get_digestbyname(hash_cls.name))
+                self.lib.EVP_get_digestbyname(hash_cls.name.encode("ascii")))
 
     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)
+        evp_md = self.lib.EVP_get_digestbyname(hashobject.name.encode("ascii"))
         assert evp_md != self.ffi.NULL
         res = self.lib.EVP_DigestInit_ex(ctx, evp_md, self.ffi.NULL)
         assert res != 0

cryptography/primitives/hashes.py

diff --git a/cryptography/primitives/hashes.py b/cryptography/primitives/hashes.py
index f5cf135..d74287f 100644
--- a/cryptography/primitives/hashes.py
+++ b/cryptography/primitives/hashes.py
@@ -43,6 +43,6 @@
 
 
 class SHA1(BaseHash):
-    name = b"sha1"
+    name = "sha1"
     digest_size = 20
     block_size = 64