From f894be67127261270739039ac291ecc3353c470b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 13 Feb 2013 15:46:27 +0100
Subject: per,uper: Fix breakage of compilation of InformationFramework

Commit f16f43446a04c459486356c0b4ad517cc9201895 broke compilation
of InformationFramework for per and uper.
---
 lib/asn1/src/asn1ct_gen_per.erl | 10 +++++-----
 lib/asn1/test/asn1_SUITE.erl    | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'lib/asn1')

diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 0d6620667f..fac233532b 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -1174,12 +1174,12 @@ gen_dec_imm_1('UTF8String', _Constraint, Aligned) ->
     asn1ct_imm:per_dec_restricted_string(Aligned);
 gen_dec_imm_1('REAL', _Constraint, Aligned) ->
     asn1ct_imm:per_dec_real(Aligned);
-gen_dec_imm_1(#'ObjectClassFieldType'{}=TypeName, Constraint, Aligned) ->
+gen_dec_imm_1(#'ObjectClassFieldType'{}=TypeName, _Constraint, Aligned) ->
     case asn1ct_gen:get_inner(TypeName) of
-	{fixedtypevaluefield,_,InnerType} ->
-	    gen_dec_imm_1(InnerType, Constraint, Aligned);
-	T ->
-	    gen_dec_imm_1(T, Constraint, Aligned)
+	{fixedtypevaluefield,_,#type{def=InnerType,constraint=C}} ->
+	    gen_dec_imm_1(InnerType, C, Aligned);
+	#type{def=T,constraint=C} ->
+	    gen_dec_imm_1(T, C, Aligned)
     end.
 
 gen_dec_bit_string(F, Imm) ->
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 4f4c972c49..7458fdd0f2 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -166,13 +166,13 @@ groups() ->
        testINSTANCE_OF,
        testTCAP,
        test_ParamTypeInfObj,
-       test_WS_ParamClass,
        test_Defed_ObjectIdentifier,
        testSelectionType,
        testSSLspecs,
        testNortel,
-       % Uses 'PKCS7'
-       {group, [], [test_modified_x420,
+       % Uses 'PKCS7', 'InformationFramework'
+       {group, [], [test_WS_ParamClass,
+		    test_modified_x420,
                     testX420]},
        testTcapsystem,
        testNBAPsystem,
@@ -986,8 +986,9 @@ test_driver_load(Config, Rule, Opts) ->
 test_ParamTypeInfObj(Config) ->
     asn1_test_lib:compile("IN-CS-1-Datatypes", Config, [ber]).
 
-test_WS_ParamClass(Config) ->
-    asn1_test_lib:compile("InformationFramework", Config, [ber]).
+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]).
 
 test_Defed_ObjectIdentifier(Config) ->
     asn1_test_lib:compile("UsefulDefinitions", Config, [ber]).
-- 
cgit v1.2.3