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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/base/opensslstreamadapter.cc

Issue 1329493005: Provide RSA2048 as per RFC (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Allow full parameterization of RSA, curve id for ECDSA. Created 5 years, 3 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
« webrtc/base/opensslidentity.cc ('K') | « webrtc/base/opensslstreamadapter.h ('k') | webrtc/base/ssladapter_unittest.cc » ('j') | webrtc/base/ssladapter_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/opensslstreamadapter.cc
diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc
index ed2505e8b7fe28c0b14e285470e3c149462db4e0..33129d9a5f7b84263fd7d94220846e4fdcd7f7e0 100644
--- a/webrtc/base/opensslstreamadapter.cc
+++ b/webrtc/base/opensslstreamadapter.cc
@@ -1127,8 +1127,8 @@ bool OpenSSLStreamAdapter::HaveExporter() {
std::string OpenSSLStreamAdapter::GetDefaultSslCipher(
SSLProtocolVersion version,
- KeyType key_type) {
- if (key_type == KT_RSA) {
+ KeyTypeFull key_type) {
+ if (key_type.type() == KT_RSA) {
switch (version) {
case SSL_PROTOCOL_TLS_10:
case SSL_PROTOCOL_TLS_11:
@@ -1145,7 +1145,7 @@ std::string OpenSSLStreamAdapter::GetDefaultSslCipher(
return kDefaultSslCipher12;
#endif
}
- } else if (key_type == KT_ECDSA) {
+ } else if (key_type.type() == KT_ECDSA) {
switch (version) {
case SSL_PROTOCOL_TLS_10:
case SSL_PROTOCOL_TLS_11:
« webrtc/base/opensslidentity.cc ('K') | « webrtc/base/opensslstreamadapter.h ('k') | webrtc/base/ssladapter_unittest.cc » ('j') | webrtc/base/ssladapter_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698