move generated to own folder + permissions

diff --git a/.gitignore b/.gitignore
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/CAs/assured b/CAs/assured
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/CAs/codesign b/CAs/codesign
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/CAs/env b/CAs/env
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/CAs/orga b/CAs/orga
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/CAs/orgaSign b/CAs/orgaSign
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/CAs/unassured b/CAs/unassured
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/README.md b/README.md
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/all.sh b/all.sh
index ee5f596ab97acdfe18f811f8b87c4affff189c3a..32c98c6533227ea763d2aa0ae28caeb961a39110 100755 (executable)
--- a/all.sh
+++ b/all.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-. ./clear.sh
+./clear.sh
 
 echo "========== Generating Root ======="
-. ./generateKeys.sh
+./generateKeys.sh
 
 echo "========== Generating Year 2015 ======="
-. ./generateTime.sh 2015
+./generateTime.sh 2015
 echo "========== Generating Infra for Year 2015 ======="
-. ./generateInfra.sh 2015
+./generateInfra.sh 2015
 echo "========== Generating CRLs for Year 2015 ======="
-. ./generateCRLs.sh 2015
+./generateCRLs.sh 2015
 
 
 echo "========== Verifying Year 2015 ======="
-. ./verify.sh 2015
+./verify.sh 2015

diff --git a/clear.sh b/clear.sh
index 7e792dc61e1db34ff8b5a84d44601cc734dee2e6..115cfd9d7826b036725d7abd5dc7f5d72ea544c0 100755 (executable)
--- a/clear.sh
+++ b/clear.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-rm -Rf *.csr *.crt *.key *.pkcs12 *.ca *.crl 2015
+rm -R generated
+

diff --git a/collectCRLs.sh b/collectCRLs.sh
index ae2768ea90fa27e942f70dd7a1921d447103c37a..82a9ec1f0d2f23d0882c186a35ca512146d6a735 100755 (executable)
--- a/collectCRLs.sh
+++ b/collectCRLs.sh
@@ -7,6 +7,7 @@ year=$1
 
 . structure
 . commonFunctions
