IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-07-29 15:55:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

py3: fix csrgen error handling

Browse Source 
csrgen error handling marshalls an error string from libcrypto.
This is not handled correctly under python3.  Fix the error
handling.

Part of: https://pagure.io/freeipa/issue/7496

Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Fraser Tweedale
2018-04-25 14:41:12 +02:00
committed by Christian Heimes
parent 13b9608d5c
commit 53f87ee5cd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipaclient/csrgen_ffi.py
+6 -2
View File
@@ -182,8 +182,12 @@ def _raise_openssl_errors():
code = ERR_get_error() code = ERR_get_error()
while code != 0: while code != 0:
msg = ERR_error_string(code, NULL) msg = _ffi.string(ERR_error_string(code, NULL))
msgs.append(_ffi.string(msg)) try:
strmsg = msg.decode('utf-8')
except UnicodeDecodeError:
strmsg = repr(msg)
msgs.append(strmsg)
code = ERR_get_error() code = ERR_get_error()
raise errors.CSRTemplateError(reason='\n'.join(msgs)) raise errors.CSRTemplateError(reason='\n'.join(msgs))