summaryrefslogtreecommitdiff
path: root/rsa/key.py
diff options
context:
space:
mode:
authorYesudeep Mangalapilly <yesudeep@gmail.com>2011-08-11 02:38:13 +0530
committerYesudeep Mangalapilly <yesudeep@gmail.com>2011-08-11 02:38:13 +0530
commite97d0d730367ad3b49efc712c01509500939c904 (patch)
treed780c2c3d49075c3c26ce587c17e5b1c9921f5b0 /rsa/key.py
parentaed6e8657bc316ccd6964a33c04bd650e9951ae2 (diff)
downloadrsa-git-e97d0d730367ad3b49efc712c01509500939c904.tar.gz
Porting to Python 3 complete. All tests except pyasn1 stuff pass.
Diffstat (limited to 'rsa/key.py')
-rw-r--r--rsa/key.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/rsa/key.py b/rsa/key.py
index 17bf69e..facde8e 100644
--- a/rsa/key.py
+++ b/rsa/key.py
@@ -26,6 +26,7 @@ of pyasn1.
'''
import logging
+from rsa._compat import b
import rsa.prime
import rsa.pem
@@ -386,7 +387,7 @@ class PrivateKey(AbstractKey):
@return: a PrivateKey object
'''
- der = rsa.pem.load_pem(keyfile, 'RSA PRIVATE KEY')
+ der = rsa.pem.load_pem(keyfile, b('RSA PRIVATE KEY'))
return cls._load_pkcs1_der(der)
def _save_pkcs1_pem(self):
@@ -396,7 +397,7 @@ class PrivateKey(AbstractKey):
'''
der = self._save_pkcs1_der()
- return rsa.pem.save_pem(der, 'RSA PRIVATE KEY')
+ return rsa.pem.save_pem(der, b('RSA PRIVATE KEY'))
def find_p_q(nbits, getprime_func=rsa.prime.getprime, accurate=True):
''''Returns a tuple of two different primes of nbits bits each.