@@ -750,12 +750,16 @@ def test_170_pki_key_encoding(self):
750
750
self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'ptolemy_key.der' ).isNull ())
751
751
self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'ptolemy_key_pem.key' ).isNull ())
752
752
self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'ptolemy_key_der.key' ).isNull ())
753
- self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA.pem' ).isNull ())
754
- self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA.der' ).isNull ())
755
753
self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_EC.pem' ).isNull ())
756
754
self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_EC.der' ).isNull ())
755
+ self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA.pem' ).isNull ())
756
+ self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA.der' ).isNull ())
757
757
self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA_crlf.pem' ).isNull ())
758
758
self .assertFalse (QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA_nonl.pem' ).isNull ())
759
+ donald_dsa = QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA.pem' ).toPem ()
760
+ self .assertEqual (donald_dsa , QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA.der' ).toPem ())
761
+ self .assertEqual (donald_dsa , QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA_crlf.pem' ).toPem ())
762
+ self .assertEqual (donald_dsa , QgsAuthCertUtils .keyFromFile (PKIDATA + '/' + 'donald_key_DSA_nonl.pem' ).toPem ())
759
763
760
764
self .assertEqual (QgsAuthCertUtils .validatePKIBundle (self .mkPEMBundle ('ptolemy_cert.pem' , 'ptolemy_key.pem' , 'password' , 'chain_subissuer-issuer-root.pem' ), True , True ), [])
761
765
self .assertEqual (QgsAuthCertUtils .validatePKIBundle (self .mkPEMBundle ('ptolemy_cert.pem' , 'ptolemy_key.der' , 'password' , 'chain_subissuer-issuer-root.pem' ), True , True ), [])
0 commit comments