Index: chrome/browser/ssl/ssl_error_classification.cc |
diff --git a/chrome/browser/ssl/ssl_error_classification.cc b/chrome/browser/ssl/ssl_error_classification.cc |
index 7f66b61f0447a141fba89f9c322af4ea6070cc0e..843877418ed973e8bcf099a88a877ce8fd145ba3 100644 |
--- a/chrome/browser/ssl/ssl_error_classification.cc |
+++ b/chrome/browser/ssl/ssl_error_classification.cc |
@@ -30,6 +30,7 @@ |
#endif |
#if defined(OS_WIN) |
+#include "base/win/win_util.h" |
#include "base/win/windows_version.h" |
#endif |
@@ -366,14 +367,12 @@ bool SSLErrorClassification::IsUserClockInTheFuture( |
return false; |
} |
-bool SSLErrorClassification::IsWindowsVersionSP3OrLower() { |
+bool SSLErrorClassification::MaybeOSHasSHA256Support() { |
felt
2014/09/18 18:30:36
this is still specific to Windows, not any OS. (e.
Sorin Jianu
2014/09/18 18:41:07
I believe that the assumption here is that the non
felt
2014/09/18 18:44:27
Except apparently old Android doesn't. It would he
|
#if defined(OS_WIN) |
- const base::win::OSInfo* os_info = base::win::OSInfo::GetInstance(); |
- base::win::OSInfo::ServicePack service_pack = os_info->service_pack(); |
- if (os_info->version() < base::win::VERSION_VISTA && service_pack.major < 3) |
- return true; |
+ return base::win::MaybeHasSHA256Support(); |
+#else |
+ return true; |
#endif |
- return false; |
} |
bool SSLErrorClassification::IsHostNameKnownTLD(const std::string& host_name) { |