diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2021-12-19 16:00:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-20 05:00:32 +0800 |
| commit | de073c62c809b2cd67315c5b3ae99ef38fcd26a9 (patch) | |
| tree | 480a3c4a067f4b8401b39cc1fe4d543a20d7eb33 /src/OpenSSL/SSL.py | |
| parent | c175f152a4b4c02f166035c915a847c3281b1e8c (diff) | |
| download | pyopenssl-de073c62c809b2cd67315c5b3ae99ef38fcd26a9.tar.gz | |
Remove native, it's behavior is confusing (#1069)
Instead just decode stuff at the call-sites -- 100% of which were passing bytes
Diffstat (limited to 'src/OpenSSL/SSL.py')
| -rw-r--r-- | src/OpenSSL/SSL.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py index dff6aa9..5f655f4 100644 --- a/src/OpenSSL/SSL.py +++ b/src/OpenSSL/SSL.py @@ -12,7 +12,6 @@ from OpenSSL._util import ( ffi as _ffi, lib as _lib, make_assert as _make_assert, - native as _native, path_string as _path_string, text_to_bytes_and_warn as _text_to_bytes_and_warn, no_zero_allocator as _no_zero_allocator, @@ -2118,7 +2117,7 @@ class Connection(object): result = _lib.SSL_get_cipher_list(self._ssl, i) if result == _ffi.NULL: break - ciphers.append(_native(_ffi.string(result))) + ciphers.append(_ffi.string(result).decode("utf-8")) return ciphers def get_client_ca_list(self): |