X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=generateTime.sh;h=300d823857f7c2ab8a3eaae120fb926b7d99f4c7;hb=21a8fdc3409fbdd05342e95f507d8eab8609c710;hp=572d27dba70878c72ff8a293c367313c50ceae91;hpb=6ba8d258f7f3601d8e0be4425f790210b4ea4a87;p=nre.git

diff --git a/generateTime.sh b/generateTime.sh
index 572d27d..300d823 100755
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -6,13 +6,18 @@
 [ "$1" == "" ] && echo "Usage: $0 <year>" && exit 1
 year=$1
 
+cd generated
+
 genTimeCA(){ #csr,ca to sign with,start,end
     cat <<TESTCA > timesubca.cnf
 basicConstraints = CA:true
-subjectKeyIdentifier = hash
 keyUsage = keyCertSign, cRLSign
-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
+
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always
+
+crlDistributionPoints=URI:http://g2.crl.${DOMAIN}/g2/$2.crl
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.${DOMAIN},caIssuers;URI:http://g2.crt.${DOMAIN}/g2/$2.crt
 TESTCA
     caSign $1 $2 timesubca.cnf "$3" "$4"
     rm timesubca.cnf
@@ -21,19 +26,23 @@ TESTCA
 mkdir -p $year/ca
 
 
-STARTDATE="${year:2}"
-ENDDATE="$((${year:2} + 2))"
-
 for i in $TIME_IDX; do
-    point=${points[${i}]}
-    . CAs/env
+    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
+	. ../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