Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2099)

Side by Side Diff: webrtc/base/sslidentity.h

Issue 1986053005: Fixed typo. KT_DEFAULT different based on WEBRTC_CHROMIUM_BUILD (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 std::vector<SSLCertificate*> certs_; 112 std::vector<SSLCertificate*> certs_;
113 113
114 RTC_DISALLOW_COPY_AND_ASSIGN(SSLCertChain); 114 RTC_DISALLOW_COPY_AND_ASSIGN(SSLCertChain);
115 }; 115 };
116 116
117 // KT_LAST is intended for vector declarations and loops over all key types; 117 // KT_LAST is intended for vector declarations and loops over all key types;
118 // it does not represent any key type in itself. 118 // it does not represent any key type in itself.
119 // KT_DEFAULT is used as the default KeyType for KeyParams. 119 // KT_DEFAULT is used as the default KeyType for KeyParams.
120 enum KeyType { 120 enum KeyType {
121 KT_RSA, KT_ECDSA, KT_LAST, 121 KT_RSA, KT_ECDSA, KT_LAST,
122 #if defined(WEBRTC_BUILD_CHROMIUM) 122 #if defined(WEBRTC_CHROMIUM_BUILD)
123 // TODO(hbos): Because of an experiment running in Chromium which relies on 123 // TODO(hbos): Because of an experiment running in Chromium which relies on
124 // RSA being the default (for performance reasons) we have this #if. ECDSA 124 // RSA being the default (for performance reasons) we have this #if. ECDSA
125 // launches in Chromium by flipping a flag which overrides the default. As 125 // launches in Chromium by flipping a flag which overrides the default. As
126 // soon as the experiment has ended and there is no risk of RSA being the 126 // soon as the experiment has ended and there is no risk of RSA being the
127 // default we should make KT_DEFAULT = KT_ECDSA unconditionally. 127 // default we should make KT_DEFAULT = KT_ECDSA unconditionally.
128 // crbug.com/611698 128 // crbug.com/611698
129 KT_DEFAULT = KT_RSA 129 KT_DEFAULT = KT_RSA
130 #else 130 #else
131 KT_DEFAULT = KT_ECDSA 131 KT_DEFAULT = KT_ECDSA
132 #endif 132 #endif
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 // |s| is not 0-terminated; its char count is defined by |length|. 257 // |s| is not 0-terminated; its char count is defined by |length|.
258 int64_t ASN1TimeToSec(const unsigned char* s, size_t length, bool long_format); 258 int64_t ASN1TimeToSec(const unsigned char* s, size_t length, bool long_format);
259 259
260 extern const char kPemTypeCertificate[]; 260 extern const char kPemTypeCertificate[];
261 extern const char kPemTypeRsaPrivateKey[]; 261 extern const char kPemTypeRsaPrivateKey[];
262 extern const char kPemTypeEcPrivateKey[]; 262 extern const char kPemTypeEcPrivateKey[];
263 263
264 } // namespace rtc 264 } // namespace rtc
265 265
266 #endif // WEBRTC_BASE_SSLIDENTITY_H_ 266 #endif // WEBRTC_BASE_SSLIDENTITY_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698