upd: change times to meet criteria from RFC5280

[nre.git] / generateTime

diff --git a/generateTime b/generateTime
index 6f2572dee22e034ac92f5c22d08cdfeb56ded04d..f59fc70b867308e59e53314bbdaed3af00e1bebd 100755 (executable)
--- a/generateTime
+++ b/generateTime
@@ -36,14 +36,31 @@ mkdir -p $year/ca
 
 
 for i in "${TIME_IDX[@]}"; do
-    point=${year}${points[${i}]}
     nextp=${points[$((${i} + 1))]}
+    # adjustment of year according to RFC 5280 GeneralizedTime (>=2050) and UTCTime (<2050)
+    if (( year >= 2050 )); then
+        yearT=$year
+    else
+        yearT=$((year - 2000))
+    fi
+
+   point=${yearT}${points[${i}]}
+
     if [[ "$nextp" == "" ]]; then
-        epoint=$((${year} + 3 ))${epoints[${i}]}
+        eyear=$(( year + 3 ))
     else
-        epoint=$((${year} + 2 ))${epoints[${i}]}
+        eyear=$(( year + 2 ))
     fi
 
+    if (( eyear >= 2050 )); then
+        eyearT=$eyear
+    else
+        eyearT=$((eyear - 2000))
+    fi
+
+
+    epoint=${eyearT}${epoints[${i}]}
+
     for ca in "${STRUCT_CAS[@]}"; do
         . ../CAs/$ca
         genKey "/CN=$name ${year}-${i}" $year/ca/${ca}_${year}_${i}