diff options
| author | Björn Gustavsson <[email protected]> | 2014-01-21 16:12:46 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-01-24 16:24:56 +0100 |
| commit | aaa4ea283b2b7dad74fdcdd5963558e9d03d80b0 (patch) | |
| tree | 765382e19e86d86a897daec07e7335571285966d /lib/asn1/src/asn1ct_gen_ber_bin_v2.erl | |
| parent | 4bda9201055daf3abbdb5ef48bbdd0efacfd1fbc (diff) | |
| download | otp-aaa4ea283b2b7dad74fdcdd5963558e9d03d80b0.tar.gz otp-aaa4ea283b2b7dad74fdcdd5963558e9d03d80b0.tar.bz2 otp-aaa4ea283b2b7dad74fdcdd5963558e9d03d80b0.zip | |
Fix OCTET STRING
Diffstat (limited to 'lib/asn1/src/asn1ct_gen_ber_bin_v2.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_ber_bin_v2.erl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl index 84cda4491b..f3a6f115d3 100644 --- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl +++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl @@ -493,7 +493,6 @@ gen_dec_prim(_Erules, Att, BytesVar, DoTag, _TagIn, _Form, _OptOrMand) -> _ -> "" end, NewTypeName = case Typename of - 'OCTET STRING' -> restricted_string; 'NumericString' -> restricted_string; 'TeletexString' -> restricted_string; 'T61String' -> restricted_string; @@ -551,6 +550,19 @@ gen_dec_prim(_Erules, Att, BytesVar, DoTag, _TagIn, _Form, _OptOrMand) -> 'RELATIVE-OID' -> emit(["decode_relative_oid(",BytesVar,","]), need(decode_relative_oid, 2); + 'OCTET STRING' -> + F = case asn1ct:use_legacy_types() of + false -> decode_octet_string; + true -> decode_restricted_string + end, + emit([{asis,F},"(",BytesVar,","]), + case Constraint of + [] -> + need(F, 2); + _ -> + emit([{asis,Constraint},","]), + need(F, 3) + end; restricted_string -> emit(["decode_restricted_string",AsBin,"(",BytesVar,","]), case Constraint of |