several fixes on certificate profiles

diff --git a/generateInfra.sh b/generateInfra.sh
index e6b74fb944dbd8126ad071e20159494595c95eee..b283220bf3202f607d6c4726d7f212c88306f495 100755 (executable)
--- a/generateInfra.sh
+++ b/generateInfra.sh
@@ -10,7 +10,7 @@ year=$1
 
 CRL="
 crlDistributionPoints=URI:http://g2.crl.cacert.org/g2/$year/env-1.crl
-authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/$year/env-1.crt"
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/g2/$year/env-1.crt"
 
 cat <<TESTCA > req.cnf
 basicConstraints = critical,CA:false

diff --git a/generateKeys.sh b/generateKeys.sh
index cf0fcad7a2aa7cd83b7652b2dc7617af68943fa6..4dd87a2bbc1fd16b7bc0e8b15f5c80945625cfef 100755 (executable)
--- a/generateKeys.sh
+++ b/generateKeys.sh
@@ -15,7 +15,7 @@ subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid:always
 
 crlDistributionPoints=URI:http://g2.crl.cacert.org/g2/root.crl
-authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/root.crt
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/g2/root.crt
 TESTCA
 
 cat <<TESTCA > subca.cnf
@@ -26,7 +26,7 @@ subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid:always
 
 crlDistributionPoints=URI:http://g2.crl.cacert.org/g2/root.crl
-authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/root.crt
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/g2/root.crt
 TESTCA
 
 

diff --git a/generateTime.sh b/generateTime.sh
index 0b0b0b4e8da46018c3e05aa1392635824acb166a..08032d40723871cb8b6d5c9d946ff20d8bd9bbc3 100755 (executable)
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -15,7 +15,7 @@ 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
+authorityInfoAccess = OCSP;URI:http://g2.ocsp.cacert.org,caIssuers;URI:http://g2.crt.cacert.org/g2/$2.crt
 TESTCA
     caSign $1 $2 timesubca.cnf "$3" "$4"
     rm timesubca.cnf

diff --git a/structure b/structure
index 27927c249a4593d4ba694f66a480f2c41fe20c15..5677a36e6cab1b6af6f9b0ff962a2e722a957b63 100755 (executable)
--- a/structure
+++ b/structure
@@ -6,7 +6,7 @@ PRIVATEPW="changeit"
 [ -f config ] && . ./config
 
 STRUCT_CAS="env unassured assured codesign orga orgaSign"
-SERVER_KEYS="api secure www static signer_server signer_client"
+SERVER_KEYS="api secure www static signer_server signer_client mail"
 TIME_IDX="1 2"
 points[1]="0101000000Z"
 points[2]="0601000000Z"