aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2015-07-18 23:27:31 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2015-07-19 08:55:53 -0500
commit43ae7387cc20b70ea71e262813d2d24af99f0b08 (patch)
tree4a0138bd563cfbdc75fdf153565a65b553504f9e /src
parentbe9985b14602fc8bc535d78675c0f11ce5ceebc3 (diff)
downloadcryptography-43ae7387cc20b70ea71e262813d2d24af99f0b08.tar.gz
cryptography-43ae7387cc20b70ea71e262813d2d24af99f0b08.tar.bz2
cryptography-43ae7387cc20b70ea71e262813d2d24af99f0b08.zip
Fix copy-paste errors
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index a9d4430d..e73721b5 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -1648,7 +1648,7 @@ class CertificateBuilder(object):
"""
if not isinstance(name, Name):
raise TypeError('Expecting x509.Name object.')
- if self._issuer_name is not None:
+ if self._subject_name is not None:
raise ValueError('The subject name may only be set once.')
return CertificateBuilder(
self._version, self._issuer_name, name, self._public_key,
@@ -1678,7 +1678,7 @@ class CertificateBuilder(object):
"""
if not isinstance(number, six.integer_types):
raise TypeError('Serial number must be of integral type.')
- if self._public_key is not None:
+ if self._serial_number is not None:
raise ValueError('The serial number may only be set once.')
return CertificateBuilder(
self._version, self._issuer_name, self._subject_name,
@@ -1708,7 +1708,7 @@ class CertificateBuilder(object):
# TODO: require UTC datetime?
if not isinstance(time, datetime.datetime):
raise TypeError('Expecting datetime object.')
- if self._not_valid_before is not None:
+ if self._not_valid_after is not None:
raise ValueError('The not valid after may only be set once.')
return CertificateBuilder(
self._version, self._issuer_name, self._subject_name,