Ticket #9: aes-exception.diff

pycryptopp/cipher/aesmodule.cpp

@@ -116 +116 @@
     } catch (CryptoPP::InvalidKeyLength le) {
         PyErr_Format(aes_error, "Precondition violation: you are required to pass a valid key size.  Crypto++ gave this exception: %s", le.what());
         return -1;
+    } catch (const std::exception& e) {
+        PyErr_Format(aes_error, "Crypto++ exception: %s", e.what());
+        return -1;
     }
     if (!reinterpret_cast<AES*>(self)->e) {
         PyErr_NoMemory();

pycryptopp/test/test_aes.py

@@ -54 +54 @@
         ct = cryptor.process("\x00"*16)
         self.failUnlessEqual(self.enc0, b2a_hex(ct))
 
+    def failUnlessRaises2(self, excClass, callableObj, *args, **kwargs):
+        # like TestCase.failUnlessRaises, but return the exception object
+        try:
+            callableObj(*args, **kwargs)
+        except excClass, e:
+            return e
+        else:
+            if hasattr(excClass,'__name__'): excName = excClass.__name__
+            else: excName = str(excClass)
+            raise self.failureException, "%s not raised" % excName
+
     def test_init_type_check(self):
-        self.failUnlessRaises(TypeError, aes.AES, None)
-        self.failUnlessRaises(aes.Error, aes.AES, "a") # too short
+        e = self.failUnlessRaises2(TypeError, aes.AES, None)
+        self.failUnless("AES.__init__() argument 1 must be string or read-only character buffer, not None" in str(e), str(e))
+        e = self.failUnlessRaises2(aes.Error, aes.AES, "a") # too short
+        self.failUnless("Crypto++ exception: AES/CTR: 1 is not a valid key length" in str(e), str(e))
 
     def test_encrypt_zeroes_in_two_parts(self):
         cryptor = aes.AES(key="\x00"*16)