diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-08 09:29:18 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-15 15:27:15 +0100 |
| commit | d3597d31c3b26a6269ed37b7856425a1d0641a90 (patch) | |
| tree | 9808c76c40d2f3006e1244bd25ab3470e24b26a3 /lib | |
| parent | 244b486f73bedbfae83b408d59ddb3b7a095d0b7 (diff) | |
| download | otp-d3597d31c3b26a6269ed37b7856425a1d0641a90.tar.gz otp-d3597d31c3b26a6269ed37b7856425a1d0641a90.tar.bz2 otp-d3597d31c3b26a6269ed37b7856425a1d0641a90.zip | |
BER: Fix broken table constraints inside a SET OF/SEQUENCE OF
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl | 9 | ||||
| -rw-r--r-- | lib/asn1/test/Makefile | 1 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/asn1/test/testWSParamClass.erl | 17 |
4 files changed, 22 insertions, 9 deletions
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl index e82212f0d8..341a04761b 100644 --- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl +++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl @@ -528,14 +528,7 @@ gen_decode_sof(Erules,TypeName,_InnerTypeName,D) when is_record(D,type) -> Atom when is_atom(Atom) -> Atom; _ -> TypeNameSuffix end, -%% fix me - ObjFun = - case D#type.tablecinf of - [{objfun,_}|_R] -> - ", ObjFun"; - _ -> - [] - end, + ObjFun = false, gen_dec_line(Erules,TypeName,ContName,[],Cont,mandatory,ObjFun), %% gen_dec_line_sof(Erules,Typename,ContName,Cont,ObjFun), emit([" || ",{curr,v}," <- ",{curr,tlv},"].",nl,nl,nl]). diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile index 1fa495d8f1..10f8e2833b 100644 --- a/lib/asn1/test/Makefile +++ b/lib/asn1/test/Makefile @@ -109,6 +109,7 @@ MODULES= \ test_modified_x420 \ testX420 \ test_x691 \ + testWSParamClass \ asn1_test_lib \ asn1_app_test \ asn1_appup_test \ diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index abf1ba83a5..d66f395adb 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -991,7 +991,9 @@ test_ParamTypeInfObj(Config) -> test_WS_ParamClass(Config) -> test(Config, fun test_WS_ParamClass/3). test_WS_ParamClass(Config, Rule, Opts) -> - asn1_test_lib:compile("InformationFramework", Config, [Rule|Opts]). + asn1_test_lib:compile("InformationFramework", Config, [Rule|Opts]), + ?only_ber(testWSParamClass:main(Rule)), + ok. test_Defed_ObjectIdentifier(Config) -> asn1_test_lib:compile("UsefulDefinitions", Config, [ber]). diff --git a/lib/asn1/test/testWSParamClass.erl b/lib/asn1/test/testWSParamClass.erl new file mode 100644 index 0000000000..ae67ca8b81 --- /dev/null +++ b/lib/asn1/test/testWSParamClass.erl @@ -0,0 +1,17 @@ +-module(testWSParamClass). +-export([main/1]). + +main(_) -> + IF = 'InformationFramework', + roundtrip({'Attribute',IF:'id-at-objectClass'(), + [IF:'id-at-objectClass'()], + asn1_NOVALUE}), + roundtrip({'Attribute',IF:'id-at-objectClass'(), + [],[]}), + ok. + +roundtrip(Data) -> + IF = 'InformationFramework', + {ok,Enc} = asn1_wrapper:encode(IF, 'Attribute', Data), + {ok,Data} = IF:decode('Attribute', Enc), + ok. |