From 739ad067cf8775558fade616353f44d49a13a487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 28 Apr 2014 12:25:22 +0200
Subject: Correct OCTET STRING default when legacy_erlang_types is active

The default value for an OCTET STRING when legacy_erlang_types was
active would be a binary instead of a list.
---
 lib/asn1/src/asn1ct_gen.erl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/asn1/src')

diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 149813c3aa..c6561bcdb4 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -1378,6 +1378,11 @@ conform_value(#type{def={'BIT STRING',[]}}, Bs) ->
 	bitstring when is_bitstring(Bs) ->
 	    Bs
     end;
+conform_value(#type{def='OCTET STRING'}, String) ->
+    case asn1ct:use_legacy_types() of
+	false -> String;
+	true -> binary_to_list(String)
+    end;
 conform_value(_, Value) -> Value.
 
 named_bitstring_value(List, Names) ->
-- 
cgit v1.2.3