mod'd crypto out,

clean'd up extra chars
pull/3/head
Ed Rantanen 2016-06-03 17:25:05 -04:00
parent 4ac7e43718
commit a1e823cc0e
1 changed files with 81 additions and 79 deletions

View File

@ -14,14 +14,11 @@
# Libraries/Modules # Libraries/Modules
from OpenSSL import crypto, SSL from OpenSSL import crypto, SSL
import subprocess
import os
import sys, shutil
import argparse import argparse
# Generate Certificate Signing Request (CSR) # Generate Certificate Signing Request (CSR)
def generateCSR(nodename, sans=[]): def generateCSR(nodename, sans=[]):
while True: while True:
C = input("Enter your Country Name (2 letter code) [US]: ") C = input("Enter your Country Name (2 letter code) [US]: ")
if len(C) != 2: if len(C) != 2:
@ -91,28 +88,33 @@ def generateCSR(nodename, sans = []):
# change to sha 256? # change to sha 256?
# req.sign(key, "sha1") # req.sign(key, "sha1")
req.sign(key, "sha256") req.sign(key, "sha256")
generateFiles(csrfile, req) generateFiles(csrfile, req)
generateFiles(keyfile, key) generateFiles(keyfile, key)
return req return req
# Generate Private Key # Generate Private Key
def generateKey(type, bits): def generateKey(type, bits):
key = crypto.PKey() key = crypto.PKey()
key.generate_key(type, bits) key.generate_key(type, bits)
return key return key
# Generate .csr/key files. # Generate .csr/key files.
def generateFiles(mkFile, request): def generateFiles(mkFile, request):
if mkFile == 'host.csr': if mkFile == 'host.csr':
f = open(mkFile, "w") f = open(mkFile, "wb")
f.write(str(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request))) f.write(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request))
f.close() f.close()
# print test
print(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request)) print(crypto.dump_certificate_request(crypto.FILETYPE_PEM, request))
elif mkFile == 'host.key': elif mkFile == 'host.key':
f = open(mkFile, "w") f = open(mkFile, "wb")
f.write(str(crypto.dump_privatekey(crypto.FILETYPE_PEM, request))) f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, request))
f.close() f.close()
else: else:
print("Failed.") print("Failed.")