Tidied up and changed defaults

cert_gen.py

@@ -9,14 +9,14 @@ from cryptography.hazmat.primitives import hashes
 
 import datetime
 
-c=u"GB"
-st=u"England"
-l=u"Manchester"
-o=u'Jisc'
-ou=u''
-servername = u"jadzia.mcc.ac.uk"
-crldp=u'http://somewhere.example.com/awebserver'
-passphrase=b'somethingsecure'
+#c=u"GB"
+#st=u"England"
+#l=u"Manchester"
+#o=u'Jisc'
+#ou=u''
+#servername = u"jadzia.mcc.ac.uk"
+#crldp=u'http://somewhere.example.com/awebserver'
+#passphrase=b'somethingsecure'
 
 
 def gen_cakey():

certs.py

@@ -1,10 +1,8 @@
 from cert_gen import gen_cakey,build_name,build_csr,build_servercert,build_rootca,output_cert,output_key_encrypted,build_crl
 
 def gencerts(c,st,l,o,ou,cn,crldp,passphrase):
-## Start
-## Build Root CA
 
-#write_key_encrypted('rootca-key.pem',cakey,passphrase)
+## Build Root CA
 
   casubject = caissuer = build_name(c,st,l,o,ou,u'Root CA')
 
@@ -12,12 +10,9 @@ def gencerts(c,st,l,o,ou,cn,crldp,passphrase):
 
   cacert = build_rootca(cakey,casubject,caissuer,36500)
 
-#write_cert('rootca.pem',cacert)
-
 ## Build CSR
 
   csrkey = gen_cakey()
-#write_key('csr-key.pem',csrkey)
 
   csrsubject = build_name(c,st,l,o,ou,cn)
 
@@ -25,15 +20,8 @@ def gencerts(c,st,l,o,ou,cn,crldp,passphrase):
 
 ## Build Server Cert
 
-#servkey = key()
-#write_key("server-key.pem",servkey)
-
-#serversubject = build_name(c,st,l,o,ou,servername)
-
   servercert = build_servercert(cakey,cacert,csrcert,cn,crldp,36500)
 
-#write_cert('server.pem',servercert)
-
   crlcert = build_crl(cakey,caissuer,36500)
 
   return csrsubject,output_cert(cacert),output_key_encrypted(cakey,passphrase),output_key_encrypted(csrkey,passphrase),output_cert(servercert),output_cert(csrcert),output_cert(crlcert)

cli.py

@@ -11,8 +11,8 @@ def main(argv):
   l=u'Manchester'
   o=u'Jisc'
   ou=u'Govroam'
-  cn=u'jadzia.mcc.ac.uk'
-  crldp=u'http://jadzia.mcc.ac.uk/crldp'
+  cn=u'something.somewhere.com'
+  crldp=u'http://something.somewhere.com/crldp'
   passphrase=b'something'
 
   try: