UPD: better start+endtime for time-certs

diff --git a/doc/NRE.odt b/doc/NRE.odt
index c056bb6b46afd6656c2b0ddb6f0b08774abf3d74..3500a5ad5db07e6cbbe16cddb36dbbe819cc4354 100755 (executable)
Binary files a/doc/NRE.odt and b/doc/NRE.odt differ

diff --git a/generateTime.sh b/generateTime.sh
index 08032d40723871cb8b6d5c9d946ff20d8bd9bbc3..868ef9aa039da214eede4143e7f10151e98b8854 100755 (executable)
--- 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

diff --git a/structure b/structure
index 5677a36e6cab1b6af6f9b0ff962a2e722a957b63..3657f07a40fd6f4ad4501056eb617d07b92bd2b2 100755 (executable)
--- a/structure
+++ b/structure
@@ -11,4 +11,7 @@ TIME_IDX="1 2"
 points[1]="0101000000Z"
 points[2]="0601000000Z"
 
+epoints[1]="0605000000Z"
+epoints[2]="0105000000Z"
+
 ROOT_VALIDITY="-startdate 20150101000000Z -enddate 20300101000000Z"