Skip to content

Commit dc7124a

Browse files
author
Thomas Mieslinger
committed
as py3x base64.b64encode() returns unicode which needs to be decoded
1 parent df3ec5e commit dc7124a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

dim/dim/crypto.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ def generate_RSASHA256_key_pair(bits):
4040
for field in ['n', 'e', 'd', 'p', 'q', 'u']:
4141
f = getattr(key, field)
4242
f = Crypto.Util.number.long_to_bytes(f)
43-
keydata[field] = base64.b64encode(f)
43+
keydata[field] = base64.b64encode(f).decode('utf-8')
4444
dmp1 = Crypto.Util.number.long_to_bytes(key.d % (key.p - 1))
45-
keydata['dmp1'] = base64.b64encode(dmp1)
45+
keydata['dmp1'] = base64.b64encode(dmp1).decode('utf-8')
4646
dmq1 = Crypto.Util.number.long_to_bytes(key.d % (key.q - 1))
47-
keydata['dmq1'] = base64.b64encode(dmq1)
47+
keydata['dmq1'] = base64.b64encode(dmq1).decode('utf-8')
4848
# key.u == inverse(p, q), but rfc3447 needs inverse(q, p)
4949
u = Crypto.Util.number.long_to_bytes(inverse(key.q, key.p))
50-
keydata['u'] = base64.b64encode(u)
50+
keydata['u'] = base64.b64encode(u).decode('utf-8')
5151
privkey = _file_privkey_rsa % keydata
5252
return (pubkey, privkey)

dim/dim/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = '4.0.1'
1+
VERSION = '4.0.2'

0 commit comments

Comments
 (0)