IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-11 00:31:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

x509: Replace removed register_interface with subclassing

Browse Source 
python-cryptography 38.0 removed `register_interface` decorator:
pyca/cryptography@f70e334a52

Backward compatibility:
Cryptography haven't changed the interface of `Certificate` since it was
first used by IPA (4.6.0) till cryptography 38.0.

cryptography 38.0 (pyca/cryptography@c1b7307a3e)
added `tbs_precertificate_bytes` attribute.

Fixes: https://pagure.io/freeipa/issue/9160
Signed-off-by: Stanislav Levin <slev@altlinux.org>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Stanislav Levin 2022-09-19 15:02:44 +03:00 committed by Rob Crittenden
parent 090d4f9e9d
commit 94835d19b5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipalib/x509.py
View File

@ -41,7 +41,6 @@ import base64
import re import re
from cryptography import x509 as crypto_x509 from cryptography import x509 as crypto_x509
from cryptography import utils as crypto_utils
from cryptography.hazmat.backends import default_backend from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.primitives.serialization import ( from cryptography.hazmat.primitives.serialization import (
@ -88,8 +87,7 @@ SAN_UPN = '1.3.6.1.4.1.311.20.2.3'
SAN_KRB5PRINCIPALNAME = '1.3.6.1.5.2.2' SAN_KRB5PRINCIPALNAME = '1.3.6.1.5.2.2'
@crypto_utils.register_interface(crypto_x509.Certificate) class IPACertificate(crypto_x509.Certificate):
class IPACertificate:
""" """
A proxy class wrapping a python-cryptography certificate representation for A proxy class wrapping a python-cryptography certificate representation for
IPA purposes IPA purposes
@ -402,6 +400,11 @@ class IPACertificate:
match_cert, DNSName(hostname).ToASCII() match_cert, DNSName(hostname).ToASCII()
) )
# added in python-cryptography 38.0
@property
def tbs_precertificate_bytes(self):
return self._cert.tbs_precertificate_bytes
def load_pem_x509_certificate(data): def load_pem_x509_certificate(data):
""" """