aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoern Heissler <joern@fishpond.co.nz>2016-01-18 00:24:44 +0100
committerJoern Heissler <joern@fishpond.co.nz>2016-01-18 00:24:44 +0100
commitfbda8ce83d8aa774bbd5438dfd98def87585df3b (patch)
treef89002fc90c97980d9cea0b4b33b2b382a062714 /src
parent1bd77e2f4ee2fcdd9233ea36ed74edeee02817c5 (diff)
downloadcryptography-fbda8ce83d8aa774bbd5438dfd98def87585df3b.tar.gz
cryptography-fbda8ce83d8aa774bbd5438dfd98def87585df3b.tar.bz2
cryptography-fbda8ce83d8aa774bbd5438dfd98def87585df3b.zip
Change method to property
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/x509.py9
-rw-r--r--src/cryptography/x509/base.py4
2 files changed, 8 insertions, 5 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index 18274aa1..c71f8d92 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function
import operator
from cryptography import utils, x509
-from cryptography.exceptions import UnsupportedAlgorithm, InvalidSignature
+from cryptography.exceptions import UnsupportedAlgorithm
from cryptography.hazmat.backends.openssl.decode_asn1 import (
_CERTIFICATE_EXTENSION_PARSER, _CRL_EXTENSION_PARSER,
_CSR_EXTENSION_PARSER, _REVOKED_CERTIFICATE_EXTENSION_PARSER,
@@ -363,7 +363,8 @@ class _CertificateSigningRequest(object):
def signature(self):
return _asn1_string_to_bytes(self._backend, self._x509_req.signature)
- def verify(self):
+ @property
+ def is_signature_valid(self):
pkey = self._backend._lib.X509_REQ_get_pubkey(self._x509_req)
self._backend.openssl_assert(pkey != self._backend._ffi.NULL)
pkey = self._backend._ffi.gc(pkey, self._backend._lib.EVP_PKEY_free)
@@ -371,4 +372,6 @@ class _CertificateSigningRequest(object):
if res != 1:
self._backend._consume_errors()
- raise InvalidSignature
+ return False
+
+ return True
diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py
index d24070d5..4a22ed02 100644
--- a/src/cryptography/x509/base.py
+++ b/src/cryptography/x509/base.py
@@ -288,8 +288,8 @@ class CertificateSigningRequest(object):
2986.
"""
- @abc.abstractmethod
- def verify(self):
+ @abc.abstractproperty
+ def is_signature_valid(self):
"""
Verifies signature of signing request.
"""