X509NameAttribute::ValueAsString: Decode TeletexString as Latin1.

net/cert/internal/parse_name.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/internal/parse_name.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/third_party/icu/icu_utf.h"
 
+#if !defined(OS_NACL)
+#include "net/base/net_string_util.h"
+#endif
+
 namespace net {
 
 namespace {
 
 // Converts a BMPString value in Input |in| to UTF-8.
 //
 // If the conversion is successful, returns true and stores the result in
 // |out|. Otherwise it returns false and leaves |out| unmodified.
 bool ConvertBmpStringValue(const der::Input& in, std::string* out) {
   if (in.Length() % 2 != 0)
@@ skipping 160 matching lines @@
 der::Input TypeDomainComponentOid() {
   // dc (domainComponent): 0.9.2342.19200300.100.1.25 (RFC 4519)
   static const uint8_t oid[] = {0x09, 0x92, 0x26, 0x89, 0x93,
                                 0xF2, 0x2C, 0x64, 0x01, 0x19};
   return der::Input(oid);
 }
 
 bool X509NameAttribute::ValueAsString(std::string* out) const {
   switch (value_tag) {
     case der::kTeletexString:
-      for (char c : value.AsStringPiece()) {
-        if (c < 32 || c > 126)
-          return false;
-      }
-      *out = value.AsString();
-      return true;
+#if !defined(OS_NACL)
+      return ConvertToUtf8(value.AsString(), kCharsetLatin1, out);
+#else
+// For nacl, just fall through to treating like IA5String (ascii).
+// (The nacl build does not include net_string_util and its deps, and a test of
+// adding them increased nacl build size by 100KB.)
+// TODO(mattm): Remove this behavioral difference.
+#endif
     case der::kIA5String:
       for (char c : value.AsStringPiece()) {
         if (static_cast<uint8_t>(c) > 127)
           return false;
       }
       *out = value.AsString();
       return true;
     case der::kPrintableString:
       for (char c : value.AsStringPiece()) {
         if (!(base::IsAsciiAlpha(c) || c == ' ' || (c >= '\'' && c <= ':') ||
@@ skipping 167 matching lines @@
     if (!rdns_string.empty())
       rdns_string += ",";
     rdns_string += rdn_string;
   }
 
   *out = rdns_string;
   return true;
 }
 
 }  // namespace net