aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.rst8
-rw-r--r--docs/x509/reference.rst19
-rw-r--r--src/cryptography/hazmat/backends/openssl/encode_asn1.py2
-rw-r--r--src/cryptography/x509/general_name.py73
-rw-r--r--tests/test_x509.py8
-rw-r--r--tests/test_x509_ext.py325
6 files changed, 273 insertions, 162 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d7f2e42b..254402d7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,6 +15,14 @@ Changelog
:attr:`~cryptography.x509.DNSName.value` attribute was deprecated, users
should use :attr:`~cryptography.x509.DNSName.bytes_value` to access the
raw DNS name.
+* Deprecated passing unicode to the
+ :class:`~cryptography.x509.UniformResourceIdentifier` constructor. Instead,
+ users should pass URIs as ``bytes``, with ``idna`` encoding if
+ necessary. In addition, the
+ :attr:`~cryptography.x509.UniformResourceIdentifier.value` attribute was
+ deprecated, users should use
+ :attr:`~cryptography.x509.UniformResourceIdentifier.bytes_value` to access the
+ raw value.
2.0.2 - 2017-07-27
~~~~~~~~~~~~~~~~~~
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst
index ea748468..5b0bcd45 100644
--- a/docs/x509/reference.rst
+++ b/docs/x509/reference.rst
@@ -1271,15 +1271,26 @@ General Name Classes
.. versionadded:: 0.9
This corresponds to a uniform resource identifier. For example,
- ``https://cryptography.io``. The URI is parsed and IDNA decoded (see
- :rfc:`5895`).
+ ``https://cryptography.io``.
- .. note::
+ ..note::
- URIs that do not contain ``://`` in them will not be decoded.
+ Starting with version 2.1 unicode input is deprecated. If passing an
+ internationalized domain name (IDN) you should first IDNA encode the
+ hostname and then pass the resulting bytes.
+
+ .. attribute:: bytes_value
+
+ .. versionadded:: 2.1
+
+ :type: bytes
.. attribute:: value
+ .. deprecated:: 2.1
+
+ Deprecated accessor for the idna-decoded value of :attr:`bytes_value`
+
:type: :term:`text`
.. class:: IPAddress(value)
diff --git a/src/cryptography/hazmat/backends/openssl/encode_asn1.py b/src/cryptography/hazmat/backends/openssl/encode_asn1.py
index 77d22127..78ae21a2 100644
--- a/src/cryptography/hazmat/backends/openssl/encode_asn1.py
+++ b/src/cryptography/hazmat/backends/openssl/encode_asn1.py
@@ -449,7 +449,7 @@ def _encode_general_name(backend, name):
gn = backend._lib.GENERAL_NAME_new()
backend.openssl_assert(gn != backend._ffi.NULL)
asn1_str = _encode_asn1_str(
- backend, name._encoded, len(name._encoded)
+ backend, name.bytes_value, len(name.bytes_value)
)
gn.type = backend._lib.GEN_URI
gn.d.uniformResourceIdentifier = asn1_str
diff --git a/src/cryptography/x509/general_name.py b/src/cryptography/x509/general_name.py
index 9ea1cff6..40525a01 100644
--- a/src/cryptography/x509/general_name.py
+++ b/src/cryptography/x509/general_name.py
@@ -173,13 +173,36 @@ class DNSName(object):
@utils.register_interface(GeneralName)
class UniformResourceIdentifier(object):
def __init__(self, value):
- if not isinstance(value, six.text_type):
- raise TypeError("value must be a unicode string")
+ if isinstance(value, six.text_type):
+ try:
+ value = value.encode("ascii")
+ except UnicodeEncodeError:
+ value = self._idna_encode(value)
+ warnings.warn(
+ "UniformResourceIdentifier values should be passed as "
+ "bytes with the hostname idna encoded, not strings. "
+ "Support for passing unicode strings will be removed in a "
+ "future version.",
+ utils.DeprecatedIn21,
+ stacklevel=2,
+ )
+ else:
+ warnings.warn(
+ "UniformResourceIdentifier values should be passed as "
+ "bytes with the hostname idna encoded, not strings. "
+ "Support for passing unicode strings will be removed in a "
+ "future version.",
+ utils.DeprecatedIn21,
+ stacklevel=2,
+ )
+ elif not isinstance(value, bytes):
+ raise TypeError("value must be bytes")
+
+ self._bytes_value = value
+ def _idna_encode(self, value):
parsed = urllib_parse.urlparse(value)
- if not parsed.hostname:
- netloc = ""
- elif parsed.port:
+ if parsed.port:
netloc = (
idna.encode(parsed.hostname) +
":{0}".format(parsed.port).encode("ascii")
@@ -190,7 +213,7 @@ class UniformResourceIdentifier(object):
# Note that building a URL in this fashion means it should be
# semantically indistinguishable from the original but is not
# guaranteed to be exactly the same.
- uri = urllib_parse.urlunparse((
+ return urllib_parse.urlunparse((
parsed.scheme,
netloc,
parsed.path,
@@ -199,13 +222,43 @@ class UniformResourceIdentifier(object):
parsed.fragment
)).encode("ascii")
- self._value = value
- self._encoded = uri
+ @property
+ def value(self):
+ warnings.warn(
+ "UniformResourceIdentifier.bytes_value should be used instead of "
+ "UniformResourceIdentifier.value; it contains the name as raw "
+ "bytes, instead of as an idna-decoded unicode string. "
+ "UniformResourceIdentifier.value will be removed in a future "
+ "version.",
+ utils.DeprecatedIn21,
+ stacklevel=2
+ )
+ parsed = urllib_parse.urlparse(self.bytes_value)
+ if not parsed.hostname:
+ netloc = ""
+ elif parsed.port:
+ netloc = idna.decode(parsed.hostname) + ":{0}".format(parsed.port)
+ else:
+ netloc = idna.decode(parsed.hostname)
- value = utils.read_only_property("_value")
+ # Note that building a URL in this fashion means it should be
+ # semantically indistinguishable from the original but is not
+ # guaranteed to be exactly the same.
+ return urllib_parse.urlunparse((
+ parsed.scheme.decode('utf8'),
+ netloc,
+ parsed.path.decode('utf8'),
+ parsed.params.decode('utf8'),
+ parsed.query.decode('utf8'),
+ parsed.fragment.decode('utf8')
+ ))
+
+ bytes_value = utils.read_only_property("_bytes_value")
def __repr__(self):
- return "<UniformResourceIdentifier(value={0})>".format(self.value)
+ return "<UniformResourceIdentifier(bytes_value={0!r})>".format(
+ self.bytes_value
+ )
def __eq__(self, other):
if not isinstance(other, UniformResourceIdentifier):
diff --git a/tests/test_x509.py b/tests/test_x509.py
index 661461d4..58d3e546 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -229,7 +229,7 @@ class TestCertificateRevocationList(object):
)
])
assert ian.value == x509.IssuerAlternativeName([
- x509.UniformResourceIdentifier(u"https://cryptography.io"),
+ x509.UniformResourceIdentifier(b"https://cryptography.io"),
])
def test_signature(self, backend):
@@ -1506,7 +1506,7 @@ class TestCertificateBuilder(object):
aia = x509.AuthorityInformationAccess([
x509.AccessDescription(
x509.ObjectIdentifier("2.999.7"),
- x509.UniformResourceIdentifier(u"http://example.com")
+ x509.UniformResourceIdentifier(b"http://example.com")
),
])
@@ -3154,11 +3154,11 @@ class TestCertificateSigningRequestBuilder(object):
aia = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
)
])
diff --git a/tests/test_x509_ext.py b/tests/test_x509_ext.py
index b707156a..93538bbc 100644
--- a/tests/test_x509_ext.py
+++ b/tests/test_x509_ext.py
@@ -167,7 +167,7 @@ class TestCertificateIssuer(object):
x509.DNSName(b"crypto.local"),
x509.DNSName(b"another.local"),
x509.RFC822Name(u"email@another.local"),
- x509.UniformResourceIdentifier(u"http://another.local"),
+ x509.UniformResourceIdentifier(b"http://another.local"),
])
assert ci[-1] == ci[4]
assert ci[2:6:2] == [ci[2], ci[4]]
@@ -1437,36 +1437,6 @@ class TestKeyUsageExtension(object):
assert ku.crl_sign is True
-@pytest.mark.parametrize(
- "name", [
- x509.RFC822Name,
- x509.UniformResourceIdentifier
- ]
-)
-class TestTextGeneralNames(object):
- def test_not_text(self, name):
- with pytest.raises(TypeError):
- name(b"notaunicodestring")
-
- with pytest.raises(TypeError):
- name(1.3)
-
- def test_repr(self, name):
- gn = name(u"string")
- assert repr(gn) == "<{0}(value=string)>".format(name.__name__)
-
- def test_eq(self, name):
- gn = name(u"string")
- gn2 = name(u"string")
- assert gn == gn2
-
- def test_ne(self, name):
- gn = name(u"string")
- gn2 = name(u"string2")
- assert gn != gn2
- assert gn != object()
-
-
class TestDNSName(object):
def test_init(self):
with pytest.warns(utils.DeprecatedIn21):
@@ -1540,6 +1510,25 @@ class TestDirectoryName(object):
class TestRFC822Name(object):
+ def test_repr(self):
+ gn = x509.RFC822Name(u"string")
+ assert repr(gn) == "<RFC822Name(value=string)>"
+
+ def test_equality(self):
+ gn = x509.RFC822Name(u"string")
+ gn2 = x509.RFC822Name(u"string2")
+ gn3 = x509.RFC822Name(u"string")
+ assert gn != gn2
+ assert gn != object()
+ assert gn == gn3
+
+ def test_not_text(self):
+ with pytest.raises(TypeError):
+ x509.RFC822Name(b"notaunicodestring")
+
+ with pytest.raises(TypeError):
+ x509.RFC822Name(1.3)
+
def test_invalid_email(self):
with pytest.raises(ValueError):
x509.RFC822Name(u"Name <email>")
@@ -1566,44 +1555,75 @@ class TestRFC822Name(object):
class TestUniformResourceIdentifier(object):
+ def test_equality(self):
+ gn = x509.UniformResourceIdentifier(b"string")
+ gn2 = x509.UniformResourceIdentifier(b"string2")
+ gn3 = x509.UniformResourceIdentifier(b"string")
+ assert gn != gn2
+ assert gn != object()
+ assert gn == gn3
+
+ def test_not_text_or_bytes(self):
+ with pytest.raises(TypeError):
+ x509.UniformResourceIdentifier(1.3)
+
def test_no_parsed_hostname(self):
- gn = x509.UniformResourceIdentifier(u"singlelabel")
- assert gn.value == u"singlelabel"
+ gn = x509.UniformResourceIdentifier(b"singlelabel")
+ assert gn.bytes_value == b"singlelabel"
def test_with_port(self):
- gn = x509.UniformResourceIdentifier(u"singlelabel:443/test")
- assert gn.value == u"singlelabel:443/test"
+ gn = x509.UniformResourceIdentifier(b"singlelabel:443/test")
+ assert gn.bytes_value == b"singlelabel:443/test"
def test_idna_no_port(self):
- gn = x509.UniformResourceIdentifier(
- u"http://\u043f\u044b\u043a\u0430.cryptography"
- )
- assert gn.value == u"http://\u043f\u044b\u043a\u0430.cryptography"
- assert gn._encoded == b"http://xn--80ato2c.cryptography"
+ with pytest.warns(utils.DeprecatedIn21):
+ gn = x509.UniformResourceIdentifier(
+ u"http://\u043f\u044b\u043a\u0430.cryptography"
+ )
+ with pytest.warns(utils.DeprecatedIn21):
+ assert gn.value == u"http://\u043f\u044b\u043a\u0430.cryptography"
+ assert gn.bytes_value == b"http://xn--80ato2c.cryptography"
def test_idna_with_port(self):
- gn = x509.UniformResourceIdentifier(
- u"gopher://\u043f\u044b\u043a\u0430.cryptography:70/some/path"
- )
- assert gn.value == (
- u"gopher://\u043f\u044b\u043a\u0430.cryptography:70/some/path"
+ with pytest.warns(utils.DeprecatedIn21):
+ gn = x509.UniformResourceIdentifier(
+ u"gopher://\u043f\u044b\u043a\u0430.cryptography:70/some/path"
+ )
+ with pytest.warns(utils.DeprecatedIn21):
+ assert gn.value == (
+ u"gopher://\u043f\u044b\u043a\u0430.cryptography:70/some/path"
+ )
+ assert gn.bytes_value == (
+ b"gopher://xn--80ato2c.cryptography:70/some/path"
)
- assert gn._encoded == b"gopher://xn--80ato2c.cryptography:70/some/path"
def test_query_and_fragment(self):
gn = x509.UniformResourceIdentifier(
- u"ldap://cryptography:90/path?query=true#somedata"
+ b"ldap://cryptography:90/path?query=true#somedata"
+ )
+ assert gn.bytes_value == (
+ b"ldap://cryptography:90/path?query=true#somedata"
)
- assert gn.value == u"ldap://cryptography:90/path?query=true#somedata"
def test_hash(self):
- g1 = x509.UniformResourceIdentifier(u"http://host.com")
- g2 = x509.UniformResourceIdentifier(u"http://host.com")
- g3 = x509.UniformResourceIdentifier(u"http://other.com")
+ g1 = x509.UniformResourceIdentifier(b"http://host.com")
+ g2 = x509.UniformResourceIdentifier(b"http://host.com")
+ g3 = x509.UniformResourceIdentifier(b"http://other.com")
assert hash(g1) == hash(g2)
assert hash(g1) != hash(g3)
+ def test_repr(self):
+ gn = x509.UniformResourceIdentifier(b"string")
+ if six.PY3:
+ assert repr(gn) == (
+ "<UniformResourceIdentifier(bytes_value=b'string')>"
+ )
+ else:
+ assert repr(gn) == (
+ "<UniformResourceIdentifier(bytes_value='string')>"
+ )
+
class TestRegisteredID(object):
def test_not_oid(self):
@@ -1747,7 +1767,7 @@ class TestGeneralNames(object):
x509.DNSName(b"crypto.local"),
x509.DNSName(b"another.local"),
x509.RFC822Name(u"email@another.local"),
- x509.UniformResourceIdentifier(u"http://another.local"),
+ x509.UniformResourceIdentifier(b"http://another.local"),
])
assert gn[-1] == gn[4]
assert gn[2:6:2] == [gn[2], gn[4]]
@@ -1818,7 +1838,7 @@ class TestIssuerAlternativeName(object):
x509.DNSName(b"crypto.local"),
x509.DNSName(b"another.local"),
x509.RFC822Name(u"email@another.local"),
- x509.UniformResourceIdentifier(u"http://another.local"),
+ x509.UniformResourceIdentifier(b"http://another.local"),
])
assert ian[-1] == ian[4]
assert ian[2:6:2] == [ian[2], ian[4]]
@@ -1879,7 +1899,7 @@ class TestRSAIssuerAlternativeNameExtension(object):
ExtensionOID.ISSUER_ALTERNATIVE_NAME
)
assert list(ext.value) == [
- x509.UniformResourceIdentifier(u"http://path.to.root/root.crt"),
+ x509.UniformResourceIdentifier(b"http://path.to.root/root.crt"),
]
@@ -1934,7 +1954,7 @@ class TestSubjectAlternativeName(object):
x509.DNSName(b"crypto.local"),
x509.DNSName(b"another.local"),
x509.RFC822Name(u"email@another.local"),
- x509.UniformResourceIdentifier(u"http://another.local"),
+ x509.UniformResourceIdentifier(b"http://another.local"),
])
assert san[-1] == san[4]
assert san[2:6:2] == [san[2], san[4]]
@@ -2335,44 +2355,51 @@ class TestAccessDescription(object):
def test_valid_nonstandard_method(self):
ad = x509.AccessDescription(
ObjectIdentifier("2.999.1"),
- x509.UniformResourceIdentifier(u"http://example.com")
+ x509.UniformResourceIdentifier(b"http://example.com")
)
assert ad is not None
def test_repr(self):
ad = x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
- )
- assert repr(ad) == (
- "<AccessDescription(access_method=<ObjectIdentifier(oid=1.3.6.1.5."
- "5.7.48.1, name=OCSP)>, access_location=<UniformResourceIdentifier"
- "(value=http://ocsp.domain.com)>)>"
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
+ if six.PY3:
+ assert repr(ad) == (
+ "<AccessDescription(access_method=<ObjectIdentifier(oid=1.3.6"
+ ".1.5.5.7.48.1, name=OCSP)>, access_location=<UniformResource"
+ "Identifier(bytes_value=b'http://ocsp.domain.com')>)>"
+ )
+ else:
+ assert repr(ad) == (
+ "<AccessDescription(access_method=<ObjectIdentifier(oid=1.3.6"
+ ".1.5.5.7.48.1, name=OCSP)>, access_location=<UniformResource"
+ "Identifier(bytes_value='http://ocsp.domain.com')>)>"
+ )
def test_eq(self):
ad = x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
ad2 = x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
assert ad == ad2
def test_ne(self):
ad = x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
ad2 = x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
ad3 = x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://notthesame")
+ x509.UniformResourceIdentifier(b"http://notthesame")
)
assert ad != ad2
assert ad != ad3
@@ -2381,15 +2408,15 @@ class TestAccessDescription(object):
def test_hash(self):
ad = x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
ad2 = x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
ad3 = x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
assert hash(ad) == hash(ad2)
assert hash(ad) != hash(ad3)
@@ -2472,22 +2499,22 @@ class TestAuthorityInformationAccess(object):
aia = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
)
])
assert len(aia) == 2
assert list(aia) == [
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
)
]
@@ -2495,7 +2522,7 @@ class TestAuthorityInformationAccess(object):
desc = [
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
)
]
aia = x509.AuthorityInformationAccess(iter(desc))
@@ -2505,41 +2532,53 @@ class TestAuthorityInformationAccess(object):
aia = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
)
])
- assert repr(aia) == (
- "<AuthorityInformationAccess([<AccessDescription(access_method=<Ob"
- "jectIdentifier(oid=1.3.6.1.5.5.7.48.1, name=OCSP)>, access_locati"
- "on=<UniformResourceIdentifier(value=http://ocsp.domain.com)>)>, <"
- "AccessDescription(access_method=<ObjectIdentifier(oid=1.3.6.1.5.5"
- ".7.48.2, name=caIssuers)>, access_location=<UniformResourceIdenti"
- "fier(value=http://domain.com/ca.crt)>)>])>"
- )
+ if six.PY3:
+ assert repr(aia) == (
+ "<AuthorityInformationAccess([<AccessDescription(access_method"
+ "=<ObjectIdentifier(oid=1.3.6.1.5.5.7.48.1, name=OCSP)>, acces"
+ "s_location=<UniformResourceIdentifier(bytes_value=b'http://oc"
+ "sp.domain.com')>)>, <AccessDescription(access_method=<ObjectI"
+ "dentifier(oid=1.3.6.1.5.5.7.48.2, name=caIssuers)>, access_lo"
+ "cation=<UniformResourceIdentifier(bytes_value=b'http://domain"
+ ".com/ca.crt')>)>])>"
+ )
+ else:
+ assert repr(aia) == (
+ "<AuthorityInformationAccess([<AccessDescription(access_method"
+ "=<ObjectIdentifier(oid=1.3.6.1.5.5.7.48.1, name=OCSP)>, acces"
+ "s_location=<UniformResourceIdentifier(bytes_value='http://oc"
+ "sp.domain.com')>)>, <AccessDescription(access_method=<ObjectI"
+ "dentifier(oid=1.3.6.1.5.5.7.48.2, name=caIssuers)>, access_lo"
+ "cation=<UniformResourceIdentifier(bytes_value='http://domain"
+ ".com/ca.crt')>)>])>"
+ )
def test_eq(self):
aia = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
)
])
aia2 = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
)
])
assert aia == aia2
@@ -2548,17 +2587,17 @@ class TestAuthorityInformationAccess(object):
aia = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
)
])
aia2 = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
])
@@ -2569,23 +2608,23 @@ class TestAuthorityInformationAccess(object):
aia = x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://domain.com/ca.crt")
+ x509.UniformResourceIdentifier(b"http://domain.com/ca.crt")
),
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp2.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp2.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp3.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp3.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp4.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp4.domain.com")
),
])
assert aia[-1] == aia[4]
@@ -2610,11 +2649,11 @@ class TestAuthorityInformationAccessExtension(object):
assert ext.value == x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://gv.symcd.com")
+ x509.UniformResourceIdentifier(b"http://gv.symcd.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
- x509.UniformResourceIdentifier(u"http://gv.symcb.com/gv.crt")
+ x509.UniformResourceIdentifier(b"http://gv.symcb.com/gv.crt")
),
])
@@ -2633,11 +2672,11 @@ class TestAuthorityInformationAccessExtension(object):
assert ext.value == x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp2.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp2.domain.com")
),
x509.AccessDescription(
AuthorityInformationAccessOID.CA_ISSUERS,
@@ -2664,7 +2703,7 @@ class TestAuthorityInformationAccessExtension(object):
assert ext.value == x509.AuthorityInformationAccess([
x509.AccessDescription(
AuthorityInformationAccessOID.OCSP,
- x509.UniformResourceIdentifier(u"http://ocsp.domain.com")
+ x509.UniformResourceIdentifier(b"http://ocsp.domain.com")
),
])
@@ -2985,7 +3024,7 @@ class TestNameConstraintsExtension(object):
assert nc == x509.NameConstraints(
permitted_subtrees=[
x509.DNSName(b".cryptography.io"),
- x509.UniformResourceIdentifier(u"ftp://cryptography.test")
+ x509.UniformResourceIdentifier(b"ftp://cryptography.test")
],
excluded_subtrees=None
)
@@ -3005,7 +3044,7 @@ class TestNameConstraintsExtension(object):
permitted_subtrees=None,
excluded_subtrees=[
x509.DNSName(b".cryptography.io"),
- x509.UniformResourceIdentifier(u"gopher://cryptography.test")
+ x509.UniformResourceIdentifier(b"gopher://cryptography.test")
]
)
@@ -3027,7 +3066,7 @@ class TestNameConstraintsExtension(object):
],
excluded_subtrees=[
x509.DNSName(b".domain.com"),
- x509.UniformResourceIdentifier(u"http://test.local"),
+ x509.UniformResourceIdentifier(b"http://test.local"),
]
)
@@ -3102,7 +3141,7 @@ class TestDistributionPoint(object):
def test_reason_not_reasonflags(self):
with pytest.raises(TypeError):
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
frozenset(["notreasonflags"]),
None
@@ -3111,7 +3150,7 @@ class TestDistributionPoint(object):
def test_reason_not_frozenset(self):
with pytest.raises(TypeError):
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
[x509.ReasonFlags.ca_compromise],
None
@@ -3120,7 +3159,7 @@ class TestDistributionPoint(object):
def test_disallowed_reasons(self):
with pytest.raises(ValueError):
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
frozenset([x509.ReasonFlags.unspecified]),
None
@@ -3128,7 +3167,7 @@ class TestDistributionPoint(object):
with pytest.raises(ValueError):
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
frozenset([x509.ReasonFlags.remove_from_crl]),
None
@@ -3145,7 +3184,7 @@ class TestDistributionPoint(object):
def test_eq(self):
dp = x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
frozenset([x509.ReasonFlags.superseded]),
[
@@ -3159,7 +3198,7 @@ class TestDistributionPoint(object):
],
)
dp2 = x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
frozenset([x509.ReasonFlags.superseded]),
[
@@ -3176,7 +3215,7 @@ class TestDistributionPoint(object):
def test_ne(self):
dp = x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
frozenset([x509.ReasonFlags.superseded]),
[
@@ -3190,7 +3229,7 @@ class TestDistributionPoint(object):
],
)
dp2 = x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://crypt.og/crl")],
+ [x509.UniformResourceIdentifier(b"http://crypt.og/crl")],
None,
None,
None
@@ -3199,7 +3238,7 @@ class TestDistributionPoint(object):
assert dp != object()
def test_iter_input(self):
- name = [x509.UniformResourceIdentifier(u"http://crypt.og/crl")]
+ name = [x509.UniformResourceIdentifier(b"http://crypt.og/crl")]
issuer = [
x509.DirectoryName(
x509.Name([
@@ -3263,13 +3302,13 @@ class TestCRLDistributionPoints(object):
def test_iter_len(self):
cdp = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://domain")],
+ [x509.UniformResourceIdentifier(b"http://domain")],
None,
None,
None
),
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([
x509.ReasonFlags.key_compromise,
@@ -3281,13 +3320,13 @@ class TestCRLDistributionPoints(object):
assert len(cdp) == 2
assert list(cdp) == [
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://domain")],
+ [x509.UniformResourceIdentifier(b"http://domain")],
None,
None,
None
),
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([
x509.ReasonFlags.key_compromise,
@@ -3300,7 +3339,7 @@ class TestCRLDistributionPoints(object):
def test_iter_input(self):
points = [
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"http://domain")],
+ [x509.UniformResourceIdentifier(b"http://domain")],
None,
None,
None
@@ -3312,7 +3351,7 @@ class TestCRLDistributionPoints(object):
def test_repr(self):
cdp = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([x509.ReasonFlags.key_compromise]),
None
@@ -3321,39 +3360,39 @@ class TestCRLDistributionPoints(object):
if six.PY3:
assert repr(cdp) == (
"<CRLDistributionPoints([<DistributionPoint(full_name=[<Unifo"
- "rmResourceIdentifier(value=ftp://domain)>], relative_name=No"
- "ne, reasons=frozenset({<ReasonFlags.key_compromise: 'keyComp"
- "romise'>}), crl_issuer=None)>])>"
+ "rmResourceIdentifier(bytes_value=b'ftp://domain')>], relative"
+ "_name=None, reasons=frozenset({<ReasonFlags.key_compromise: "
+ "'keyCompromise'>}), crl_issuer=None)>])>"
)
else:
assert repr(cdp) == (
"<CRLDistributionPoints([<DistributionPoint(full_name=[<Unifo"
- "rmResourceIdentifier(value=ftp://domain)>], relative_name=No"
- "ne, reasons=frozenset([<ReasonFlags.key_compromise: 'keyComp"
- "romise'>]), crl_issuer=None)>])>"
+ "rmResourceIdentifier(bytes_value='ftp://domain')>], relative"
+ "_name=None, reasons=frozenset([<ReasonFlags.key_compromise: "
+ "'keyCompromise'>]), crl_issuer=None)>])>"
)
def test_eq(self):
cdp = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([
x509.ReasonFlags.key_compromise,
x509.ReasonFlags.ca_compromise,
]),
- [x509.UniformResourceIdentifier(u"uri://thing")],
+ [x509.UniformResourceIdentifier(b"uri://thing")],
),
])
cdp2 = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([
x509.ReasonFlags.key_compromise,
x509.ReasonFlags.ca_compromise,
]),
- [x509.UniformResourceIdentifier(u"uri://thing")],
+ [x509.UniformResourceIdentifier(b"uri://thing")],
),
])
assert cdp == cdp2
@@ -3361,43 +3400,43 @@ class TestCRLDistributionPoints(object):
def test_ne(self):
cdp = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([
x509.ReasonFlags.key_compromise,
x509.ReasonFlags.ca_compromise,
]),
- [x509.UniformResourceIdentifier(u"uri://thing")],
+ [x509.UniformResourceIdentifier(b"uri://thing")],
),
])
cdp2 = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain2")],
+ [x509.UniformResourceIdentifier(b"ftp://domain2")],
None,
frozenset([
x509.ReasonFlags.key_compromise,
x509.ReasonFlags.ca_compromise,
]),
- [x509.UniformResourceIdentifier(u"uri://thing")],
+ [x509.UniformResourceIdentifier(b"uri://thing")],
),
])
cdp3 = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([x509.ReasonFlags.key_compromise]),
- [x509.UniformResourceIdentifier(u"uri://thing")],
+ [x509.UniformResourceIdentifier(b"uri://thing")],
),
])
cdp4 = x509.CRLDistributionPoints([
x509.DistributionPoint(
- [x509.UniformResourceIdentifier(u"ftp://domain")],
+ [x509.UniformResourceIdentifier(b"ftp://domain")],
None,
frozenset([
x509.ReasonFlags.key_compromise,
x509.ReasonFlags.ca_compromise,
]),
- [x509.UniformResourceIdentifier(u"uri://thing2")],
+ [x509.UniformResourceIdentifier(b"uri://thing2")],
),
])
assert cdp != cdp2
@@ -3409,23 +3448,23 @@ class TestCRLDistributionPoints(object):
ci = x509.CRLDistributionPoints([
x509.DistributionPoint(
None, None, None,
- [x509.UniformResourceIdentifier(u"uri://thing")],
+ [x509.UniformResourceIdentifier(b"uri://thing")],
),
x509.DistributionPoint(
None, None, None,
- [x509.UniformResourceIdentifier(u"uri://thing2")],
+ [x509.UniformResourceIdentifier(b"uri://thing2")],
),
x509.DistributionPoint(
None, None, None,
- [x509.UniformResourceIdentifier(u"uri://thing3")],
+ [x509.UniformResourceIdentifier(b"uri://thing3")],
),
x509.DistributionPoint(
None, None, None,
- [x509.UniformResourceIdentifier(u"uri://thing4")],
+ [x509.UniformResourceIdentifier(b"uri://thing4")],
),
x509.DistributionPoint(
None, None, None,
- [x509.UniformResourceIdentifier(u"uri://thing5")],
+ [x509.UniformResourceIdentifier(b"uri://thing5")],
),
])
assert ci[-1] == ci[4]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 18:44:56 +0000