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

diff --git a/generateTime.sh b/generateTime.sh
index d18c2ba..0b0b0b4 100755
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 . structure
 . commonFunctions
@@ -9,8 +9,11 @@ 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
 TESTCA
@@ -20,16 +23,20 @@ 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"
+STARTDATE="${year}"
+ENDDATE="$((${year} + 3))"
 
-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"
+for i in $TIME_IDX; do
+    point=${points[${i}]}
+    . 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"
+    
+    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"
+    done
 done