From b8a8129f13ba7a986b4937ff64645e466078a003 Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Thu, 23 Aug 2018 16:32:45 -0500
Subject: Bootstrap Test fixes

Issue-ID: AAF-419
Change-Id: I042c270498463b6eb853b0e3e496f49232868fb7
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 conf/CA/.gitignore   |  4 ++++
 conf/CA/bootstrap.sh | 44 +++++++++++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 conf/CA/.gitignore

(limited to 'conf/CA')

diff --git a/conf/CA/.gitignore b/conf/CA/.gitignore
new file mode 100644
index 00000000..ee117ccf
--- /dev/null
+++ b/conf/CA/.gitignore
@@ -0,0 +1,4 @@
+aaf.bootstrap.p12
+index.txt*
+newcerts/
+serial*
diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh
index ea7a23ec..20093ee3 100644
--- a/conf/CA/bootstrap.sh
+++ b/conf/CA/bootstrap.sh
@@ -3,8 +3,14 @@
 # Removed Variables so it can be run for AutoDeployments
 #
 echo "Bootstrap AAF Certificate"
+mkdir -p private certs newcerts
+chmod 700 private
+chmod 755 certs newcerts
+touch index.txt
+echo "unique_subject = no" > index.txt.attr
+
 NAME=aaf.bootstrap
-FQDN=$(uname -n)
+FQDN=$(hostname -f)
 FQI=aaf@aaf.osaaf.org
 SUBJECT="/CN=$FQDN/OU=$FQI`cat subject.aaf`"
 SIGNER_P12=$1
@@ -18,6 +24,7 @@ BOOTSTRAP_SAN=/tmp/$NAME.san
 BOOTSTRAP_KEY=/tmp/$NAME.key
 BOOTSTRAP_CSR=/tmp/$NAME.csr
 BOOTSTRAP_CRT=/tmp/$NAME.crt
+BOOTSTRAP_CHAIN=/tmp/$NAME.chain
 BOOTSTRAP_P12=$NAME.p12
 
 
@@ -25,8 +32,10 @@ BOOTSTRAP_P12=$NAME.p12
 if [ ! -e "$SIGNER_P12"  ]; then
   # Creating Signer CA
   openssl req -config openssl.conf -x509 -sha256 -extensions v3_ca \
-    -newkey rsa:4096 -nodes -subj /CN="RootCA$(cat subject.aaf)" \
-    -keyout $SIGNER_KEY -out $SIGNER_CRT -days 365
+    -newkey rsa:4096 -subj /CN="Signer$(cat subject.aaf)" \
+    -keyout $SIGNER_KEY -out $SIGNER_CRT -days 365 -passout stdin << EOF
+$PASSPHRASE
+EOF
 
   # Move to P12 (Signer)
   openssl pkcs12 -name RootCA -export -in $SIGNER_CRT -inkey $SIGNER_KEY -out $SIGNER_P12 -passin stdin -passout stdin << EOF
@@ -58,31 +67,36 @@ for D in $FQDN aaf.osaaf.org service.aaf.osaaf.org locate.aaf.osaaf.org oauth.aa
 done
 
 # Create CSR
-openssl req -new -newkey rsa:2048 -sha256 -nodes -keyout $BOOTSTRAP_KEY \
-	-out $BOOTSTRAP_CSR -outform PEM -subj "$SUBJECT" 
-	#-passout stdin  << EOF
-#$PASSPHRASE
-#EOF
+openssl req -new -newkey rsa:2048 -nodes -keyout $BOOTSTRAP_KEY \
+	-out $BOOTSTRAP_CSR -outform PEM -subj "$SUBJECT" \
+	-passout stdin  << EOF
+$PASSPHRASE
+EOF
 
-ls -l BOOTSTRAP_CSR  $BOOTSTRAP_CSR
-# Sign it
-openssl ca -batch -config openssl.conf -extensions server_cert -out $BOOTSTRAP_CRT \
+echo Sign it
+openssl ca -batch -config openssl.conf -extensions server_cert \
 	-cert $SIGNER_CRT -keyfile $SIGNER_KEY \
 	-policy policy_loose \
 	-days 90 \
+	-passin stdin \
+	-out $BOOTSTRAP_CRT \
 	-extfile $BOOTSTRAP_SAN \
-	-infiles $BOOTSTRAP_CSR 
+	-infiles $BOOTSTRAP_CSR << EOF
+$PASSPHRASE
+EOF
 
 # Make a P12
 # Add THIS Intermediate CA into chain
-cat $SIGNER_CRT >> $BOOTSTRAP_CRT
+cat $BOOTSTRAP_CRT
+cp $BOOTSTRAP_CRT $BOOTSTRAP_CHAIN
+cat $SIGNER_CRT >> $BOOTSTRAP_CHAIN
 
 # Note: Openssl will pickup and load all Certs in the Chain file
-openssl pkcs12 -name $FQI -export -in $BOOTSTRAP_CRT -inkey $BOOTSTRAP_KEY -out $BOOTSTRAP_P12 -passin stdin -passout stdin << EOF
+openssl pkcs12 -name $FQI -export -in $BOOTSTRAP_CHAIN -inkey $BOOTSTRAP_KEY -out $BOOTSTRAP_P12 -passin stdin -passout stdin << EOF
 $PASSPHRASE
 $PASSPHRASE
 $PASSPHRASE
 EOF
 
 # Cleanup
-rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $SIGNER_KEY $SIGNER_CRT 
+rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $BOOTSTRAP_CHAIN $SIGNER_KEY $SIGNER_CRT 
-- 
cgit 1.2.3-korg