From cd05dd4ea82cf515d1a32b0df2a660a255396d14 Mon Sep 17 00:00:00 2001 From: ptoohill1 Date: Mon, 3 Aug 2015 12:16:53 -0500 Subject: [PATCH] Fixes private key loading issue Loading the private key fails when using six.b, use encode instead. Change-Id: I4f42a8b2b8782cbbc66e7e4f880f4fe3aab06ef2 --- neutron_lbaas/common/tls_utils/cert_parser.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron_lbaas/common/tls_utils/cert_parser.py b/neutron_lbaas/common/tls_utils/cert_parser.py index c1754afe6..d741c5c13 100644 --- a/neutron_lbaas/common/tls_utils/cert_parser.py +++ b/neutron_lbaas/common/tls_utils/cert_parser.py @@ -101,7 +101,8 @@ def _read_pyca_private_key(private_key, private_key_passphrase=None): else: kw["password"] = None try: - pk = serialization.load_pem_private_key(six.b(private_key), **kw) + pk = serialization.load_pem_private_key(private_key.encode('ascii'), + **kw) return pk except TypeError as ex: if len(ex.args) > 0 and ex.args[0].startswith("Password"):