Untabify shell scripts

    find -type f -\( -executable -or -name '*.bash' -\) \
        -exec sed -i 's/\t/        /g' {} +

diff --git a/all b/all
index df13337fd37eb6155b2b76e3e75507454d76dfea..1157a75843107865f0000a207aa8cec31c5b99be 100755 (executable)
--- a/all
+++ b/all
@@ -5,29 +5,29 @@ date
 
 for arg in "$@"; do
     if [[ "$arg" == "root" ]]; then
-       echo "========== Generating Root ======="
-       ./clear
-       ./generateKeys
+        echo "========== Generating Root ======="
+        ./clear
+        ./generateKeys
     else
-       echo "========== Generating Year $arg ======="
-       ./generateTime "$arg"
-       echo "========== Generating Infra for Year $arg ======="
-       ./generateInfra "$arg"
-       echo "========== Generating CRLs for Year $arg ======="
-       ./generateCRLs "$arg"
-       
-       
-       echo "========== Verifying Year $arg ======="
-       ./verify "$arg"
-       
-       
-       echo "========== Collection things ======="
-       ./collectCRLs "$arg"
-       ./collectGigiConfig "$arg"
-       ./collectOffline "$arg"
-       ./collectSignerConfig "$arg"
-       
-       ./summary "$arg"
+        echo "========== Generating Year $arg ======="
+        ./generateTime "$arg"
+        echo "========== Generating Infra for Year $arg ======="
+        ./generateInfra "$arg"
+        echo "========== Generating CRLs for Year $arg ======="
+        ./generateCRLs "$arg"
+        
+        
+        echo "========== Verifying Year $arg ======="
+        ./verify "$arg"
+        
+        
+        echo "========== Collection things ======="
+        ./collectCRLs "$arg"
+        ./collectGigiConfig "$arg"
+        ./collectOffline "$arg"
+        ./collectSignerConfig "$arg"
+        
+        ./summary "$arg"
     fi
 done
 

diff --git a/collectCRLs b/collectCRLs
index d5c1d49ce554a2d7c0ac7e4609e5ca21d529d8e9..a8cd148249743285a6dd3cf1061b9f64be154a0c 100755 (executable)
--- a/collectCRLs
+++ b/collectCRLs
@@ -25,7 +25,7 @@ for month in {01..12}; do
     mkdir -p $BASE
     cp root.ca/${year}_${month}.crl $BASE/root.crl
     for ca in $STRUCT_CAS; do
-       cp $ca.ca/${year}_${month}.crl $BASE/$ca.crl
+        cp $ca.ca/${year}_${month}.crl $BASE/$ca.crl
     done
 done
 

diff --git a/collectGigiConfig b/collectGigiConfig
index 2e4092eff783ddd4848b0ade4a7698310264b865..bc769f5210e025fc983e3150a0e34f3c9a822385 100755 (executable)
--- a/collectGigiConfig
+++ b/collectGigiConfig
@@ -13,7 +13,7 @@ for ca in $STRUCT_CAS; do
     cp ${ca}.ca/key.crt gigi-config/config/ca/${ca}.crt
     [ "$ca" == "env" ] && continue
     for i in $TIME_IDX; do
-       cp ${year}/ca/${ca}_${year}_${i}.crt gigi-config/config/ca/${ca}_${year}_${i}.crt
+        cp ${year}/ca/${ca}_${year}_${i}.crt gigi-config/config/ca/${ca}_${year}_${i}.crt
     done
 done
 

diff --git a/collectSignerConfig b/collectSignerConfig
index 84ddfd9ba870d3213586442cd740db902290cded..66e7e5b1659a9f8d93d4f23918eae091bbca8cd3 100755 (executable)
--- a/collectSignerConfig
+++ b/collectSignerConfig
@@ -12,7 +12,7 @@ installCommKeys() { # peer (server,client)
     mkdir -p signer-config/keys
     cat ${year}/ca/env_${year}_1.ca/key.crt env.ca/key.crt root.ca/key.crt > signer-config/keys/ca.crt
     for file in signer_${peer}.{crt,key}; do
-       cp ${year}/keys/$file signer-config/keys/$file
+        cp ${year}/keys/$file signer-config/keys/$file
     done
 
 }
