From b08f26d3658db3213d98932cbc6dd3e6efdc8b85 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Thu, 9 Nov 2017 16:43:57 -0500
Subject: Remove use of transcode

---
 src/cli/asn1.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/cli/asn1.cpp')

diff --git a/src/cli/asn1.cpp b/src/cli/asn1.cpp
index 5c90a3c5b..234cbd6e6 100644
--- a/src/cli/asn1.cpp
+++ b/src/cli/asn1.cpp
@@ -22,9 +22,6 @@
 #include <sstream>
 #include <ctype.h>
 
-// Set this if your terminal understands UTF-8; otherwise output is in Latin-1
-#define UTF8_TERMINAL 1
-
 namespace Botan_CLI {
 
 namespace {
@@ -349,17 +346,7 @@ void decode(std::ostream& output,
          {
          Botan::ASN1_String str;
          data.decode(str);
-         if(UTF8_TERMINAL)
-            {
-            emit(output, type_name(type_tag), level, length,
-                 Botan::Charset::transcode(str.iso_8859(),
-                                           Botan::UTF8_CHARSET,
-                                           Botan::LATIN1_CHARSET));
-            }
-         else
-            {
-            emit(output, type_name(type_tag), level, length, str.iso_8859());
-            }
+         emit(output, type_name(type_tag), level, length, str.value());
          }
       else if(type_tag == Botan::UTC_TIME || type_tag == Botan::GENERALIZED_TIME)
          {
-- 
cgit v1.2.3