Re-merge fix for bug 2611. RCL_3
authorPat Downey <patd@symbian.org>
Tue, 18 May 2010 17:13:12 +0100
branchRCL_3
changeset 22 593fb613234e
parent 21 2129f10626ba (diff)
parent 17 75c06c88bfa3 (current diff)
child 24 b9e98a1244ee
Re-merge fix for bug 2611.
Binary file networksecurity/tls/test/te_tlsunittest/configs/te_tlsunittest.ini has changed
--- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=008b
 ExpectedFinalCipherSuit=008b
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
--- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=008c
 ExpectedFinalCipherSuit=008c
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
--- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=008c
 ExpectedFinalCipherSuit=0035
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 ExpectedSetCipherError=-5
--- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=008d
 ExpectedFinalCipherSuit=008d
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
--- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=008a
 ExpectedFinalCipherSuit=008a
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
--- a/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5.ini	Tue May 18 17:13:12 2010 +0100
@@ -20,7 +20,7 @@
 ExpectedFinalCipherSuit=0001
 UseNullCipher=True
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
--- a/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=0002
 ExpectedFinalCipherSuit=0002
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=True
--- a/networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=002f
 ExpectedFinalCipherSuit=002f
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
--- a/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER.ini	Tue May 18 17:13:12 2010 +0100
@@ -18,7 +18,7 @@
 NumCipherSuites=0
 ExpectedFinalCipherSuit=008D
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=True
--- a/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG.ini	Tue May 18 17:13:12 2010 +0100
@@ -21,7 +21,7 @@
 
 UseNullCipher=True
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
--- a/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke.ini	Fri Apr 30 16:48:33 2010 +0100
+++ b/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke.ini	Tue May 18 17:13:12 2010 +0100
@@ -19,7 +19,7 @@
 CipherSuite1=008c
 ExpectedFinalCipherSuit=008c
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
@@ -30,7 +30,7 @@
 CipherSuite1=008c
 ExpectedFinalCipherSuit=0035
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 ExpectedSetCipherError=-5
@@ -43,7 +43,7 @@
 CipherSuite1=008b
 ExpectedFinalCipherSuit=008b
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
@@ -54,7 +54,7 @@
 CipherSuite1=008a
 ExpectedFinalCipherSuit=008a
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
@@ -65,7 +65,7 @@
 CipherSuite1=008d
 ExpectedFinalCipherSuit=008d
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
@@ -77,7 +77,7 @@
 CipherSuite1=0003
 ExpectedFinalCipherSuit=0003
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -88,7 +88,7 @@
 CipherSuite1=0004
 ExpectedFinalCipherSuit=0004
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -98,7 +98,7 @@
 CipherSuite1=0005
 ExpectedFinalCipherSuit=0005
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -109,7 +109,7 @@
 CipherSuite1=0008
 ExpectedFinalCipherSuit=0008
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -119,7 +119,7 @@
 CipherSuite1=0009
 ExpectedFinalCipherSuit=0009
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -130,7 +130,7 @@
 CipherSuite1=000a
 ExpectedFinalCipherSuit=000a
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -140,7 +140,7 @@
 CipherSuite1=0011
 ExpectedFinalCipherSuit=0011
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -150,7 +150,7 @@
 CipherSuite1=0012
 ExpectedFinalCipherSuit=0012
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -161,7 +161,7 @@
 CipherSuite1=0013
 ExpectedFinalCipherSuit=0013
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -171,7 +171,7 @@
 CipherSuite1=0014
 ExpectedFinalCipherSuit=0014
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -182,7 +182,7 @@
 CipherSuite1=0016
 ExpectedFinalCipherSuit=0016
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -193,7 +193,7 @@
 CipherSuite1=002f
 ExpectedFinalCipherSuit=002f
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -204,7 +204,7 @@
 CipherSuite1=0035
 ExpectedFinalCipherSuit=0035
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -216,7 +216,7 @@
 NumCipherSuites=0
 ExpectedFinalCipherSuit=008D
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=True
@@ -233,7 +233,7 @@
 CipherSuite1=002f
 ExpectedFinalCipherSuit=002f
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -252,7 +252,7 @@
 
 UseNullCipher=True
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -272,7 +272,7 @@
 ExpectedFinalCipherSuit=0001
 UseNullCipher=True
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=ETrue
@@ -283,7 +283,7 @@
 CipherSuite1=0002
 ExpectedFinalCipherSuit=0002
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 UsePsk=True
@@ -297,7 +297,7 @@
 ExpectedSetCipherError=-5
 
 ExpectedFinalCipherSuit=0035
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 
@@ -308,7 +308,7 @@
 CipherSuite1=0002
 ExpectedFinalCipherSuit=0035
 
-WebAddress=10.253.27.250
+WebAddress=10.225.171.71
 WebPage=hello.html
 PortNum=1666
 ExpectedSetCipherError=-5