Fixed normalization of certificate subject for in-file certificates

Bug: 819793
Change-Id: Ic42c128ba5f30208332f17100d24a61ee320c3db
Reviewed-on: https://chromium-review.googlesource.com/1012190Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550677}

chrome/browser/conflicts/module_info_util_win.cc

@@ -110,6 +110,10 @@ base::string16 GetSubjectNameInFile(const base::FilePath& filename) {
     return base::string16();
   }
 
+  // The subject name is normalized because it can contain trailing null
+  // characters.
+  internal::NormalizeCertificateSubject(&subject_name);
+
   return subject_name;
 }
 
@@ -217,10 +221,6 @@ void GetCatalogCertificateInfo(const base::FilePath& filename,
   certificate_info->type = CertificateType::CERTIFICATE_IN_CATALOG;
   certificate_info->path = catalog_path;
   certificate_info->subject = subject;
-
-  // The subject name is normalized because it can contain trailing null
-  // characters.
-  internal::NormalizeCertificateSubject(certificate_info);
 }
 
 }  // namespace
@@ -329,10 +329,10 @@ bool GetModuleImageSizeAndTimeDateStamp(const base::FilePath& path,
 
 namespace internal {
 
-void NormalizeCertificateSubject(CertificateInfo* certificate_info) {
-  size_t first_null = certificate_info->subject.find(L'\0');
+void NormalizeCertificateSubject(base::string16* subject) {
+  size_t first_null = subject->find(L'\0');
   if (first_null != base::string16::npos)
-    certificate_info->subject.resize(first_null);
+    subject->resize(first_null);
 }
 
 }  // namespace internal

chrome/browser/conflicts/module_info_util_win.h

@@ -74,7 +74,7 @@ namespace internal {
 
 // Removes trailing null characters from the certificate's subject.
 // Exposed for testing.
-void NormalizeCertificateSubject(CertificateInfo* certificate_info);
+void NormalizeCertificateSubject(base::string16* subject);
 
 }  // namespace internal
 

chrome/browser/conflicts/module_info_util_win_unittest.cc

@@ -171,14 +171,12 @@ TEST(ModuleInfoUtilTest, InvalidNTHeader) {
 }
 
 TEST(ModuleInfoUtilTest, NormalizeCertificateSubject) {
-  CertificateInfo test_case;
-  test_case.subject = base::string16(L"signer\0", 7);
-  EXPECT_EQ(7u, test_case.subject.length());
+  base::string16 test_case = base::string16(L"signer\0", 7);
+  EXPECT_EQ(7u, test_case.length());
 
-  CertificateInfo expected;
-  expected.subject = L"signer";
+  base::string16 expected = L"signer";
 
   internal::NormalizeCertificateSubject(&test_case);
 
-  EXPECT_EQ(test_case.subject, expected.subject);
+  EXPECT_EQ(test_case, expected);
 }