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

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

Issue 1329493005: Provide RSA2048 as per RFC (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 2 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 | « webrtc/base/sslidentity.h ('k') | webrtc/base/sslstreamadapter_unittest.cc » ('j') | 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 std::for_each(certs_.begin(), certs_.end(), DeleteCert); 101 std::for_each(certs_.begin(), certs_.end(), DeleteCert);
102 } 102 }
103 103
104 #if SSL_USE_OPENSSL 104 #if SSL_USE_OPENSSL
105 105
106 SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) { 106 SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) {
107 return OpenSSLCertificate::FromPEMString(pem_string); 107 return OpenSSLCertificate::FromPEMString(pem_string);
108 } 108 }
109 109
110 SSLIdentity* SSLIdentity::Generate(const std::string& common_name, 110 SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
111 KeyType key_type) { 111 const KeyParams& key_params) {
112 return OpenSSLIdentity::Generate(common_name, key_type); 112 return OpenSSLIdentity::Generate(common_name, key_params);
113 } 113 }
114 114
115 SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) { 115 SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) {
116 return OpenSSLIdentity::GenerateForTest(params); 116 return OpenSSLIdentity::GenerateForTest(params);
117 } 117 }
118 118
119 SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key, 119 SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key,
120 const std::string& certificate) { 120 const std::string& certificate) {
121 return OpenSSLIdentity::FromPEMStrings(private_key, certificate); 121 return OpenSSLIdentity::FromPEMStrings(private_key, certificate);
122 } 122 }
123 123
124 #else // !SSL_USE_OPENSSL 124 #else // !SSL_USE_OPENSSL
125 125
126 #error "No SSL implementation" 126 #error "No SSL implementation"
127 127
128 #endif // SSL_USE_OPENSSL 128 #endif // SSL_USE_OPENSSL
129 129
130 } // namespace rtc 130 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/sslidentity.h ('k') | webrtc/base/sslstreamadapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698