X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=generateTime.sh;h=868ef9aa039da214eede4143e7f10151e98b8854;hb=84bd06f38d265392a8681ca73970b2e62fad46a9;hp=71aa918f08ca896f6c46d9bb5e05c6ece7b223d4;hpb=0d0307980a0f183c5ee3e73184593b1ed9640e1e;p=nre.git

diff --git a/generateTime.sh b/generateTime.sh
index 71aa918..868ef9a 100755
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -9,10 +9,13 @@ year=$1
 genTimeCA(){ #csr,ca to sign with,start,end
     cat <<TESTCA > timesubca.cnf
 basicConstraints = CA:true
-subjectKeyIdentifier = hash
 keyUsage = keyCertSign, cRLSign
+
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always
+
 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
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/g2/$2.crt
 TESTCA
     caSign $1 $2 timesubca.cnf "$3" "$4"
     rm timesubca.cnf
@@ -21,19 +24,23 @@ TESTCA
 mkdir -p $year/ca
 
 
-STARTDATE="${year}"
-ENDDATE="$((${year} + 2))"
-
 for i in $TIME_IDX; do
-    point=${points[${i}]}
+    point=${year}${points[${i}]}
+    nextp=${points[$((${i} + 1))]}
+    if [[ "$nextp" == "" ]]; then
+	epoint=$((${year} + 3 ))${epoints[${i}]}
+    else
+	epoint=$((${year} + 2 ))${epoints[${i}]}
+    fi
+
     . CAs/env
     genca "/CN=$name ${year}-${i}" $year/ca/env_${year}_${i}
-    genTimeCA $year/ca/env_${year}_${i}.ca/key env "$STARTDATE$point" "$ENDDATE$point"
+    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 "$STARTDATE$point" "$ENDDATE$point"
+	genTimeCA $year/ca/${ca}_${year}_${i} $ca "$point" "$epoint"
     done
 done