This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 0193bd1 Added relative path to tls_client_verify test curl commands
to avoid confusion with NSS database nickname.
0193bd1 is described below
commit 0193bd11c162ce6289ff2437c558ea8cf3593092
Author: dyrock <[email protected]>
AuthorDate: Tue Feb 12 20:43:37 2019 +0000
Added relative path to tls_client_verify test curl commands to avoid
confusion with NSS database nickname.
---
tests/gold_tests/tls/tls_client_verify.test.py | 16 ++++++++--------
tests/gold_tests/tls/tls_client_verify2.test.py | 24 ++++++++++++------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/tests/gold_tests/tls/tls_client_verify.test.py
b/tests/gold_tests/tls/tls_client_verify.test.py
index 9860955..e09ddab 100644
--- a/tests/gold_tests/tls/tls_client_verify.test.py
+++ b/tests/gold_tests/tls/tls_client_verify.test.py
@@ -89,7 +89,7 @@ tr.Setup.Copy("ssl/server.pem")
tr.Setup.Copy("ssl/server.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert server.pem --key
server.key --resolve 'foo.com:{0}:127.0.0.1'
https://foo.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./server.pem
--key ./server.key --resolve 'foo.com:{0}:127.0.0.1'
https://foo.com:{0}/case1".format(ts.Variables.ssl_port)
# Should fail with badly signed certs
tr.Processes.Default.ReturnCode = 35
@@ -98,7 +98,7 @@ tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-foo.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert signed-foo.pem
--key signed-foo.key --resolve 'foo.com:{0}:127.0.0.1'
https://foo.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./signed-foo.pem
--key ./signed-foo.key --resolve 'foo.com:{0}:127.0.0.1'
https://foo.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check
response")
@@ -114,7 +114,7 @@ tr.Setup.Copy("ssl/signed-bob-bar.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
signed-bob-bar.pem --key signed-bar.key --resolve 'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
./signed-bob-bar.pem --key ./signed-bar.key --resolve
'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check
response")
@@ -123,7 +123,7 @@ tr.Setup.Copy("ssl/server.pem")
tr.Setup.Copy("ssl/server.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert server.pem --key
server.key --resolve 'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./server.pem
--key ./server.key --resolve 'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check
response")
@@ -139,7 +139,7 @@ tr.Setup.Copy("ssl/signed-bob-foo.pem")
tr.Setup.Copy("ssl/signed-foo.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
signed-bob-foo.pem --key signed-foo.key --resolve 'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
./signed-bob-foo.pem --key ./signed-foo.key --resolve
'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check
response")
@@ -148,7 +148,7 @@ tr.Setup.Copy("ssl/server.pem")
tr.Setup.Copy("ssl/server.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert server.pem --key
server.key --resolve 'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./server.pem
--key ./server.key --resolve 'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check
response")
@@ -163,7 +163,7 @@ tr.Setup.Copy("ssl/signed-bar.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert signed-bar.pem
--key signed-bar.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./signed-bar.pem
--key ./signed-bar.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "TLS
handshake should succeed")
@@ -172,7 +172,7 @@ tr.Setup.Copy("ssl/server.pem")
tr.Setup.Copy("ssl/server.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert server.pem --key
server.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./server.pem
--key ./server.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 35
diff --git a/tests/gold_tests/tls/tls_client_verify2.test.py
b/tests/gold_tests/tls/tls_client_verify2.test.py
index 885e75f..cf0286c 100644
--- a/tests/gold_tests/tls/tls_client_verify2.test.py
+++ b/tests/gold_tests/tls/tls_client_verify2.test.py
@@ -90,7 +90,7 @@ tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-foo.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert signed-foo.pem
--key signed-foo.key --resolve 'foo.com:{0}:127.0.0.1'
https://foo.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./signed-foo.pem
--key ./signed-foo.key --resolve 'foo.com:{0}:127.0.0.1'
https://foo.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check
response")
@@ -98,14 +98,14 @@ tr = Test.AddTestRun("Connect to bob.bar.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.Processes.Default.Command = "curl --tls-max 1.2 -k --resolve
'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
-tr.Processes.Default.ReturnCode = 35
+tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bob.bar.com with cert")
tr.Setup.Copy("ssl/signed-bob-bar.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
signed-bob-bar.pem --key signed-bar.key --resolve 'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
./signed-bob-bar.pem --key ./signed-bar.key --resolve
'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "TLS
handshake should succeed")
@@ -114,21 +114,21 @@ tr.Setup.Copy("ssl/server.pem")
tr.Setup.Copy("ssl/server.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert server.pem --key
server.key --resolve 'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
-tr.Processes.Default.ReturnCode = 35
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./server.pem
--key ./server.key --resolve 'bob.bar.com:{0}:127.0.0.1'
https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bob.foo.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.Processes.Default.Command = "curl --tls-max 1.2 -k --resolve
'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
-tr.Processes.Default.ReturnCode = 35
+tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bob.foo.com with cert")
tr.Setup.Copy("ssl/signed-bob-foo.pem")
tr.Setup.Copy("ssl/signed-foo.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
signed-bob-foo.pem --key signed-foo.key --resolve 'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert
./signed-bob-foo.pem --key ./signed-foo.key --resolve
'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "TLS
handshake should succeed")
@@ -137,14 +137,14 @@ tr.Setup.Copy("ssl/server.pem")
tr.Setup.Copy("ssl/server.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert server.pem --key
server.key --resolve 'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
-tr.Processes.Default.ReturnCode = 35
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./server.pem
--key ./server.key --resolve 'bob.foo.com:{0}:127.0.0.1'
https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bar.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.Processes.Default.Command = "curl --tls-max 1.2 -k --resolve
'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
-tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("alert", "TLS
handshake should succeed")
tr = Test.AddTestRun("Connect to bar.com with cert")
@@ -152,7 +152,7 @@ tr.Setup.Copy("ssl/signed-bar.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert signed-bar.pem
--key signed-bar.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./signed-bar.pem
--key ./signed-bar.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check
response")
@@ -161,7 +161,7 @@ tr.Setup.Copy("ssl/server.pem")
tr.Setup.Copy("ssl/server.key")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert server.pem --key
server.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
+tr.Processes.Default.Command = "curl --tls-max 1.2 -k --cert ./server.pem
--key ./server.key --resolve 'bar.com:{0}:127.0.0.1'
https://bar.com:{0}/case1".format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("alert unknown
ca", "TLS handshake should succeed")
