Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Servlet Sample
[aaf/authz.git]
/
conf
/
CA
/
bootstrap.sh
diff --git
a/conf/CA/bootstrap.sh
b/conf/CA/bootstrap.sh
index
fba4d6a
..
9699e30
100644
(file)
--- a/
conf/CA/bootstrap.sh
+++ b/
conf/CA/bootstrap.sh
@@
-9,7
+9,7
@@
chmod 755 certs newcerts
touch index.txt
echo "unique_subject = no" > index.txt.attr
if [ ! -e ./serial ]; then
touch index.txt
echo "unique_subject = no" > index.txt.attr
if [ ! -e ./serial ]; then
- echo $(date +%s) > ./serial
+ echo $(date +%s)
_$(shuf -i 0-1000000 -n 1)
> ./serial
fi
NAME=aaf.bootstrap
fi
NAME=aaf.bootstrap
@@
-64,8
+64,19
@@
fi
# SANS
cp san.conf $BOOTSTRAP_SAN
# SANS
cp san.conf $BOOTSTRAP_SAN
+SANS=$FQDN
+if [ "$FQDN" -ne "$HOSTNAME" ]; then
+ SANS="$SANS $HOSTNAME"
+fi
+
+for ROOT in $(cat san_root.aaf); do
+ SANS="$SANS $ROOT"
+ for C in service locate oauth gui cm hello; do
+ SANS="$SANS $C.$ROOT"
+ done
+done
NUM=1
NUM=1
-for D in $
FQDN aaf.osaaf.org service.aaf.osaaf.org locate.aaf.osaaf.org oauth.aaf.osaaf.org gui.aaf.osaaf.org cm.aaf.osaaf.org hello.aaf.osaaf.org
; do
+for D in $
SANS
; do
echo "DNS.$NUM = $D" >> $BOOTSTRAP_SAN
NUM=$((NUM+1))
done
echo "DNS.$NUM = $D" >> $BOOTSTRAP_SAN
NUM=$((NUM+1))
done
@@
-81,7
+92,7
@@
echo Sign it
openssl ca -batch -config openssl.conf -extensions server_cert \
-cert $SIGNER_CRT -keyfile $SIGNER_KEY \
-policy policy_loose \
openssl ca -batch -config openssl.conf -extensions server_cert \
-cert $SIGNER_CRT -keyfile $SIGNER_KEY \
-policy policy_loose \
- -days
90
\
+ -days
365
\
-passin stdin \
-out $BOOTSTRAP_CRT \
-extfile $BOOTSTRAP_SAN \
-passin stdin \
-out $BOOTSTRAP_CRT \
-extfile $BOOTSTRAP_SAN \
@@
-94,8
+105,10
@@
EOF
cat $BOOTSTRAP_CRT
cp $BOOTSTRAP_CRT $BOOTSTRAP_CHAIN
cat $SIGNER_CRT >> $BOOTSTRAP_CHAIN
cat $BOOTSTRAP_CRT
cp $BOOTSTRAP_CRT $BOOTSTRAP_CHAIN
cat $SIGNER_CRT >> $BOOTSTRAP_CHAIN
+cat $BOOTSTRAP_CHAIN
# Note: Openssl will pickup and load all Certs in the Chain file
# Note: Openssl will pickup and load all Certs in the Chain file
+#openssl pkcs12 -name $FQI -export -in $BOOTSTRAP_CRT -inkey $BOOTSTRAP_KEY -CAfile $SIGNER_CRT -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
openssl pkcs12 -name $FQI -export -in $BOOTSTRAP_CHAIN -inkey $BOOTSTRAP_KEY -out $BOOTSTRAP_P12 -passin stdin -passout stdin << EOF
$PASSPHRASE
$PASSPHRASE
@@
-113,4
+126,4
@@
done
echo $CADI_X509_ISSUER > $BOOTSTRAP_ISSUER
# Cleanup
echo $CADI_X509_ISSUER > $BOOTSTRAP_ISSUER
# Cleanup
-rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $
BOOTSTRAP_CHAIN $SIGNER_KEY $SIGNER_CRT
+rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $
SIGNER_KEY $SIGNER_CRT $BOOTSTRAP_CHAIN