IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

py3: fix ipa cert-request --database ...

Browse Source 
Fix bytes vs str issues in ipa cert-request

https://pagure.io/freeipa/issue/7148
This commit is contained in:
Florence Blanc-Renaud 2017-09-11 18:24:22 +02:00 committed by Stanislav Laznicka
parent 8eb1bd37be
commit 3de30177f7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaclient/csrgen.py
View File

@ -407,11 +407,11 @@ class OpenSSLAdaptor(object):
self.password_filename = password_filename
def key(self):
with open(self.key_filename, 'r') as key_file:
with open(self.key_filename, 'rb') as key_file:
key_bytes = key_file.read()
password = None
if self.password_filename is not None:
with open(self.password_filename, 'r') as password_file:
with open(self.password_filename, 'rb') as password_file:
password = password_file.read().strip()
key = load_pem_private_key(key_bytes, password, default_backend())
@ -454,7 +454,7 @@ class NSSAdaptor(object):
self.nickname = base64.b32encode(os.urandom(40))
def get_subject_public_key_info(self):
temp_cn = base64.b32encode(os.urandom(40))
temp_cn = base64.b32encode(os.urandom(40)).decode('ascii')
password_args = []
if self.password_filename is not None: