X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=verify.sh;h=3890eb56e2e3aa80d5ed17ddc89a1709b93ab12b;hb=26af5d502565f10a3d3d91192e5545f59075ca59;hp=f698e0d372dfb7d97d197c9293116efd48c3a53e;hpb=50e191e92aee247a9c4393c24d98202e845fd419;p=nre.git

diff --git a/verify.sh b/verify.sh
index f698e0d..3890eb5 100755
--- a/verify.sh
+++ b/verify.sh
@@ -4,6 +4,7 @@ set -e
 year=$1
 
 . structure
+cd generated
 
 verify(){ # crt, [untrusted], additional
     untrusted="$2"
@@ -26,7 +27,7 @@ X509v3 Authority Key Identifier:
 X509v3 CRL Distribution Points: 
 Authority Information Access: "
 
-	diff <(echo "$EXTLIST" | dos2unix) <(echo "$VAR" | dos2unix) || error "Extensions order is wrong for $ca"
+	diff <(echo "$EXTLIST") <(echo "$VAR") || error "Extensions order is wrong for $ca"
 
 }
 
@@ -43,7 +44,7 @@ done
 # Verify level-2 (time) structure
 for ca in ${STRUCT_CAS}; do
     for i in $TIME_IDX; do
-	. CAs/$ca
+	. ../CAs/$ca
 	if [ "$ca" == "env" ]; then
 	    CA_FILE=$year/ca/${ca}_${year}_${i}.ca/key.crt
 	else
@@ -61,9 +62,9 @@ for ca in ${STRUCT_CAS}; do
 	echo "$EXT" | grep -A 2 "Basic Constraints" | grep "CA:TRUE" > /dev/null || error "Basic Constraints field is wrong for $ca"
 	echo "$EXT" | grep -A 2 "Key Usage" | grep "^ *Certificate Sign, CRL Sign$" > /dev/null || error "KeyUsage field is wrong for $ca"
 
-	echo "$EXT" | grep -A 4 "CRL Distribution" | grep "g2.crl.cacert.org/g2/$ca.crl" > /dev/null || error "CRL field is wrong for $ca"
-	echo "$EXT" | grep "CA Issuers" | grep "/$ca.crt" | grep "g2.crt.cacert.org/g2/" > /dev/null || error "CA Issuers field is wrong for $ca"
-	echo "$EXT" | grep "OCSP" | grep "http://g2.ocsp.cacert.org" > /dev/null || error "OCSP field is wrong for $ca"
+	echo "$EXT" | grep -A 4 "CRL Distribution" | grep "g2.crl.${DOMAIN}/g2/$ca.crl" > /dev/null || error "CRL field is wrong for $ca"
+	echo "$EXT" | grep "CA Issuers" | grep "/$ca.crt" | grep "g2.crt.${DOMAIN}/g2/" > /dev/null || error "CA Issuers field is wrong for $ca"
+	echo "$EXT" | grep "OCSP" | grep "http://g2.ocsp.${DOMAIN}" > /dev/null || error "OCSP field is wrong for $ca"
     done
 done