Merge "Fixes private key loading issue"

2015-08-04 05:20:36 +00:00 · 2015-08-04 05:20:36 +00:00 · fd29f15182
parent 3693ebbbac cd05dd4ea8
commit fd29f15182
1 changed files with 2 additions and 1 deletions
--- 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"):