diff options
| author | Kenneth Lundin <kenneth@erlang.org> | 2010-09-10 12:09:00 +0200 |
|---|---|---|
| committer | Kenneth Lundin <kenneth@erlang.org> | 2010-09-10 12:09:00 +0200 |
| commit | 357860d3b5def55eba80523c0be83ee4ebcab12c (patch) | |
| tree | ce7ecf49f15053bd9aafd460e6201a7d6d44e33a /lib/asn1/src/asn1ct_gen_ber_bin_v2.erl | |
| parent | 1470138027905c4adfd87d805457a40b39c2bdc6 (diff) | |
| parent | 210fbb984619e6a6bb1122b7a6f72f54fb72effb (diff) | |
| download | erlang-357860d3b5def55eba80523c0be83ee4ebcab12c.tar.gz | |
Merge branch 'kenneth/asn1/nested_extaddgroup/OTP-8797' into dev
* kenneth/asn1/nested_extaddgroup/OTP-8797:
Add support for ExtensionAdditionGroup notation in nested types as well
Conflicts:
lib/asn1/test/test_undecoded_rest.erl
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, 11 insertions, 3 deletions
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl index a146e92d64..9ec458e351 100644 --- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl +++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl @@ -33,6 +33,7 @@ -export([gen_objectset_code/2, gen_obj_code/3]). -export([encode_tag_val/3]). -export([gen_inc_decode/2,gen_decode_selected/3]). +-export([extaddgroup2sequence/1]). -import(asn1ct_gen, [emit/1,demit/1]). @@ -1826,8 +1827,15 @@ mk_object_val(Val, Ack, Len) -> add_func(F={_Func,_Arity}) -> ets:insert(asn1_functab,{F}). - - - +%% For BER the ExtensionAdditionGroup notation has no impact on the encoding/decoding +%% and therefore we only filter away the ExtensionAdditionGroup start and end markers +extaddgroup2sequence(ExtList) when is_list(ExtList) -> + lists:filter(fun(#'ExtensionAdditionGroup'{}) -> + false; + ('ExtensionAdditionGroupEnd') -> + false; + (_) -> + true + end, ExtList). |