diff --git a/_dev/interop_test_runner b/_dev/interop_test_runner index 6f6880b..fb503b2 100755 --- a/_dev/interop_test_runner +++ b/_dev/interop_test_runner @@ -141,13 +141,14 @@ class ServerClientAuthMixin(object): class ClientNominalMixin(object): def test_rsa(self): - res = self.d.run_client(self.CLIENT_NAME, '-rsa=false '+self.server_ip+":2443") + res = self.d.run_client(self.CLIENT_NAME, '-ecdsa=false '+self.server_ip+":1443") self.assertEqual(res[0], 0) def test_ecdsa(self): - res = self.d.run_client(self.CLIENT_NAME, '-ecdsa=false '+self.server_ip+":1443") + res = self.d.run_client(self.CLIENT_NAME, '-rsa=false '+self.server_ip+":2443") self.assertEqual(res[0], 0) + class ClientClientAuthMixin(object): ''' Client authentication testing - tris on client side ''' @@ -189,7 +190,7 @@ class InteropClient(object): self.d = Docker() self.server = self.d.run_server( self.SERVER_NAME, - ports={'1443/tcp': 1443, '2443/tcp': 2443, '6443/tcp': 6443}, + ports={ '1443/tcp': 1443, '2443/tcp': 2443, '6443/tcp': 6443}, entrypoint="/server.sh") @classmethod @@ -239,5 +240,15 @@ class InteropClient_NSS( unittest.TestCase ): SERVER_NAME = "tstclnt-localserver" +# TRIS as a client +class InteropServer_TRIS(ClientNominalMixin, InteropServer, unittest.TestCase): + + CLIENT_NAME = 'tris-testclient' + + def test_client_auth(self): + # I need to block TLS v1.2 as test server needs some rework + res = self.d.run_client(self.CLIENT_NAME, '-rsa=false -ecdsa=false -cliauth '+self.server_ip+":6443") + self.assertEqual(res[0], 0) + if __name__ == '__main__': unittest.main() diff --git a/_dev/tris-localserver/runner.sh b/_dev/tris-localserver/runner.sh index d0fcc4a..9b20c41 100755 --- a/_dev/tris-localserver/runner.sh +++ b/_dev/tris-localserver/runner.sh @@ -1,7 +1,7 @@ #!/bin/sh -./tris-localserver -b 0.0.0.0:1443 -palg=ecdsa -rtt0=n 2>&1 & # first port: ECDSA (and no 0-RTT) -./tris-localserver -b 0.0.0.0:2443 -palg=rsa -rtt0=a 2>&1 & # second port: RSA (and accept 0-RTT but not offer it) +./tris-localserver -b 0.0.0.0:1443 -palg=rsa -rtt0=n 2>&1 & # first port: ECDSA (and no 0-RTT) +./tris-localserver -b 0.0.0.0:2443 -palg=ecdsa -rtt0=a 2>&1 & # second port: RSA (and accept 0-RTT but not offer it) ./tris-localserver -b 0.0.0.0:3443 -palg=ecdsa -rtt0=o 2>&1 & # third port: offer and reject 0-RTT ./tris-localserver -b 0.0.0.0:4443 -palg=ecdsa -rtt0=oa 2>&1 & # fourth port: offer and accept 0-RTT ./tris-localserver -b 0.0.0.0:5443 -palg=ecdsa -rtt0=oa -rtt0ack 2>&1 & # fifth port: offer and accept 0-RTT but confirm