@@ -272,7 +272,7 @@ class XAdESVerifier(XAdESProcessor, XMLVerifier):
272272 def _verify_signing_time (self , verify_result : VerifyResult ):
273273 pass
274274
275- def _verify_cert_digest (self , signing_cert_node , expect_cert ,idx ):
275+ def _verify_cert_digest (self , signing_cert_node , expect_cert , idx ):
276276 cert = self ._find (signing_cert_node , "xades:Cert[{0}]" .format (idx ))
277277 cert_digest = self ._find (cert , "xades:CertDigest" )
278278 digest_alg = DigestAlgorithm (self ._find (cert_digest , "DigestMethod" ).get ("Algorithm" ))
@@ -285,21 +285,23 @@ def _verify_cert_digest(self, signing_cert_node, expect_cert,idx):
285285
286286 def _verify_cert_digests (self , verify_result : VerifyResult ):
287287 x509_data = verify_result .signature_xml .find ("ds:KeyInfo/ds:X509Data" , namespaces = namespaces )
288- for idx ,x_cert in enumerate (self ._findall (x509_data , "X509Certificate" )):
289- cert_from_key_info = load_certificate (
290- FILETYPE_PEM , add_pem_header (x_cert .text )
291- )
288+ for idx , x_cert in enumerate (self ._findall (x509_data , "X509Certificate" )):
289+ cert_from_key_info = load_certificate (FILETYPE_PEM , add_pem_header (x_cert .text ))
292290 signed_signature_props = self ._find (verify_result .signed_xml , "xades:SignedSignatureProperties" )
293291 signing_cert = self ._find (signed_signature_props , "xades:SigningCertificate" , require = False )
294292 signing_cert_v2 = self ._find (signed_signature_props , "xades:SigningCertificateV2" , require = False )
295293 if signing_cert is None and signing_cert_v2 is None :
296- raise InvalidInput ("Expected to find XML element xades:SigningCertificate or xades:SigningCertificateV2" )
294+ raise InvalidInput (
295+ "Expected to find XML element xades:SigningCertificate or xades:SigningCertificateV2"
296+ )
297297 if signing_cert is not None and signing_cert_v2 is not None :
298- raise InvalidInput ("Expected to find exactly one of xades:SigningCertificate or xades:SigningCertificateV2" )
298+ raise InvalidInput (
299+ "Expected to find exactly one of xades:SigningCertificate or xades:SigningCertificateV2"
300+ )
299301 if signing_cert is not None :
300- self ._verify_cert_digest (signing_cert , expect_cert = cert_from_key_info ,idx = idx + 1 )
302+ self ._verify_cert_digest (signing_cert , expect_cert = cert_from_key_info , idx = ( idx + 1 ) )
301303 elif signing_cert_v2 is not None :
302- self ._verify_cert_digest (signing_cert_v2 , expect_cert = cert_from_key_info ,idx = idx + 1 )
304+ self ._verify_cert_digest (signing_cert_v2 , expect_cert = cert_from_key_info , idx = ( idx + 1 ) )
303305
304306 def _verify_signature_policy (self , verify_result : VerifyResult , expect_signature_policy : XAdESSignaturePolicy ):
305307 signed_signature_props = self ._find (verify_result .signed_xml , "xades:SignedSignatureProperties" )
0 commit comments