From 978137d89e99314e823ab206d482d23e6a830329 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Wed, 8 Jul 2015 20:59:16 -0400
Subject: Fixed #2127 -- added __hash__ to CSR

---
 src/cryptography/hazmat/backends/openssl/x509.py |  3 +++
 src/cryptography/x509.py                         |  6 ++++++
 tests/test_x509.py                               | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index 68104e69..a4013389 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -709,6 +709,9 @@ class _CertificateSigningRequest(object):
     def __ne__(self, other):
         return not self == other
 
+    def __hash__(self):
+        return hash(self.public_bytes(serialization.Encoding.DER))
+
     def public_key(self):
         pkey = self._backend._lib.X509_REQ_get_pubkey(self._x509_req)
         assert pkey != self._backend._ffi.NULL
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index f8134958..0ad1d4f9 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -1409,6 +1409,12 @@ class CertificateSigningRequest(object):
         Checks not equal.
         """
 
+    @abc.abstractmethod
+    def __hash__(self):
+        """
+        Computes a hash.
+        """
+
     @abc.abstractmethod
     def public_key(self):
         """
diff --git a/tests/test_x509.py b/tests/test_x509.py
index ccb24d7f..9c97e969 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -746,6 +746,26 @@ class TestRSACertificateRequest(object):
         assert request1 != request2
         assert request1 != object()
 
+    def test_hash(self, backend):
+        request1 = _load_cert(
+            os.path.join("x509", "requests", "rsa_sha1.pem"),
+            x509.load_pem_x509_csr,
+            backend
+        )
+        request2 = _load_cert(
+            os.path.join("x509", "requests", "rsa_sha1.pem"),
+            x509.load_pem_x509_csr,
+            backend
+        )
+        request3 = _load_cert(
+            os.path.join("x509", "requests", "san_rsa_sha1.pem"),
+            x509.load_pem_x509_csr,
+            backend
+        )
+
+        assert hash(request1) == hash(request2)
+        assert hash(request1) != hash(request3)
+
 
 @pytest.mark.requires_backend_interface(interface=X509Backend)
 class TestCertificateSigningRequestBuilder(object):
-- 
cgit v1.2.3