Changeset 3175 for TI12-security/trunk/python/ndg.security.test/ndg

Timestamp:

04/01/08 11:13:51 (13 years ago)

Author:

pjkersha

Message:

security/python/ndg.security.test/ndg/security/test/ndg-test-ca.crt,
security/python/ndg.security.test/ndg/security/test/test.crt,
security/python/ndg.security.test/ndg/security/test/test.key,
security/python/ndg.security.test/ndg/security/test/attCertTest.cfg: added certs from test CA.
security/python/ndg.security.test/ndg/security/test/AttCertTest.py: modified tests 9 and 13 for correct handling of no password set.
security/python/ndg.security.test/setup.py: corrret inclusion of test certs in egg.

Location:

TI12-security/trunk/python/ndg.security.test/ndg/security/test/attCert

Files:

• AttCertTest.py (modified) (2 diffs)
• ac.xml (added)
• attCertTest.cfg (modified) (2 diffs)
• ndg-test-ca.crt (added)
• test.crt (added)
• test.key (added)

TI12-security/trunk/python/ndg.security.test/ndg/security/test/attCert/AttCertTest.py

@@ -176 +176 @@
         self.attCert.signingKeyFilePath=self.cfg['test9Sign']['keyfile']
         
-        try:
-            self.attCert.signingKeyPwd=self.cfg['test9Sign'].get('keypwd') or\
-            getpass.getpass(prompt="\ntest9Sign private key password: ")
-        except KeyboardInterrupt:
-            self.fail("test9Sign: Aborting test")
-            return
-        
+        signingKeyPwd = self.cfg['test9Sign'].get('keypwd')
+        if signingKeyPwd is None:
+            try:
+                self.attCert.signingKeyPwd = \
+                getpass.getpass(prompt="\ntest9Sign private key password: ")
+            except KeyboardInterrupt:
+                self.fail("test9Sign: Aborting test")
+                return
+        else:
+            self.attCert.signingKeyPwd = signingKeyPwd
+            
         self.attCert.applyEnvelopedSignature()
         print 'test9Sign: \n\n%s' % self.attCert
@@ -223 +227 @@
                             self.cfg['test13IsValidStressTest']['keyfile']
         
-        try:
-            self.attCert.signingKeyPwd = \
-                        self.cfg['test13IsValidStressTest'].get('keypwd') or \
-                        getpass.getpass(\
+        signingKeyPwd = self.cfg['test13IsValidStressTest'].get('keypwd')
+        if signingKeyPwd is None:
+            try:
+                self.attCert.signingKeyPwd = getpass.getpass(\
                     prompt="\ntest13IsValidStressTest private key password: ")
-        except KeyboardInterrupt:
-            self.fail("test13IsValidStressTest: Aborting test")
-            return
-
+            except KeyboardInterrupt:
+                self.fail("test13IsValidStressTest: Aborting test")
+                return
+        else:
+            self.attCert.signingKeyPwd = signingKeyPwd
+            
         import base64
         for i in range(0, int(self.cfg['test13IsValidStressTest']['nruns'])):

TI12-security/trunk/python/ndg.security.test/ndg/security/test/attCert/attCertTest.cfg

@@ -10 +10 @@
 
 [test9Sign]
-certFile: ./cert.pem
-keyFile: ./key.pem
+certFile: ./test.crt
+keyFile: ./test.key
 filePath: ./ac-signed.xml
-#keyPwd:
+keyPwd:
 
 [test10Write]
@@ -22 +22 @@
 
 [test12IsValid]
-certFilePathList: ./cacert.pem
+certFilePathList: ./ndg-test-ca.crt
 
 [test13IsValidStressTest]
 # First cert is added to the signature, both certs are used in the 
 # verification
-certFilepathlist: ./cert.pem ./cacert.pem
-keyFile: ./key.pem
-#keyPwd:
-nruns: 30
+certFilepathlist: ./test.crt ./ndg-test-ca.crt
+keyFile: ./test.key
+keyPwd:
+nruns: 10
 
 [test14IsValidSignature]
-certFilePathList: ./cacert.pem
+certFilePathList: ./ndg-test-ca.crt
 filePath: ./ac.xml