mod'd crypto out,

clean'd up extra chars

csrgen.py

@@ -14,14 +14,11 @@
 
 # Libraries/Modules
 from OpenSSL import crypto, SSL
-import subprocess
-import os
-import sys, shutil
 import argparse
 
-# Generate Certificate Signing Request (CSR)
-def generateCSR(nodename, sans = []):
 
+# Generate Certificate Signing Request (CSR)
+def generateCSR(nodename, sans=[]):
     while True:
         C = input("Enter your Country Name (2 letter code) [US]: ")
         if len(C) != 2:
@@ -29,19 +26,19 @@ def generateCSR(nodename, sans = []):
             continue
         ST = input("Enter your State or Province <full name> []:California: ")
         if len(ST) == 0:
-      print( "Please enter your State or Province.")
+            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.")
+            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.")
+            print("Please enter your Organization Name.")
             continue
-    OU =input("Enter your Organizational Unit (eg, section) []:IT: ")
+        OU = input("Enter your Organizational Unit (eg, section) []:IT: ")
         if len(OU) == 0:
-      print( "Please enter your OU.")
+            print("Please enter your OU.")
             continue
 
         # Allows you to permanently set values required for CSR
@@ -88,31 +85,36 @@ def generateCSR(nodename, sans = []):
         key = generateKey(TYPE_RSA, 2048)
         req.set_pubkey(key)
 
-    #change to sha 256?
-    #req.sign(key, "sha1")
+        # change to sha 256?
+        # req.sign(key, "sha1")
         req.sign(key, "sha256")
+
         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, "w")
-        f.write(str(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request)))
+        f = open(mkFile, "wb")
+        f.write(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request))
         f.close()
+
+        # print test
         print(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request))
+
     elif mkFile == 'host.key':
-        f = open(mkFile, "w")
-        f.write(str(crypto.dump_privatekey(crypto.FILETYPE_PEM, request)))
+        f = open(mkFile, "wb")
+        f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, request))
         f.close()
     else:
         print("Failed.")