diff options
author | Erlang/OTP <[email protected]> | 2010-10-04 13:07:28 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-10-04 13:07:28 +0200 |
commit | c8122ff35f5e0cc4af7f8ea7fd63af126f245ffd (patch) | |
tree | 23b95141897fc637234487c0926a83b230b58263 /lib/asn1/src/asn1ct_gen_ber_bin_v2.erl | |
parent | 5ddf44bb91540fd88e604f077d71482c40185cd8 (diff) | |
parent | c6f303fba85322f74a4e8165046924ebf2fd1eed (diff) | |
download | otp-c8122ff35f5e0cc4af7f8ea7fd63af126f245ffd.tar.gz otp-c8122ff35f5e0cc4af7f8ea7fd63af126f245ffd.tar.bz2 otp-c8122ff35f5e0cc4af7f8ea7fd63af126f245ffd.zip |
Merge branch 'kenneth/asn1/enc_extaddgrp/OTP-8866' into maint-r13
* kenneth/asn1/enc_extaddgrp/OTP-8866:
Add additional test to cover this correction
correct the encoding of ExtensionAdditionGroup
temp
Add support for ExtensionAdditionGroup notation in nested types as well
Diffstat (limited to 'lib/asn1/src/asn1ct_gen_ber_bin_v2.erl')
-rw-r--r-- | lib/asn1/src/asn1ct_gen_ber_bin_v2.erl | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl index b7ac0f407c..ac232ea710 100644 --- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl +++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2002-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2002-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% %% @@ -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). |