+cd generated
 
 fetchCRLS(){ #year, cyear month timeIdx
     year=$1

diff --git a/collectOffline.sh b/collectOffline.sh
index 9cda2e7b90ef4a0d66d38b7e7631d8d093316cf6..c5715a8ceb5738fc00026738cf17fb8e0749def9 100755 (executable)
--- a/collectOffline.sh
+++ b/collectOffline.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+cd generated
+
 tar cz *.ca | openssl enc -e -kfile <(echo 1234) -md sha256 -aes-256-cbc > offline.tar.gz.aes-256-cbc

diff --git a/collectSignerConfig.sh b/collectSignerConfig.sh
index 8a5921c73f29d8efbdd726f8de2e0e390653cf90..369d1b89560841f097aa5830573ef9e923ce981e 100755 (executable)
--- a/collectSignerConfig.sh
+++ b/collectSignerConfig.sh
@@ -5,6 +5,7 @@ set -e
 year=$1
 
 . structure
+cd generated
 
 installCommKeys() { # peer (server,client)
     peer="$1"
@@ -27,7 +28,7 @@ done
 
 installCommKeys client
 
-tar czf signer-client-$year.tar.gz profiles -C signer-config keys ca
+tar czf signer-client-$year.tar.gz -C .. profiles -C generated/signer-config keys ca
 
 # Updating for server
 rm signer-config/keys/signer_*
@@ -41,6 +42,6 @@ done
 
 installCommKeys server
 
-tar czf signer-server-$year.tar.gz profiles -C signer-config keys ca
+tar czf signer-server-$year.tar.gz -C .. profiles -C generated/signer-config keys ca
 
 rm -R signer-config

diff --git a/commonFunctions b/commonFunctions
old mode 100755 (executable)
new mode 100644 (file)
index 354e1c3..168c610
--- a/commonFunctions
+++ b/commonFunctions
@@ -34,7 +34,7 @@ caSign(){ # csr,ca,config,start,end
     else
        signkey="-cert key.crt"
     fi
-    openssl ca $signkey -keyfile key.key -in "$BASE/$1.csr" -out "$BASE/$1.crt" -batch -config "$BASE/selfsign.config" -extfile "$BASE/$3" $start $end
+    openssl ca $signkey -keyfile key.key -in "$BASE/$1.csr" -out "$BASE/$1.crt" -batch -config "$BASE/../selfsign.config" -extfile "$BASE/$3" $start $end
     popd > /dev/null
     echo "Signed"
 }

diff --git a/doc/NRE.odt b/doc/NRE.odt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/generateCRLs.sh b/generateCRLs.sh
index d2831e1a14bf9739c86d079114b63ea6dbec5d1e..952d7576a9d959a59cda2215e7d511e2f3c205e3 100755 (executable)
--- a/generateCRLs.sh
+++ b/generateCRLs.sh
@@ -7,12 +7,13 @@ year=$1
 
 . structure
 . commonFunctions
+cd generated
 
 generateCRL() { # name, year, month
     echo CRL $1 $2-$3
     BASE="$PWD"
     pushd $1.ca > /dev/null
-    TZ=UTC LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 FAKETIME="${year}-${month}-01 00:00:00" openssl ca -gencrl -config "$BASE/selfsign.config" -keyfile key.key -cert key.crt -crldays 35 -out $2_$3.crl
+    TZ=UTC LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 FAKETIME="${year}-${month}-01 00:00:00" openssl ca -gencrl -config "$BASE/../selfsign.config" -keyfile key.key -cert key.crt -crldays 35 -out $2_$3.crl
     popd > /dev/null
 }
 

diff --git a/generateHtdocs.sh b/generateHtdocs.sh
index 328c509c0a5ab08d47efa814f1eda2b3747600e9..53d67fdbe0fab5ddbcfab4aca30fdd2c48bb8d3d 100755 (executable)
--- a/generateHtdocs.sh
+++ b/generateHtdocs.sh
@@ -4,6 +4,8 @@
 [[ "$1" == "" ]] && echo "Usage: $0 <year>" && exit 1
 year=$1
 
+cd generated
+
 mkdir -p htdocs/crt/g2/$year
 
 for ca in root $STRUCT_CAS; do
@@ -19,3 +21,6 @@ for ca in $STRUCT_CAS; do
        cp $year/ca/${ca}_${year}_${i}.crt htdocs/crt/g2/$year/${ca}-${year}-${i}.crt
     done
 done
+
+tar czf htdocs.tgz htdocs
+rm -R htdocs

diff --git a/generateInfra.sh b/generateInfra.sh
index 76a6eeed297838a5d3183dd5d6a84ac94017f9c9..012e6b70feb8e63c87c0f5d2d96bdf78351e3815 100755 (executable)
--- a/generateInfra.sh
+++ b/generateInfra.sh
@@ -8,6 +8,8 @@ year=$1
 . structure
 . commonFunctions
 
+cd generated
+
 CRL="
 crlDistributionPoints=URI:http://g2.crl.${DOMAIN}/g2/$year/env-1.crl
 authorityInfoAccess = OCSP;URI:http://g2.ocsp.${DOMAIN},caIssuers;URI:http://g2.crt.${DOMAIN}/g2/$year/env-1.crt"

diff --git a/generateKeys.sh b/generateKeys.sh
index d1b15ca1737b2b1217f2ac9941e4d3b208388d53..d5d4750d30cb57d6f43f66f86b418a199395ac7d 100755 (executable)
--- a/generateKeys.sh
+++ b/generateKeys.sh
@@ -5,6 +5,8 @@ set -e
 . structure
 . commonFunctions
 
+mkdir -p generated
+cd generated
 
 ####### create various extensions files for the various certificate types ######
 cat <<TESTCA > ca.cnf
@@ -42,7 +44,7 @@ rootSign root
 
 # generate the various sub-CAs
 for ca in $STRUCT_CAS; do
-    . CAs/$ca
+    . ../CAs/$ca
     genca "/CN=$name" $ca
     rootSign $ca
 done

diff --git a/generateTime.sh b/generateTime.sh
index 3496c74e45455cec1bf8de1c637238e84e6dd865..300d823857f7c2ab8a3eaae120fb926b7d99f4c7 100755 (executable)
--- a/generateTime.sh
+++ b/generateTime.sh
@@ -6,6 +6,8 @@
 [ "$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
@@ -33,13 +35,13 @@ for i in $TIME_IDX; do
        epoint=$((${year} + 2 ))${epoints[${i}]}
     fi
 
-    . CAs/env
+    . ../CAs/env
     genca "/CN=$name ${year}-${i}" $year/ca/env_${year}_${i}
     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 "$point" "$epoint"
     done

diff --git a/selfsign.config b/selfsign.config
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/structure b/structure
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/verify.sh b/verify.sh
index 9b6f5f22bd1fcf2778f1f6541287d753ac3fd60c..5f02f99a2adc3bf7dbbd9f6564f95ce242918f86 100755 (executable)
--- a/verify.sh
+++ b/verify.sh
@@ -4,6 +4,7 @@ set -e
 year=$1
 
 . structure
+cd generated
 
 verify(){ # crt, [untrusted], additional
     untrusted="$2"
@@ -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