[AG-TECH] certmgr.py small bug

[Chris Willing]

When importing a .pem file which includes a key, the simple instruction
	import combinedcert.pem
does not work correctly; the instruction completes and the certificate
appears to be imported, however no key is extracted and no key file is
generated.

When there are separate cert & key files i.e.
	import certpart.pem keypart.pem
then both cert & key are correctly imported.


Below is small patch which corrects the behaviour. There are two
versions, firstly for AG2.2 (using current CVS certmgr.py,v 1.10):
--- certmgr.py.orig     2004-07-25 11:54:57.000000000 +1000
+++ certmgr.py  2004-07-25 11:55:47.000000000 +1000
@@ -509,6 +509,7 @@
                         break
                 if not validKey and keyRE.search(line):
                     validKey = 1
+                    keyFile = certFile
                     if validCert:
                         break
             fh.close()


The second, almost identical, version (only the line numbers differ) is
for users of AG2.1.2 (certmgr.py,v 1.4):
--- certmgr.py.orig     2004-07-25 12:07:33.000000000 +1000
+++ certmgr.py  2004-07-25 12:08:01.000000000 +1000
@@ -439,6 +439,7 @@
                         break
                 if not validKey and keyRE.search(line):
                     validKey = 1
+                    keyFile = certFile
                     if validCert:
                         break
             fh.close()



-- 
Chris Willing                     Phone: +61 7 3365 8350
University of Queensland          Email: willing at itee.uq.edu.au
St Lucia, QLD 4072, Australia