From 21017b8cdabd92d4f2dd9bd5120847763da1bcf5 Mon Sep 17 00:00:00 2001
From: Courtney C <courtneycotton@berkeley.edu>
Date: Mon, 13 Jul 2015 09:30:29 -0700
Subject: [PATCH] Updated prompt to mirror open-ssl

---
 csrgen.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 csrgen.py

diff --git a/csrgen.py b/csrgen.py
old mode 100644
new mode 100755
index 7afa723..e8623b8
--- a/csrgen.py
+++ b/csrgen.py
@@ -7,7 +7,7 @@
 # certificate and request are generated.  This can be acheived by adding -s.
 # Usage: csrgen <hostname> -s <san0> <san1>
 #
-# Author: Courtney Cotton <me@cottoncourtney.com> 06-25-2014
+# Author: Courtney Cotton <cotton@cottoncourtney.com> 06-25-2014
 
 # Libraries/Modules
 from OpenSSL import crypto, SSL
@@ -17,11 +17,11 @@ import argparse
 # Generate Certificate Signing Request (CSR)
 def generateCSR(nodename, sans = []):
 
-    C  = raw_input('Enter your country: ')
-    ST = raw_input("Enter your state: ")
-    L  = raw_input("Enter your location: ")
-    O  = raw_input("Enter your organization: ")
-    OU = raw_input("Enter your organizational unit: ")
+    C  = raw_input("Enter your Country Name (2 letter code) [US]: ")
+    ST = raw_input("Enter your State or Province <full name> []:California: ")
+    L  = raw_input("Enter your (Locality Name (eg, city) []:San Francisco: ")
+    O  = raw_input("Enter your Organization Name (eg, company) []:FTW Enterprise: ")
+    OU = raw_input("Enter your Organizational Unit (eg, section) []:IT: ")
 
     # Allows you to permanently set values required for CSR
     # To use, comment raw_input and uncomment this section.