From: Felix Dörre <felix@dogcraft.de>
Date: Wed, 25 Jun 2014 16:18:41 +0000 (+0200)
Subject: Adding key-generation to autotest
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=d1d65cf8d10e92d7ef3ab5812a145925bd8e63d1

Adding key-generation to autotest
---

diff --git a/build.xml b/build.xml
index e2ff5c10..8a89b89d 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,17 @@
             <classpath refid="cacert-gigi.classpath"/>
         </java>
     </target>
-    <target name="test" depends="build-project-test">
+
+    <target name="check-generateKeys">
+        <available file="config/keystore.pkcs12" property="keystore.present"/>
+    </target>
+    <target name="generateKeys" depends="check-generateKeys" unless="keystore.present">
+        <exec executable="./generateKeys.sh" dir="doc/scripts"/>
+        <exec executable="./generateTruststore.sh" dir="doc/scripts">
+            <arg value="-noprompt"/>
+        </exec>
+    </target>
+    <target name="test" depends="build-project-test,generateKeys">
         <mkdir dir="${junit.output.dir}"/>
         <junit fork="yes" printsummary="withOutAndErr">
             <formatter type="xml"/>
diff --git a/doc/scripts/generateKeys.sh b/doc/scripts/generateKeys.sh
index b5b94fc4..26a01ce3 100755
--- a/doc/scripts/generateKeys.sh
+++ b/doc/scripts/generateKeys.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # this script generates a simple self-signed keypair
 
 openssl genrsa -out jetty.key 4096
diff --git a/doc/scripts/generateTruststore.sh b/doc/scripts/generateTruststore.sh
old mode 100644
new mode 100755
index 6a9e03bf..12952944
--- a/doc/scripts/generateTruststore.sh
+++ b/doc/scripts/generateTruststore.sh
@@ -1,10 +1,11 @@
-# this script generates a simple self-signed keypair
+#!/bin/sh
+# this script imports the cacert root certs
 
 wget -N http://www.cacert.org/certs/root.crt
 wget -N http://www.cacert.org/certs/class3.crt
 
-keytool -importcert -keystore ../../config/cacerts.jks -file root.crt -alias root -storepass "changeit"
-keytool -importcert -keystore ../../config/cacerts.jks -file class3.crt -alias class3 -storepass "changeit"
-keytool -importcert -keystore ../../config/cacerts.jks -file jetty.crt -alias own -storepass "changeit"
+keytool -importcert -keystore ../../config/cacerts.jks -file root.crt -alias root -storepass "changeit" $1
+keytool -importcert -keystore ../../config/cacerts.jks -file class3.crt -alias class3 -storepass "changeit" $1
+keytool -importcert -keystore ../../config/cacerts.jks -file jetty.crt -alias own -storepass "changeit" $1
 
 keytool -list -keystore ../../config/cacerts.jks -storepass "changeit"