diff options
| -rw-r--r-- | src/cryptography/x509/extensions.py | 12 | ||||
| -rw-r--r-- | tests/x509/test_x509_ext.py | 34 |
2 files changed, 46 insertions, 0 deletions
diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py index 0bfe6f92..7a03139f 100644 --- a/src/cryptography/x509/extensions.py +++ b/src/cryptography/x509/extensions.py @@ -1113,6 +1113,9 @@ class GeneralNames(object): def __getitem__(self, idx): return self._general_names[idx] + def __hash__(self): + return hash(tuple(self._general_names)) + @utils.register_interface(ExtensionType) class SubjectAlternativeName(object): @@ -1145,6 +1148,9 @@ class SubjectAlternativeName(object): def __ne__(self, other): return not self == other + def __hash__(self): + return hash(self._general_names) + @utils.register_interface(ExtensionType) class IssuerAlternativeName(object): @@ -1177,6 +1183,9 @@ class IssuerAlternativeName(object): def __getitem__(self, idx): return self._general_names[idx] + def __hash__(self): + return hash(self._general_names) + @utils.register_interface(ExtensionType) class CertificateIssuer(object): @@ -1209,6 +1218,9 @@ class CertificateIssuer(object): def __getitem__(self, idx): return self._general_names[idx] + def __hash__(self): + return hash(self._general_names) + @utils.register_interface(ExtensionType) class CRLReason(object): diff --git a/tests/x509/test_x509_ext.py b/tests/x509/test_x509_ext.py index db805aa6..d121a92b 100644 --- a/tests/x509/test_x509_ext.py +++ b/tests/x509/test_x509_ext.py @@ -285,6 +285,15 @@ class TestCertificateIssuer(object): names = ci.get_values_for_type(x509.DNSName) assert names == [u"cryptography.io"] + def test_hash(self): + ci1 = x509.CertificateIssuer([x509.DNSName(b"cryptography.io")]) + ci2 = x509.CertificateIssuer([x509.DNSName(b"cryptography.io")]) + ci3 = x509.CertificateIssuer( + [x509.UniformResourceIdentifier(b"http://something")] + ) + assert hash(ci1) == hash(ci2) + assert hash(ci1) != hash(ci3) + class TestCRLReason(object): def test_invalid_reason_flags(self): @@ -2052,6 +2061,13 @@ class TestGeneralNames(object): assert gns != gns2 assert gns != object() + def test_hash(self): + gns = x509.GeneralNames([x509.DNSName(b"cryptography.io")]) + gns2 = x509.GeneralNames([x509.DNSName(b"cryptography.io")]) + gns3 = x509.GeneralNames([x509.RFC822Name(b"admin@cryptography.io")]) + assert hash(gns) == hash(gns2) + assert hash(gns) != hash(gns3) + class TestIssuerAlternativeName(object): def test_get_values_for_type(self): @@ -2125,6 +2141,15 @@ class TestIssuerAlternativeName(object): assert san != san2 assert san != object() + def test_hash(self): + ian = x509.IssuerAlternativeName([x509.DNSName(b"cryptography.io")]) + ian2 = x509.IssuerAlternativeName([x509.DNSName(b"cryptography.io")]) + ian3 = x509.IssuerAlternativeName( + [x509.RFC822Name(b"admin@cryptography.io")] + ) + assert hash(ian) == hash(ian2) + assert hash(ian) != hash(ian3) + @pytest.mark.requires_backend_interface(interface=RSABackend) @pytest.mark.requires_backend_interface(interface=X509Backend) @@ -2241,6 +2266,15 @@ class TestSubjectAlternativeName(object): assert san != san2 assert san != object() + def test_hash(self): + san = x509.SubjectAlternativeName([x509.DNSName(b"cryptography.io")]) + san2 = x509.SubjectAlternativeName([x509.DNSName(b"cryptography.io")]) + san3 = x509.SubjectAlternativeName( + [x509.RFC822Name(b"admin@cryptography.io")] + ) + assert hash(san) == hash(san2) + assert hash(san) != hash(san3) + @pytest.mark.requires_backend_interface(interface=RSABackend) @pytest.mark.requires_backend_interface(interface=X509Backend) |