X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestSSL.java;h=9756a7f3f4e2a044acd5860d1b58c000bf84fee5;hb=065ca60170f2471227dc25784e1a4c3b7912d367;hp=2ae757f9e8e129462c3292ff7edcce87a107fad5;hpb=4f528c2a8ac9c63db3fa78c02b5fbbb7bcb6504f;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestSSL.java b/tests/org/cacert/gigi/TestSSL.java
index 2ae757f9..9756a7f3 100644
--- a/tests/org/cacert/gigi/TestSSL.java
+++ b/tests/org/cacert/gigi/TestSSL.java
@@ -6,15 +6,18 @@ import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 import java.security.NoSuchAlgorithmException;
+
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
-import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLException;
 
+import org.cacert.gigi.testUtils.InitTruststore;
+import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
-public class TestSSL {
+public class TestSSL extends ManagedTest {
 	private ByteBuffer in;
 	private ByteBuffer inC;
 	private ByteBuffer outC;
@@ -27,8 +30,9 @@ public class TestSSL {
 			throws NoSuchAlgorithmException, IOException {
 		SSLContext sc = SSLContext.getDefault();
 		SSLEngine se = sc.createSSLEngine();
-		SocketChannel s = SocketChannel.open(new InetSocketAddress("localhost",
-				443));
+		String[] serverParts = getServerName().split(":", 2);
+		SocketChannel s = SocketChannel.open(new InetSocketAddress(
+				serverParts[0], Integer.parseInt(serverParts[1])));
 
 		in = ByteBuffer.allocate(se.getSession().getApplicationBufferSize());
 		inC = ByteBuffer.allocate(se.getSession().getPacketBufferSize());
@@ -44,7 +48,7 @@ public class TestSSL {
 		try {
 			work(se, s);
 			throw new Error(
-					"Client re-negotiation failed (possible DoS vurnability");
+					"Client re-negotiation succeded (possible DoS vulnerability");
 		} catch (EOFException e) {
 			// Cool, server closed connection
 		}