make generated RSA keys have the d property too

Author: tomato42

tlslite/utils/compat.py

@@ -38,6 +38,10 @@ def compatAscii2Bytes(val):
             return bytes(val, 'ascii')
         return val
 
+    def compat_b2a(val):
+        """Convert an ASCII bytes string to string."""
+        return str(val, 'ascii')
+
     def raw_input(s):
         return input(s)
 
@@ -141,6 +145,10 @@ def compatAscii2Bytes(val):
         """Convert ASCII string to bytes."""
         return val
 
+    def compat_b2a(val):
+        """Convert an ASCII bytes string to string."""
+        return str(val)
+
     # So, python 2.6 requires strings, python 3 requires 'bytes',
     # and python 2.7 can handle bytearrays...     
     def compatHMAC(x): return compat26Str(x)

tlslite/utils/openssl_rsakey.py

@@ -7,8 +7,7 @@
 
 from .rsakey import *
 from .python_rsakey import Python_RSAKey
-from .compat import compatAscii2Bytes
-import sys
+from .compat import compatAscii2Bytes, compat_b2a
 
 #copied from M2Crypto.util.py, so when we load the local copy of m2
 #we can still use it
@@ -119,6 +118,9 @@ def f():pass
             key.rsa = m2.rsa_generate_key(bits, 3, f)
             key._hasPrivateKey = True
             key.key_type = key_type
+            b64_key = compat_b2a(key.write())
+            py_key = Python_RSAKey.parsePEM(b64_key)
+            key.d = py_key.d
             return key
 
         @staticmethod
@@ -171,10 +173,7 @@ def f():pass
                     else:
                         raise SyntaxError()
                     if key._hasPrivateKey:
-                        if sys.version_info < (3, 0):
-                            b64_key = str(key.write())
-                        else:
-                            b64_key = str(key.write(), "ascii")
+                        b64_key = compat_b2a(key.write())
                         py_key = Python_RSAKey.parsePEM(b64_key)
                         key.d = py_key.d
                     return key

unit_tests/test_tlslite_utils_rsakey.py

@@ -13,7 +13,7 @@
 from tlslite.utils.python_rsakey import Python_RSAKey
 from tlslite.utils.cryptomath import *
 from tlslite.errors import *
-from tlslite.utils.keyfactory import parsePEMKey
+from tlslite.utils.keyfactory import parsePEMKey, generateRSAKey
 from tlslite.utils.compat import a2b_hex, remove_whitespace
 try:
     import mock
@@ -1229,6 +1229,7 @@ def m(leght):
             signed = self.rsa.RSASSA_PSS_sign(mHash, 'sha512', 10)
             self.assertEqual(signed, intendedS)
 
+
 class TestEncryptDecrypt(unittest.TestCase):
     n = int("a8d68acd413c5e195d5ef04e1b4faaf242365cb450196755e92e1215ba59802aa"
             "fbadbf2564dd550956abb54f8b1c917844e5f36195d1088c600e07cada5c080ed"
@@ -1267,6 +1268,12 @@ def test_invalid_init(self):
         with self.assertRaises(ValueError):
             Python_RSAKey(self.n, self.e, self.d, self.p)
 
+    def test_with_generated_key(self):
+        key = generateRSAKey(1024)
+
+        txt = bytearray(b"test string")
+        self.assertEqual(txt, key.decrypt(key.encrypt(txt)))
+
 
 class TestRSAPKCS1(unittest.TestCase):
     n = int("a8d68acd413c5e195d5ef04e1b4faaf242365cb450196755e92e1215ba59802aa"