upd: remove debug output for verification mails

+ truststore.sh: use correct aliases

diff --git a/config/generateTruststoreNRE.sh b/config/generateTruststoreNRE.sh
index 76a903a3cf0ad1c4526164ed4bb645414a50f0dd..ee5fe9bfd3fdb8fa4280042e6c12b06a0a6feebd 100755 (executable)
--- a/config/generateTruststoreNRE.sh
+++ b/config/generateTruststoreNRE.sh
@@ -4,7 +4,8 @@
 rm -f cacerts.jks
 
 function import(){
-  keytool -importcert -keystore ../config/cacerts.jks -file "$1.crt" -alias own -storepass "changeit" -alias "$1" $2
+  name=$1
+  keytool -importcert -keystore ../config/cacerts.jks -file "$1.crt" -alias own -storepass "changeit" -alias "$(basename $name)" $2
 }
 
 function importP(){

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
index 24b7f78a4c8ca35d5ba6357d72b25d458c0025c3..cdbf9321f46d33c8739d5e156365daa0da2465c4 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java
@@ -75,7 +75,6 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable {
 
         public void verify() throws IOException {
             String link = extractLink();
-            System.out.println(link);
             String[] parts = link.split("\\?");
             URL u = new URL("https://" + ManagedTest.getServerName() + "/verify?" + parts[1]);