summaryrefslogtreecommitdiffstats
path: root/net/data
diff options
context:
space:
mode:
authortoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 06:11:58 +0000
committertoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 06:11:58 +0000
commit5428a5a4d9a37d54a8b35bdc2ba2bb38e398ea87 (patch)
tree7dd5606b75e5fa58af5b9d7d8166907976d0ecf8 /net/data
parent66c78ad5949302464467b7cbeeb556659a478c3e (diff)
downloadchromium_src-5428a5a4d9a37d54a8b35bdc2ba2bb38e398ea87.zip
chromium_src-5428a5a4d9a37d54a8b35bdc2ba2bb38e398ea87.tar.gz
chromium_src-5428a5a4d9a37d54a8b35bdc2ba2bb38e398ea87.tar.bz2
Replace WebSocket client certificate resources into net/data/ssl/certificates
TBR=wtc@chromium.org BUG=136950 Review URL: https://codereview.chromium.org/11192028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/data')
-rw-r--r--net/data/ssl/certificates/README9
-rw-r--r--net/data/ssl/certificates/websocket_cacert.pem (renamed from net/data/websocket/cacert.pem)0
-rw-r--r--net/data/ssl/certificates/websocket_client_cert.p12 (renamed from net/data/websocket/client_cert.p12)0
3 files changed, 9 insertions, 0 deletions
diff --git a/net/data/ssl/certificates/README b/net/data/ssl/certificates/README
index e0be8f2..61d6357 100644
--- a/net/data/ssl/certificates/README
+++ b/net/data/ssl/certificates/README
@@ -127,3 +127,12 @@ unit tests.
- ndn.ca.crt: "New Dream Network Certificate Authority" root certificate.
This is an X.509 v1 certificate that omits the version field. Used to
test that the certificate version gets the default value v1.
+
+- websocket_cacert.pem : The testing root CA for testing WebSocket client
+ certificate authentication.
+ This file is used in SSLUITest.TestWSSClientCert.
+
+- websocket_client_cert.p12 : A PKCS #12 file containing a client certificate
+ and a private key created for WebSocket testing. The password is "".
+ This file is used in SSLUITest.TestWSSClientCert.
+
diff --git a/net/data/websocket/cacert.pem b/net/data/ssl/certificates/websocket_cacert.pem
index 50c5baa..50c5baa 100644
--- a/net/data/websocket/cacert.pem
+++ b/net/data/ssl/certificates/websocket_cacert.pem
diff --git a/net/data/websocket/client_cert.p12 b/net/data/ssl/certificates/websocket_client_cert.p12
index e69de29..e69de29 100644
--- a/net/data/websocket/client_cert.p12
+++ b/net/data/ssl/certificates/websocket_client_cert.p12