revert to 2.7 format

removed unused imports

csrgen.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
 # Generate a key, self-signed certificate, and certificate request.
 # Usage: csrgen <fqdn>
@@ -9,120 +9,105 @@
 #
 # Author: Courtney Cotton <cotton@cottoncourtney.com> 06-25-2014
 
-# mod'd for python 3.5
-
-
 # Libraries/Modules
-from OpenSSL import crypto, SSL
+
 import argparse
+from OpenSSL import crypto
 
 
 # Generate Certificate Signing Request (CSR)
-def generateCSR(nodename, sans=[]):
+def generateCSR(nodename, sans = []):
-    while True:
-        C = input("Enter your Country Name (2 letter code) [US]: ")
-        if len(C) != 2:
-            print("You must enter two letters. You entered %r" % (C))
-            continue
-        ST = input("Enter your State or Province <full name> []:California: ")
-        if len(ST) == 0:
-            print("Please enter your State or Province.")
-            continue
-        L = input("Enter your (Locality Name (eg, city) []:San Francisco: ")
-        if len(L) == 0:
-            print("Please enter your City.")
-            continue
-        O = input("Enter your Organization Name (eg, company) []:FTW Enterprise: ")
-        if len(L) == 0:
-            print("Please enter your Organization Name.")
-            continue
-        OU = input("Enter your Organizational Unit (eg, section) []:IT: ")
-        if len(OU) == 0:
-            print("Please enter your OU.")
-            continue
 
-        # Allows you to permanently set values required for CSR
+  while True:
-        # To use, comment raw_input and uncomment this section.
+    C  = raw_input("Enter your Country Name (2 letter code) [US]: ")
-        # C  = 'US'
+    if len(C) != 2:
-        # ST = 'New York'
+      print "You must enter two letters. You entered %r" % (C)
-        # L  = 'Location'
+      continue
-        # O  = 'Organization'
+    ST = raw_input("Enter your State or Province <full name> []:California: ")
-        # OU = 'Organizational Unit'
+    if len(ST) == 0:
+      print "Please enter your State or Province."
+      continue
+    L  = raw_input("Enter your (Locality Name (eg, city) []:San Francisco: ")
+    if len(L) == 0:
+      print "Please enter your City."
+      continue
+    O  = raw_input("Enter your Organization Name (eg, company) []:FTW Enterprise: ")
+    if len(L) == 0:
+       print "Please enter your Organization Name."
+       continue
+    OU = raw_input("Enter your Organizational Unit (eg, section) []:IT: ")
+    if len(OU) == 0:
+      print "Please enter your OU."
+      continue
 
-        csrfile = 'host.csr'
+    # Allows you to permanently set values required for CSR
-        keyfile = 'host.key'
+    # To use, comment raw_input and uncomment this section.
-        TYPE_RSA = crypto.TYPE_RSA
+    # C  = 'US'
-        # Appends SAN to have 'DNS:'
+    # ST = 'New York'
-        ss = []
+    # L  = 'Location'
-        for i in sans:
+    # O  = 'Organization'
-            ss.append("DNS: %s" % i)
+    # OU = 'Organizational Unit'
-        ss = ", ".join(ss)
 
-        req = crypto.X509Req()
+    csrfile = 'host.csr'
-        req.get_subject().CN = nodename
+    keyfile = 'host.key'
-        req.get_subject().countryName = C
+    TYPE_RSA = crypto.TYPE_RSA
-        req.get_subject().stateOrProvinceName = ST
+    # Appends SAN to have 'DNS:'
-        req.get_subject().localityName = L
+    ss = []
-        req.get_subject().organizationName = O
+    for i in sans:
-        req.get_subject().organizationalUnitName = OU
+        ss.append("DNS: %s" % i)
-
+    ss = ", ".join(ss)
-        # Add in extensions
-        # added bytearray to string
-        # before -> "keyUsage"
-        # after  -> b"keyUsage"
-
-        base_constraints = ([
-            crypto.X509Extension(b"keyUsage", False, b"Digital Signature, Non Repudiation, Key Encipherment"),
-            crypto.X509Extension(b"basicConstraints", False, b"CA:FALSE"),
-        ])
-        x509_extensions = base_constraints
-        # If there are SAN entries, append the base_constraints to include them.
-        if ss:
-            san_constraint = crypto.X509Extension(b"subjectAltName", False, ss)
-            x509_extensions.append(san_constraint)
-        req.add_extensions(x509_extensions)
-        # Utilizes generateKey function to kick off key generation.
-        key = generateKey(TYPE_RSA, 2048)
-        req.set_pubkey(key)
-
-        # change to sha 256?
-        # req.sign(key, "sha1")
-        req.sign(key, "sha256")
-
-        generateFiles(csrfile, req)
-        generateFiles(keyfile, key)
-
-        return req
 
+    req = crypto.X509Req()
+    req.get_subject().CN = nodename
+    req.get_subject().countryName = C
+    req.get_subject().stateOrProvinceName = ST
+    req.get_subject().localityName = L
+    req.get_subject().organizationName = O
+    req.get_subject().organizationalUnitName = OU
+    # Add in extensions
+    base_constraints = ([
+        crypto.X509Extension("keyUsage", False, "Digital Signature, Non Repudiation, Key Encipherment"),
+        crypto.X509Extension("basicConstraints", False, "CA:FALSE"),
+    ])
+    x509_extensions = base_constraints
+    # If there are SAN entries, append the base_constraints to include them.
+    if ss:
+        san_constraint = crypto.X509Extension("subjectAltName", False, ss)
+        x509_extensions.append(san_constraint)
+    req.add_extensions(x509_extensions)
+    # Utilizes generateKey function to kick off key generation.
+    key = generateKey(TYPE_RSA, 2048)
+    req.set_pubkey(key)
+    req.sign(key, "sha1")
+    generateFiles(csrfile, req)
+    generateFiles(keyfile, key)
+    return req
 
 # Generate Private Key
 def generateKey(type, bits):
+
     key = crypto.PKey()
     key.generate_key(type, bits)
     return key
 
-
 # Generate .csr/key files.
 def generateFiles(mkFile, request):
+
     if mkFile == 'host.csr':
-        f = open(mkFile, "wb")
+        f = open(mkFile, "w")
         f.write(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request))
         f.close()
-
+        print crypto.dump_certificate_request(crypto.FILETYPE_PEM, request)
-        # print test
-        print(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request))
-
     elif mkFile == 'host.key':
-        f = open(mkFile, "wb")
+        f = open(mkFile, "w")
         f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, request))
         f.close()
     else:
-        print("Failed.")
+        print "Failed."
         exit()
 
 
 # Run Portion
-
 parser = argparse.ArgumentParser()
 parser.add_argument("name", help="Provide the FQDN", action="store")
 parser.add_argument("-s", "--san", help="SANS", action="store", nargs='*', default="")
@@ -130,4 +115,5 @@ args = parser.parse_args()
 
 hostname = args.name
 sans = args.san
+
 generateCSR(hostname, sans)