diff options
Diffstat (limited to 'conf/CA/bootstrap.sh')
-rw-r--r-- | conf/CA/bootstrap.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh index 56181246..fba4d6a8 100644 --- a/conf/CA/bootstrap.sh +++ b/conf/CA/bootstrap.sh @@ -9,11 +9,11 @@ chmod 755 certs newcerts touch index.txt echo "unique_subject = no" > index.txt.attr if [ ! -e ./serial ]; then - echo '01' > ./serial + echo $(date +%s) > ./serial fi NAME=aaf.bootstrap -FQDN=$(hostname -f) +FQDN="${HOSTNAME:=$(hostname -f)}" FQI=aaf@aaf.osaaf.org SUBJECT="/CN=$FQDN/OU=$FQI`cat subject.aaf`" SIGNER_P12=$1 @@ -29,6 +29,7 @@ BOOTSTRAP_CSR=/tmp/$NAME.csr BOOTSTRAP_CRT=/tmp/$NAME.crt BOOTSTRAP_CHAIN=/tmp/$NAME.chain BOOTSTRAP_P12=$NAME.p12 +BOOTSTRAP_ISSUER=$NAME.issuer # If Signer doesn't exist, create Self-Signed CA @@ -101,5 +102,15 @@ $PASSPHRASE $PASSPHRASE EOF +# Make Issuer name +ISSUER=$(openssl x509 -subject -noout -in $SIGNER_CRT | cut -c 10-) +for I in ${ISSUER//\// }; do + if [ -n "$CADI_X509_ISSUER" ]; then + CADI_X509_ISSUER=", $CADI_X509_ISSUER" + fi + CADI_X509_ISSUER="$I$CADI_X509_ISSUER" +done +echo $CADI_X509_ISSUER > $BOOTSTRAP_ISSUER + # Cleanup rm -f $BOOTSTRAP_SAN $BOOTSTRAP_KEY $BOOTSTRAP_CSR $BOOTSTRAP_CRT $BOOTSTRAP_CHAIN $SIGNER_KEY $SIGNER_CRT |