aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-12-11 12:25:00 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-12-15 15:49:49 -0600
commitd9fc7252f9470f6f9f6c05047e2fcf1c5c34667a (patch)
treed65acfb45b3879c4b815d9f498fb2fa5e55361ac /src
parent71f4c163367e9915db52499ddda6df654ae374cb (diff)
downloadcryptography-d9fc7252f9470f6f9f6c05047e2fcf1c5c34667a.tar.gz
cryptography-d9fc7252f9470f6f9f6c05047e2fcf1c5c34667a.tar.bz2
cryptography-d9fc7252f9470f6f9f6c05047e2fcf1c5c34667a.zip
change it to not_valid_* why not
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/x509.py4
-rw-r--r--src/cryptography/hazmat/primitives/interfaces.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index 4126a397..a348630f 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -83,12 +83,12 @@ class _X509Certificate(object):
return self._backend._evp_pkey_to_public_key(pkey)
@property
- def not_before(self):
+ def not_valid_before(self):
asn1_time = self._backend._lib.X509_get_notBefore(self._x509)
return self._parse_asn1_time(asn1_time)
@property
- def not_after(self):
+ def not_valid_after(self):
asn1_time = self._backend._lib.X509_get_notAfter(self._x509)
return self._parse_asn1_time(asn1_time)
diff --git a/src/cryptography/hazmat/primitives/interfaces.py b/src/cryptography/hazmat/primitives/interfaces.py
index 18a62601..76616e1f 100644
--- a/src/cryptography/hazmat/primitives/interfaces.py
+++ b/src/cryptography/hazmat/primitives/interfaces.py
@@ -517,13 +517,13 @@ class X509Certificate(object):
"""
@abc.abstractproperty
- def not_before(self):
+ def not_valid_before(self):
"""
Not before time (represented as UTC datetime)
"""
@abc.abstractproperty
- def not_after(self):
+ def not_valid_after(self):
"""
Not after time (represented as UTC datetime)
"""