diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-07-09 16:23:52 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-07-09 16:23:52 -0500 |
| commit | 3fe1543c9e4c04604967a9524aa5b2e641bc9ede (patch) | |
| tree | e1c1e1fa943c47b3b7dcc6de92cc15a032fc7bc6 /src | |
| parent | 92d28d18253d732453eb835609fc64c456cd16f0 (diff) | |
| parent | 978137d89e99314e823ab206d482d23e6a830329 (diff) | |
| download | cryptography-3fe1543c9e4c04604967a9524aa5b2e641bc9ede.tar.gz cryptography-3fe1543c9e4c04604967a9524aa5b2e641bc9ede.tar.bz2 cryptography-3fe1543c9e4c04604967a9524aa5b2e641bc9ede.zip | |
Merge pull request #2129 from alex/hash-csr
Fixed #2127 -- added __hash__ to CSR
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/x509.py | 3 | ||||
| -rw-r--r-- | src/cryptography/x509.py | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 399e6a6e..d78c60fa 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -724,6 +724,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 d9d6db4a..33c64168 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -1444,6 +1444,12 @@ class CertificateSigningRequest(object): """ @abc.abstractmethod + def __hash__(self): + """ + Computes a hash. + """ + + @abc.abstractmethod def public_key(self): """ Returns the public key |