diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-02-10 14:20:22 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-02-10 16:16:44 +0100 |
| commit | 3d9bec2e879d60e6bb7b2602084d3314765a6283 (patch) | |
| tree | e3ba2520850e11ac8cf8ce85eaddcfd68bb6220e /ipaserver/plugins | |
| parent | a33b25dea988aa34844869a8adc57d5cd396d3aa (diff) | |
| download | freeipa-3d9bec2e879d60e6bb7b2602084d3314765a6283.tar.gz freeipa-3d9bec2e879d60e6bb7b2602084d3314765a6283.tar.xz freeipa-3d9bec2e879d60e6bb7b2602084d3314765a6283.zip | |
cryptography has deprecated serial in favor of serial_number
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Diffstat (limited to 'ipaserver/plugins')
| -rw-r--r-- | ipaserver/plugins/cert.py | 4 | ||||
| -rw-r--r-- | ipaserver/plugins/service.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py index 6bf5c03ef..08521974f 100644 --- a/ipaserver/plugins/cert.py +++ b/ipaserver/plugins/cert.py @@ -387,7 +387,7 @@ class BaseCertObject(Object): cert = x509.load_certificate(obj['certificate']) obj['subject'] = DN(cert.subject) obj['issuer'] = DN(cert.issuer) - obj['serial_number'] = cert.serial + obj['serial_number'] = cert.serial_number obj['valid_not_before'] = x509.format_datetime( cert.not_valid_before) obj['valid_not_after'] = x509.format_datetime( @@ -1257,7 +1257,7 @@ class cert_find(Search, CertMethod): raise - return (DN(cert_obj.issuer), cert_obj.serial) + return (DN(cert_obj.issuer), cert_obj.serial_number) def _get_cert_obj(self, cert, all, raw, pkey_only): obj = {'certificate': base64.b64encode(cert).decode('ascii')} diff --git a/ipaserver/plugins/service.py b/ipaserver/plugins/service.py index ddae37fec..0c498084a 100644 --- a/ipaserver/plugins/service.py +++ b/ipaserver/plugins/service.py @@ -268,8 +268,8 @@ def set_certificate_attrs(entry_attrs): cert = x509.normalize_certificate(cert) cert = x509.load_certificate(cert, datatype=x509.DER) entry_attrs['subject'] = unicode(DN(cert.subject)) - entry_attrs['serial_number'] = unicode(cert.serial) - entry_attrs['serial_number_hex'] = u'0x%X' % cert.serial + entry_attrs['serial_number'] = unicode(cert.serial_number) + entry_attrs['serial_number_hex'] = u'0x%X' % cert.serial_number entry_attrs['issuer'] = unicode(DN(cert.issuer)) entry_attrs['valid_not_before'] = x509.format_datetime( cert.not_valid_before) |