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

Side by Side Diff: webrtc/base/sslstreamadapter_unittest.cc

Issue 1189583002: Support generation of EC keys using P256 curve and support ECDSA certs. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 rtc::SetRandomTestMode(true); 174 rtc::SetRandomTestMode(true);
175 175
176 // Set up the slots 176 // Set up the slots
177 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); 177 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent);
178 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); 178 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent);
179 179
180 if (!client_cert_pem.empty() && !client_private_key_pem.empty()) { 180 if (!client_cert_pem.empty() && !client_private_key_pem.empty()) {
181 client_identity_ = rtc::SSLIdentity::FromPEMStrings( 181 client_identity_ = rtc::SSLIdentity::FromPEMStrings(
182 client_private_key_pem, client_cert_pem); 182 client_private_key_pem, client_cert_pem);
183 } else { 183 } else {
184 client_identity_ = rtc::SSLIdentity::Generate("client"); 184 client_identity_ = rtc::SSLIdentity::Generate("client", rtc::KT_RSA);
185 } 185 }
186 server_identity_ = rtc::SSLIdentity::Generate("server"); 186 server_identity_ = rtc::SSLIdentity::Generate("server", rtc::KT_RSA);
187 187
188 client_ssl_->SetIdentity(client_identity_); 188 client_ssl_->SetIdentity(client_identity_);
189 server_ssl_->SetIdentity(server_identity_); 189 server_ssl_->SetIdentity(server_identity_);
190 } 190 }
191 191
192 ~SSLStreamAdapterTestBase() { 192 ~SSLStreamAdapterTestBase() {
193 // Put it back for the next test. 193 // Put it back for the next test.
194 rtc::SetRandomTestMode(false); 194 rtc::SetRandomTestMode(false);
195 } 195 }
196 196
197 // Recreate the client/server identities with the specified validity period. 197 // Recreate the client/server identities with the specified validity period.
198 // |not_before| and |not_after| are offsets from the current time in number 198 // |not_before| and |not_after| are offsets from the current time in number
199 // of seconds. 199 // of seconds.
200 void ResetIdentitiesWithValidity(int not_before, int not_after) { 200 void ResetIdentitiesWithValidity(int not_before, int not_after) {
201 client_stream_ = 201 client_stream_ =
202 new SSLDummyStream(this, "c2s", &client_buffer_, &server_buffer_); 202 new SSLDummyStream(this, "c2s", &client_buffer_, &server_buffer_);
203 server_stream_ = 203 server_stream_ =
204 new SSLDummyStream(this, "s2c", &server_buffer_, &client_buffer_); 204 new SSLDummyStream(this, "s2c", &server_buffer_, &client_buffer_);
205 205
206 client_ssl_.reset(rtc::SSLStreamAdapter::Create(client_stream_)); 206 client_ssl_.reset(rtc::SSLStreamAdapter::Create(client_stream_));
207 server_ssl_.reset(rtc::SSLStreamAdapter::Create(server_stream_)); 207 server_ssl_.reset(rtc::SSLStreamAdapter::Create(server_stream_));
208 208
209 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); 209 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent);
210 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); 210 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent);
211 211
212 rtc::SSLIdentityParams client_params; 212 rtc::SSLIdentityParams client_params;
213 client_params.common_name = "client"; 213 client_params.common_name = "client";
214 client_params.not_before = not_before; 214 client_params.not_before = not_before;
215 client_params.not_after = not_after; 215 client_params.not_after = not_after;
216 client_identity_ = rtc::SSLIdentity::GenerateForTest(client_params); 216 client_identity_ =
217 rtc::SSLIdentity::GenerateForTest(client_params, rtc::KT_RSA);
217 218
218 rtc::SSLIdentityParams server_params; 219 rtc::SSLIdentityParams server_params;
219 server_params.common_name = "server"; 220 server_params.common_name = "server";
220 server_params.not_before = not_before; 221 server_params.not_before = not_before;
221 server_params.not_after = not_after; 222 server_params.not_after = not_after;
222 server_identity_ = rtc::SSLIdentity::GenerateForTest(server_params); 223 server_identity_ =
224 rtc::SSLIdentity::GenerateForTest(server_params, rtc::KT_RSA);
223 225
224 client_ssl_->SetIdentity(client_identity_); 226 client_ssl_->SetIdentity(client_identity_);
225 server_ssl_->SetIdentity(server_identity_); 227 server_ssl_->SetIdentity(server_identity_);
226 } 228 }
227 229
228 virtual void OnEvent(rtc::StreamInterface *stream, int sig, int err) { 230 virtual void OnEvent(rtc::StreamInterface *stream, int sig, int err) {
229 LOG(LS_INFO) << "SSLStreamAdapterTestBase::OnEvent sig=" << sig; 231 LOG(LS_INFO) << "SSLStreamAdapterTestBase::OnEvent sig=" << sig;
230 232
231 if (sig & rtc::SE_READ) { 233 if (sig & rtc::SE_READ) {
232 ReadData(stream); 234 ReadData(stream);
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 std::string client_cipher; 1017 std::string client_cipher;
1016 ASSERT_TRUE(GetSslCipher(true, &client_cipher)); 1018 ASSERT_TRUE(GetSslCipher(true, &client_cipher));
1017 std::string server_cipher; 1019 std::string server_cipher;
1018 ASSERT_TRUE(GetSslCipher(false, &server_cipher)); 1020 ASSERT_TRUE(GetSslCipher(false, &server_cipher));
1019 1021
1020 ASSERT_EQ(client_cipher, server_cipher); 1022 ASSERT_EQ(client_cipher, server_cipher);
1021 ASSERT_EQ( 1023 ASSERT_EQ(
1022 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), 1024 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10),
1023 client_cipher); 1025 client_cipher);
1024 } 1026 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698