X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=generateTime.sh;h=868ef9aa039da214eede4143e7f10151e98b8854;hb=84bd06f38d265392a8681ca73970b2e62fad46a9;hp=08032d40723871cb8b6d5c9d946ff20d8bd9bbc3;hpb=55355f3aec3de71308daa0fa94b18ea5d5ea201a;p=nre.git

diff --git a/generateTime.sh b/generateTime.sh
index 08032d4..868ef9a 100755
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -24,19 +24,23 @@ TESTCA
 mkdir -p $year/ca
 
 
-STARTDATE="${year}"
-ENDDATE="$((${year} + 3))"
-
 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