diff options
| author | Ian Cordasco <ian.cordasco@rackspace.com> | 2015-06-17 12:08:44 -0500 |
|---|---|---|
| committer | Ian Cordasco <graffatcolmingov@gmail.com> | 2015-06-24 13:35:50 -0500 |
| commit | b2b4b6eb91e5330918a622a1a69e52dcf239b1bc (patch) | |
| tree | 66de81b9ae4b2142b8a3aeefb35aef06e91f4b44 /src | |
| parent | 4d46eb7217d1effa3043da0def8c365c199b5b7f (diff) | |
| download | cryptography-b2b4b6eb91e5330918a622a1a69e52dcf239b1bc.tar.gz cryptography-b2b4b6eb91e5330918a622a1a69e52dcf239b1bc.tar.bz2 cryptography-b2b4b6eb91e5330918a622a1a69e52dcf239b1bc.zip | |
Unconditionally encode values to ascii
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index f4cfa940..a6dc0d4e 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -90,9 +90,7 @@ def _encode_name(backend, attributes): subject = backend._lib.X509_NAME_new() subject = backend._ffi.gc(subject, backend._lib.X509_NAME_free) for attribute in attributes: - value = attribute.value - if isinstance(value, six.text_type): - value = value.encode('ascii') + value = attribute.value.encode('ascii') obj = _txt2obj(backend, attribute.oid.dotted_string) res = backend._lib.X509_NAME_add_entry_by_OBJ( subject, @@ -110,8 +108,7 @@ def _txt2obj(backend, name): Converts a Python string with an ASN.1 object ID in dotted form to a ASN1_OBJECT. """ - if isinstance(name, six.text_type): - name = name.encode('ascii') + name = name.encode('ascii') obj = backend._lib.OBJ_txt2obj(name, 1) assert obj != backend._ffi.NULL obj = backend._ffi.gc(obj, backend._lib.ASN1_OBJECT_free) |