@@ -21,8 +21,8 @@ mkdir -p signer-config
 for ca in $STRUCT_CAS; do
     [ "$ca" == "env" ] && continue
     for i in $TIME_IDX; do
-       mkdir -p signer-config/ca/${ca}_${year}_${i}
-       cp ${year}/ca/${ca}_${year}_${i}.crt  signer-config/ca/${ca}_${year}_${i}/ca.crt
+        mkdir -p signer-config/ca/${ca}_${year}_${i}
+        cp ${year}/ca/${ca}_${year}_${i}.crt  signer-config/ca/${ca}_${year}_${i}/ca.crt
     done
 done
 
@@ -36,7 +36,7 @@ rm signer-config/keys/signer_*
 for ca in $STRUCT_CAS; do
     [ "$ca" == "env" ] && continue
     for i in $TIME_IDX; do
-       cp ${year}/ca/${ca}_${year}_${i}.key  signer-config/ca/${ca}_${year}_${i}/ca.key
+        cp ${year}/ca/${ca}_${year}_${i}.key  signer-config/ca/${ca}_${year}_${i}/ca.key
     done
 done
 

diff --git a/commonFunctions.bash b/commonFunctions.bash
index 1c1ffb18e7d0a02dd23a77c8e7158b7703e59d95..0d8b897869686aabec612d2ece4a93e5f114120e 100644 (file)
--- a/commonFunctions.bash
+++ b/commonFunctions.bash
@@ -30,9 +30,9 @@ caSign(){ # csr,ca,config,start,end
     echo "$start $end"
     pushd $2.ca > /dev/null
     if [[ "$2" == "root" && "$1" == root.* ]]; then
-       signkey="-selfsign"
+        signkey="-selfsign"
     else
-       signkey="-cert key.crt"
+        signkey="-cert key.crt"
     fi
     openssl ca $signkey -keyfile key.key -in "$BASE/$1.csr" -out "$BASE/$1.crt" -batch -config "$BASE/../selfsign.config" -extfile "$BASE/$3" $start $end
     popd > /dev/null

diff --git a/generateCRLs b/generateCRLs
index 0b2c14a79f9b425bd4652c024b3de08203961ac6..be4cf83499fb2d944e783dc0c4e0d17deea9eeec 100755 (executable)
--- a/generateCRLs
+++ b/generateCRLs
@@ -21,7 +21,7 @@ generateCRLs (){ #name start
     [[ "$2" == "" ]] && start=$(echo {01..12})
     [[ "$2" == "07" ]] && start=$(echo {07..12})
     for month in $start; do
-       generateCRL "$1" "$year" "$month"
+        generateCRL "$1" "$year" "$month"
     done
 }
 
@@ -29,17 +29,17 @@ generateYearCRLs (){ #name idx
     [[ "$2" == "1" ]] && start=$(echo {01..12})
     [[ "$2" == "2" ]] && start=$(echo {07..12})
     for month in $start; do
-       generateCRL "$1" "$year" "$month"
+        generateCRL "$1" "$year" "$month"
     done
     [[ "$2" == "1" ]] && start=$(echo {01..12})
     [[ "$2" == "2" ]] && start=$(echo {01..12})
     for month in $start; do
-       generateCRL "$1" "$((year+1))" "$month"
+        generateCRL "$1" "$((year+1))" "$month"
     done
     [[ "$2" == "1" ]] && return
     [[ "$2" == "2" ]] && start=$(echo {01..06})
     for month in $start; do
-       generateCRL "$1" "$((year+2))" "$month"
+        generateCRL "$1" "$((year+2))" "$month"
     done
 }
 generateCRLs root

diff --git a/generateHtdocs b/generateHtdocs
index 66d1a0a9ec859099e4a5dc2877fac69a8b3c7a76..99849d74284360b16ffc3060fa0ffd03bc6a3b6a 100755 (executable)
--- a/generateHtdocs
+++ b/generateHtdocs
@@ -18,7 +18,7 @@ done
 for ca in $STRUCT_CAS; do
     [[ "$ca" == "env" ]] && continue
     for i in $TIME_IDX; do
-       cp $year/ca/${ca}_${year}_${i}.crt htdocs/crt/g2/$year/${ca}-${i}.crt
+        cp $year/ca/${ca}_${year}_${i}.crt htdocs/crt/g2/$year/${ca}-${i}.crt
     done
 done
 

diff --git a/generateKeys b/generateKeys
index 23429cb845f53d8bdbdbd731ad9dfada0b6f0e2b..d978bfb95b6de4144713c1417f3baebb5a3b4209 100755 (executable)
--- a/generateKeys
+++ b/generateKeys
@@ -24,10 +24,10 @@ TESTCA
 rootSign(){ # csr
     POLICY=ca.cnf
     if [[ "$1" != "root" ]] ; then
-       KNAME=$1
-       POLICY=subca.cnf
-       . ../CAs/${KNAME}
-       cat <<TESTCA > subca.cnf
+        KNAME=$1
+        POLICY=subca.cnf
+        . ../CAs/${KNAME}
+        cat <<TESTCA > subca.cnf
 
 basicConstraints =critical, CA:true
 keyUsage =critical, keyCertSign, cRLSign

diff --git a/generateTime b/generateTime
index 5cabcbc425abe688bac4a0600ed287da710bd689..0eba4473de36c779bc1758d957f68493fb5eaaf6 100755 (executable)
--- a/generateTime
+++ b/generateTime
@@ -39,9 +39,9 @@ for i in $TIME_IDX; do
     point=${year}${points[${i}]}
     nextp=${points[$((${i} + 1))]}
     if [[ "$nextp" == "" ]]; then
-       epoint=$((${year} + 3 ))${epoints[${i}]}
+        epoint=$((${year} + 3 ))${epoints[${i}]}
     else
-       epoint=$((${year} + 2 ))${epoints[${i}]}
+        epoint=$((${year} + 2 ))${epoints[${i}]}
     fi
 
     . ../CAs/env
@@ -49,9 +49,9 @@ for i in $TIME_IDX; do
     genTimeCA $year/ca/env_${year}_${i}.ca/key env "$point" "$epoint"
     
     for ca in $STRUCT_CAS; do
-       [ "$ca" == "env" ] && continue
-       . ../CAs/$ca
-       genKey "/CN=$name ${year}-${i}" $year/ca/${ca}_${year}_${i}
-       genTimeCA $year/ca/${ca}_${year}_${i} $ca "$point" "$epoint"
+        [ "$ca" == "env" ] && continue
+        . ../CAs/$ca
+        genKey "/CN=$name ${year}-${i}" $year/ca/${ca}_${year}_${i}
+        genTimeCA $year/ca/${ca}_${year}_${i} $ca "$point" "$epoint"
     done
 done

diff --git a/verify b/verify
index 4239718e137513b15fb03367ac087bb0ad2f2bcc..eb1340403fde6731877f6a3cc103b485304a4db8 100755 (executable)
--- a/verify
+++ b/verify
@@ -19,14 +19,14 @@ error() { # message
 }
 
 verifyExtlist() { # ext
-       EXTLIST=`echo "$1" | grep "X509v3\|Authority Information" | sed "s/^[ \t]*//"`
-       BASIC=$2
-       if [[ $BASIC == "" ]]; then
-           BASIC="critical"
-       else
-           BASIC="critical, $BASIC"
-       fi
-       VAR="X509v3 extensions:
+        EXTLIST=`echo "$1" | grep "X509v3\|Authority Information" | sed "s/^[ \t]*//"`
+        BASIC=$2
+        if [[ $BASIC == "" ]]; then
+            BASIC="critical"
+        else
+            BASIC="critical, $BASIC"
+        fi
+        VAR="X509v3 extensions:
 X509v3 Basic Constraints: $BASIC
 X509v3 Key Usage: critical
 ${3}X509v3 Subject Key Identifier: 
@@ -34,7 +34,7 @@ X509v3 Authority Key Identifier:
 X509v3 CRL Distribution Points: 
 Authority Information Access: "
 
-       diff <(echo "$EXTLIST") <(echo "$VAR") || error "Extensions order is wrong for $ca"
+        diff <(echo "$EXTLIST") <(echo "$VAR") || error "Extensions order is wrong for $ca"
 
 }
 
@@ -51,27 +51,27 @@ done
 # Verify level-2 (time) structure
 for ca in ${STRUCT_CAS}; do
     for i in $TIME_IDX; do
-       . ../CAs/$ca
-       if [ "$ca" == "env" ]; then
-           CA_FILE=$year/ca/${ca}_${year}_${i}.ca/key.crt
-       else
-           CA_FILE=$year/ca/${ca}_${year}_${i}.crt
-       fi
-       time=${points[${i}]}
-       timestamp=$(date --date="${time:0:2}/${time:2:2}/${year} 03:00:00 UTC" +"%s")
-       verify "$CA_FILE" "$ca.ca/key.crt" "-attime ${timestamp}"
-       EXT=`openssl x509 -in "$CA_FILE" -noout -text`
-
-       verifyExtlist "$EXT"
-
-       echo "$EXT" | grep "Subject: " | grep "CN=$name" > /dev/null || error "Subject field did not verify"
-
-       echo "$EXT" | grep -A 2 "Basic Constraints" | grep "CA:TRUE" > /dev/null || error "Basic Constraints field is wrong for $ca"
-       echo "$EXT" | grep -A 2 "Key Usage" | grep "^ *Certificate Sign, CRL Sign$" > /dev/null || error "KeyUsage field is wrong for $ca"
-
-       echo "$EXT" | grep -A 4 "CRL Distribution" | grep "g2.crl.${DOMAIN}/g2/$ca.crl" > /dev/null || error "CRL field is wrong for $ca"
-       echo "$EXT" | grep "CA Issuers" | grep "/$ca.crt" | grep "g2.crt.${DOMAIN}/g2/" > /dev/null || error "CA Issuers field is wrong for $ca"
-       echo "$EXT" | grep "OCSP" | grep "http://g2.ocsp.${DOMAIN}" > /dev/null || error "OCSP field is wrong for $ca"
+        . ../CAs/$ca
+        if [ "$ca" == "env" ]; then
+            CA_FILE=$year/ca/${ca}_${year}_${i}.ca/key.crt
+        else
+            CA_FILE=$year/ca/${ca}_${year}_${i}.crt
+        fi
+        time=${points[${i}]}
+        timestamp=$(date --date="${time:0:2}/${time:2:2}/${year} 03:00:00 UTC" +"%s")
+        verify "$CA_FILE" "$ca.ca/key.crt" "-attime ${timestamp}"
+        EXT=`openssl x509 -in "$CA_FILE" -noout -text`
+
+        verifyExtlist "$EXT"
+
+        echo "$EXT" | grep "Subject: " | grep "CN=$name" > /dev/null || error "Subject field did not verify"
+
+        echo "$EXT" | grep -A 2 "Basic Constraints" | grep "CA:TRUE" > /dev/null || error "Basic Constraints field is wrong for $ca"
+        echo "$EXT" | grep -A 2 "Key Usage" | grep "^ *Certificate Sign, CRL Sign$" > /dev/null || error "KeyUsage field is wrong for $ca"
+
+        echo "$EXT" | grep -A 4 "CRL Distribution" | grep "g2.crl.${DOMAIN}/g2/$ca.crl" > /dev/null || error "CRL field is wrong for $ca"
+        echo "$EXT" | grep "CA Issuers" | grep "/$ca.crt" | grep "g2.crt.${DOMAIN}/g2/" > /dev/null || error "CA Issuers field is wrong for $ca"
+        echo "$EXT" | grep "OCSP" | grep "http://g2.ocsp.${DOMAIN}" > /dev/null || error "OCSP field is wrong for $ca"
     done
 done