From 41c5cd02fc7eb9601edb317b21b3d07bdaafbc37 Mon Sep 17 00:00:00 2001 From: hbos Date: Thu, 26 May 2016 15:23:16 -0700 Subject: [PATCH] Making ECDSA the default certificate regardless of WEBRTC_CHROMIUM_BUILD. Due to the experiment in chromium relying on KT_DEFAULT = KT_RSA (bug: crbug.com/611698) a conditional was introduced. Now that the experiment is ending and the experiment flag has been removed we can make KT_DEFAULT=KT_ECDSA unconditionally. BUG=chromium:611698 Review-Url: https://codereview.webrtc.org/2009533003 Cr-Commit-Position: refs/heads/master@{#12935} --- webrtc/base/sslidentity.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/webrtc/base/sslidentity.h b/webrtc/base/sslidentity.h index 8e7e786130..857a27cfc7 100644 --- a/webrtc/base/sslidentity.h +++ b/webrtc/base/sslidentity.h @@ -117,20 +117,7 @@ class SSLCertChain { // KT_LAST is intended for vector declarations and loops over all key types; // it does not represent any key type in itself. // KT_DEFAULT is used as the default KeyType for KeyParams. -enum KeyType { - KT_RSA, KT_ECDSA, KT_LAST, -#if defined(WEBRTC_CHROMIUM_BUILD) - // TODO(hbos): Because of an experiment running in Chromium which relies on - // RSA being the default (for performance reasons) we have this #if. ECDSA - // launches in Chromium by flipping a flag which overrides the default. As - // soon as the experiment has ended and there is no risk of RSA being the - // default we should make KT_DEFAULT = KT_ECDSA unconditionally. - // crbug.com/611698 - KT_DEFAULT = KT_RSA -#else - KT_DEFAULT = KT_ECDSA -#endif -}; +enum KeyType { KT_RSA, KT_ECDSA, KT_LAST, KT_DEFAULT = KT_ECDSA }; static const int kRsaDefaultModSize = 1024; static const int kRsaDefaultExponent = 0x10001; // = 2^16+1 = 65537