summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Crypto/SelfTest/Signature/test_pkcs1_15.py4
-rw-r--r--lib/Crypto/Util/py3compat.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py b/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py
index cc94262..c2d60f8 100644
--- a/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py
+++ b/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py
@@ -165,7 +165,7 @@ class PKCS1_15_Tests(unittest.TestCase):
# Data to sign can either be in hex form or not
try:
h.update(t2b(row[1]))
- except:
+ except ValueError:
h.update(b(row[1]))
# The real test
signer = PKCS.new(key)
@@ -186,7 +186,7 @@ class PKCS1_15_Tests(unittest.TestCase):
# Data to sign can either be in hex form or not
try:
h.update(t2b(row[1]))
- except:
+ except ValueError:
h.update(b(row[1]))
# The real test
verifier = PKCS.new(key)
diff --git a/lib/Crypto/Util/py3compat.py b/lib/Crypto/Util/py3compat.py
index b8b89bf..1ab2206 100644
--- a/lib/Crypto/Util/py3compat.py
+++ b/lib/Crypto/Util/py3compat.py
@@ -75,7 +75,7 @@ if sys.version_info[0] == 2:
def tobytes(s):
try:
return s.encode('latin-1')
- except:
+ except UnicodeError:
return ''.join(s)
def tostr(bs):
return unicode(bs, 'latin-1')