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

Unified Diff: webrtc/base/sslidentity.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: explicitly enable ECDSA for NSS; tolerate ECDSA and RSA certs in unittest 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/base/sslidentity.cc
diff --git a/webrtc/base/sslidentity.cc b/webrtc/base/sslidentity.cc
index ea9f547a87d812cac35fac39ad562c15d1103afd..9f899a699bd9ce3ee01be8f1bafa8d337d31cdf7 100644
--- a/webrtc/base/sslidentity.cc
+++ b/webrtc/base/sslidentity.cc
@@ -108,7 +108,8 @@ SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) {
return NULL;
}
-SSLIdentity* SSLIdentity::Generate(const std::string& common_name) {
+SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
+ KeyType key_type) {
return NULL;
}
@@ -127,12 +128,14 @@ SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) {
return OpenSSLCertificate::FromPEMString(pem_string);
}
-SSLIdentity* SSLIdentity::Generate(const std::string& common_name) {
- return OpenSSLIdentity::Generate(common_name);
+SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
+ KeyType key_type) {
+ return OpenSSLIdentity::Generate(common_name, key_type);
}
-SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) {
- return OpenSSLIdentity::GenerateForTest(params);
+SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params,
+ KeyType key_type) {
+ return OpenSSLIdentity::GenerateForTest(params, key_type);
}
SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key,
@@ -146,12 +149,14 @@ SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) {
return NSSCertificate::FromPEMString(pem_string);
}
-SSLIdentity* SSLIdentity::Generate(const std::string& common_name) {
- return NSSIdentity::Generate(common_name);
+SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
+ KeyType key_type) {
+ return NSSIdentity::Generate(common_name, key_type);
}
-SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) {
- return NSSIdentity::GenerateForTest(params);
+SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params,
+ KeyType key_type) {
juberti1 2015/06/26 19:16:01 I think it probably makes sense to put KeyType int
torbjorng (webrtc) 2015/07/02 12:35:07 Done.
+ return NSSIdentity::GenerateForTest(params, key_type);
}
SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key,

Powered by Google App Engine
This is Rietveld 408576698