summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 17:45:29 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 17:45:29 +0000
commit3f46268e83297c84e2892c9de90e8ff0db11c493 (patch)
treea7912067dc133425fd1331c8dc43918a25be410f /net
parentaa6b747067089fc9978e5d0ca0f3ab8b619d05f3 (diff)
downloadchromium_src-3f46268e83297c84e2892c9de90e8ff0db11c493.zip
chromium_src-3f46268e83297c84e2892c9de90e8ff0db11c493.tar.gz
chromium_src-3f46268e83297c84e2892c9de90e8ff0db11c493.tar.bz2
QUIC - On windows use X.509 - RSA only certificates. Disabled ECDSA cert
based proof verification until X509Certificate::GetPublicKeyInfo returns correct type for ECDSA cert on windows. R=jar@chromium.org Review URL: https://codereview.chromium.org/19256009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/quic/crypto/crypto_handshake.cc7
-rw-r--r--net/quic/crypto/crypto_protocol.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/net/quic/crypto/crypto_handshake.cc b/net/quic/crypto/crypto_handshake.cc
index 5cf69f7..c0688b4 100644
--- a/net/quic/crypto/crypto_handshake.cc
+++ b/net/quic/crypto/crypto_handshake.cc
@@ -563,7 +563,14 @@ void QuicCryptoClientConfig::FillInchoateClientHello(
}
if (proof_verifier_.get()) {
+ // TODO(rtenneti): Enable ECDSA proof verification on Windows. Disabled it
+ // because X509Certificate::GetPublicKeyInfo is not returning the correct
+ // type for ECDSA certificates.
+#if defined(OS_WIN)
+ out->SetTaglist(kPDMD, kX59R, 0);
+#else
out->SetTaglist(kPDMD, kX509, 0);
+#endif
}
if (common_cert_sets) {
diff --git a/net/quic/crypto/crypto_protocol.h b/net/quic/crypto/crypto_protocol.h
index d877ce3..082976a 100644
--- a/net/quic/crypto/crypto_protocol.h
+++ b/net/quic/crypto/crypto_protocol.h
@@ -49,6 +49,7 @@ const QuicTag kINAR = TAG('I', 'N', 'A', 'R'); // Inter arrival
// Proof types (i.e. certificate types)
const QuicTag kX509 = TAG('X', '5', '0', '9'); // X.509 certificate
+const QuicTag kX59R = TAG('X', '5', '9', 'R'); // X.509 - RSA only
const QuicTag kCHID = TAG('C', 'H', 'I', 'D'); // Channel ID.
// Client hello tags