X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=generateTime.sh;h=300d823857f7c2ab8a3eaae120fb926b7d99f4c7;hb=5f2fcabfa2e8a7e464955a1453ef12d666ccd4dc;hp=d18c2babb5a25513662bbdf73a9eb18451113352;hpb=2d5c169f43c88c0abedf60990b1fd622e8261b49;p=nre.git

diff --git a/generateTime.sh b/generateTime.sh
index d18c2ba..300d823 100755
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 . structure
 . commonFunctions
@@ -6,13 +6,18 @@
 [ "$1" == "" ] && echo "Usage: $0 <year>" && exit 1
 year=$1
 
+cd generated
+
 genTimeCA(){ #csr,ca to sign with,start,end
     cat <<TESTCA > timesubca.cnf
 basicConstraints = CA:true
-subjectKeyIdentifier = hash
 keyUsage = keyCertSign, cRLSign
-crlDistributionPoints=URI:http://g2.crl.cacert.org/g2/$2.crl
-authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/$2.crt
+
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always
+
+crlDistributionPoints=URI:http://g2.crl.${DOMAIN}/g2/$2.crl
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.${DOMAIN},caIssuers;URI:http://g2.crt.${DOMAIN}/g2/$2.crt
 TESTCA
     caSign $1 $2 timesubca.cnf "$3" "$4"
     rm timesubca.cnf
@@ -20,16 +25,24 @@ TESTCA
 
 mkdir -p $year/ca
 
-STARTDATE="${year:2}0101000000Z"
-ENDDATE="$((${year:2} + 2))0101000000Z"
 
-. CAs/env
-genca "/CN=$name ${year}-1" $year/ca/env_${year}_1
-genTimeCA $year/ca/env_${year}_1.ca/key env "$STARTDATE" "$ENDDATE"
+for i in $TIME_IDX; do
+    point=${year}${points[${i}]}
+    nextp=${points[$((${i} + 1))]}
+    if [[ "$nextp" == "" ]]; then
+	epoint=$((${year} + 3 ))${epoints[${i}]}
+    else
+	epoint=$((${year} + 2 ))${epoints[${i}]}
+    fi
 
-for ca in $STRUCT_CAS; do
-    [ "$ca" == "env" ] && continue
-    . CAs/$ca
-    genKey "/CN=$name ${year}-1" $year/ca/${ca}_${year}_1
-    genTimeCA $year/ca/${ca}_${year}_1 $ca "$STARTDATE" "$ENDDATE"
+    . ../CAs/env
+    genca "/CN=$name ${year}-${i}" $year/ca/env_${year}_${i}
+    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"
+    done
 done