Chromium Code Reviews| Index: webrtc/base/sslidentity.h |
| diff --git a/webrtc/base/sslidentity.h b/webrtc/base/sslidentity.h |
| index 8e7e78613084f4f69eee397c76ae75d2f707af1a..857a27cfc7ba069e4729f705b0ce4234f1c38ecd 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 }; |
|
tommi
2016/05/24 18:20:23
did you run git cl format?
hbos
2016/05/24 18:43:11
If I run it it does not change the code, so I gues
|
| static const int kRsaDefaultModSize = 1024; |
| static const int kRsaDefaultExponent = 0x10001; // = 2^16+1 = 65537 |