From 47e76e16ef2e5d714881f3cce204611a95b4e5c8 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Thu, 19 Jan 2017 14:30:23 +0100 Subject: py3: fingerprint_hex_sha256: fix encoding/decoding https://fedorahosted.org/freeipa/ticket/4985 Reviewed-By: Christian Heimes --- ipapython/ssh.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ipapython') diff --git a/ipapython/ssh.py b/ipapython/ssh.py index 57752aedc..2edfa8ab3 100644 --- a/ipapython/ssh.py +++ b/ipapython/ssh.py @@ -192,9 +192,8 @@ class SSHPublicKey(object): def fingerprint_hex_sha256(self): # OpenSSH trims the trailing '=' of base64 sha256 FP representation - # Using unicode argument converts the result to unicode object - fp = base64.b64encode(sha256(self._key).digest()).rstrip(u'=') - return 'SHA256:{fp}'.format(fp=fp) + fp = base64.b64encode(sha256(self._key).digest()).rstrip(b'=') + return u'SHA256:{fp}'.format(fp=fp.decode('utf-8')) def _fingerprint_dns(self, fpfunc, fptype): if self._keytype == 'ssh-rsa': -- cgit