@ -649,7 +649,7 @@ class CertificateSigningRequestCryptography(CertificateSigningRequestBase):
csr = cryptography . x509 . CertificateSigningRequestBuilder ( )
csr = cryptography . x509 . CertificateSigningRequestBuilder ( )
try :
try :
csr = csr . subject_name ( cryptography . x509 . Name ( [
csr = csr . subject_name ( cryptography . x509 . Name ( [
cryptography . x509 . NameAttribute ( crypto_utils . cryptography_ get_ name_oid( entry [ 0 ] ) , to_text ( entry [ 1 ] ) ) for entry in self . subject
cryptography . x509 . NameAttribute ( crypto_utils . cryptography_ name_to _oid( entry [ 0 ] ) , to_text ( entry [ 1 ] ) ) for entry in self . subject
] ) )
] ) )
except ValueError as e :
except ValueError as e :
raise CertificateSigningRequestError ( e )
raise CertificateSigningRequestError ( e )
@ -664,7 +664,7 @@ class CertificateSigningRequestCryptography(CertificateSigningRequestBase):
csr = csr . add_extension ( cryptography . x509 . KeyUsage ( * * params ) , critical = self . keyUsage_critical )
csr = csr . add_extension ( cryptography . x509 . KeyUsage ( * * params ) , critical = self . keyUsage_critical )
if self . extendedKeyUsage :
if self . extendedKeyUsage :
usages = [ crypto_utils . cryptography_ get_ext_keyusage ( usage ) for usage in self . extendedKeyUsage ]
usages = [ crypto_utils . cryptography_ name_to_oid ( usage ) for usage in self . extendedKeyUsage ]
csr = csr . add_extension ( cryptography . x509 . ExtendedKeyUsage ( usages ) , critical = self . extendedKeyUsage_critical )
csr = csr . add_extension ( cryptography . x509 . ExtendedKeyUsage ( usages ) , critical = self . extendedKeyUsage_critical )
if self . basicConstraints :
if self . basicConstraints :
@ -713,7 +713,7 @@ class CertificateSigningRequestCryptography(CertificateSigningRequestBase):
def _check_csr ( self ) :
def _check_csr ( self ) :
def _check_subject ( csr ) :
def _check_subject ( csr ) :
subject = [ ( crypto_utils . cryptography_ get_ name_oid( entry [ 0 ] ) , entry [ 1 ] ) for entry in self . subject ]
subject = [ ( crypto_utils . cryptography_ name_to _oid( entry [ 0 ] ) , entry [ 1 ] ) for entry in self . subject ]
current_subject = [ ( sub . oid , sub . value ) for sub in csr . subject ]
current_subject = [ ( sub . oid , sub . value ) for sub in csr . subject ]
return set ( subject ) == set ( current_subject )
return set ( subject ) == set ( current_subject )
@ -751,7 +751,7 @@ class CertificateSigningRequestCryptography(CertificateSigningRequestBase):
def _check_extenededKeyUsage ( extensions ) :
def _check_extenededKeyUsage ( extensions ) :
current_usages_ext = _find_extension ( extensions , cryptography . x509 . ExtendedKeyUsage )
current_usages_ext = _find_extension ( extensions , cryptography . x509 . ExtendedKeyUsage )
current_usages = [ str ( usage ) for usage in current_usages_ext . value ] if current_usages_ext else [ ]
current_usages = [ str ( usage ) for usage in current_usages_ext . value ] if current_usages_ext else [ ]
usages = [ str ( crypto_utils . cryptography_ get_ext_keyusage ( usage ) ) for usage in self . extendedKeyUsage ] if self . extendedKeyUsage else [ ]
usages = [ str ( crypto_utils . cryptography_ name_to_oid ( usage ) ) for usage in self . extendedKeyUsage ] if self . extendedKeyUsage else [ ]
if set ( current_usages ) != set ( usages ) :
if set ( current_usages ) != set ( usages ) :
return False
return False
if usages :
if usages :