diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-21 08:05:54 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-21 08:05:54 -0500 |
| commit | fda410e06c6b82878f943273b29b55b41217dc74 (patch) | |
| tree | 21445f0752e3315fcc19de894ef50d01422cb2a7 | |
| parent | 40f8338e986610f57ef905e510e0bf8f796e43e8 (diff) | |
| download | cryptography-fda410e06c6b82878f943273b29b55b41217dc74.tar.gz cryptography-fda410e06c6b82878f943273b29b55b41217dc74.tar.bz2 cryptography-fda410e06c6b82878f943273b29b55b41217dc74.zip | |
review fixes
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/x509.py | 6 | ||||
| -rw-r--r-- | src/cryptography/x509.py | 17 |
2 files changed, 2 insertions, 21 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 363d3df1..dcde5e73 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -61,9 +61,7 @@ def _build_x509_name(backend, x509_name): def _build_general_name(backend, gn): if gn.type == backend._lib.GEN_DNS: - data = backend._ffi.buffer( - gn.d.dNSName.data, gn.d.dNSName.length - )[:].decode("ascii") + data = backend._ffi.buffer(gn.d.dNSName.data, gn.d.dNSName.length)[:] return x509.DNSName(idna.decode(data)) @@ -275,7 +273,7 @@ class _Certificate(object): num = self._backend._lib.sk_GENERAL_NAME_num(gns) general_names = [] - for i in range(0, num): + for i in range(num): gn = self._backend._lib.sk_GENERAL_NAME_value(gns, i) assert gn != self._backend._ffi.NULL value = _build_general_name(self._backend, gn) diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index 9e4b5eea..cdc0e430 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -70,19 +70,6 @@ _OID_NAMES = { } -_GENERAL_NAMES = { - 0: "otherName", - 1: "rfc822Name", - 2: "dNSName", - 3: "x400Address", - 4: "directoryName", - 5: "ediPartyName", - 6: "uniformResourceIdentifier", - 7: "iPAddress", - 8: "registeredID", -} - - class Version(Enum): v1 = 0 v3 = 2 @@ -128,10 +115,6 @@ class ExtensionNotFound(Exception): self.oid = oid -class UnsupportedGeneralNameType(Exception): - pass - - class NameAttribute(object): def __init__(self, oid, value): if not isinstance(oid, ObjectIdentifier): |