Index: net/cert/cert_verify_proc.cc |
diff --git a/net/cert/cert_verify_proc.cc b/net/cert/cert_verify_proc.cc |
index 01c272074e71aac9c2d7a6973e0566eea6fec0b1..798d90203663b9796bd93d4e25290b13dcc9632a 100644 |
--- a/net/cert/cert_verify_proc.cc |
+++ b/net/cert/cert_verify_proc.cc |
@@ -261,21 +261,16 @@ int CertVerifyProc::Verify(X509Certificate* cert, |
rv = MapCertStatusToNetError(verify_result->cert_status); |
} |
-#if !defined(OS_ANDROID) |
// Flag certificates from publicly-trusted CAs that are issued to intranet |
// hosts. While the CA/Browser Forum Baseline Requirements (v1.1) permit |
// these to be issued until 1 November 2015, they represent a real risk for |
// the deployment of gTLDs and are being phased out ahead of the hard |
// deadline. |
- // |
- // TODO(ppi): is_issued_by_known_root is incorrect on Android. Once this is |
- // fixed, re-enable this check for Android. crbug.com/116838 |
if (verify_result->is_issued_by_known_root && IsHostnameNonUnique(hostname)) { |
verify_result->cert_status |= CERT_STATUS_NON_UNIQUE_NAME; |
// CERT_STATUS_NON_UNIQUE_NAME will eventually become a hard error. For |
// now treat it as a warning and do not map it to an error return value. |
} |
-#endif |
return rv; |
} |