From Gonzalo Casas:

The asn1 definition of AlternateAccessSelection of the MMS dissector was wrong. 
It didn't allow object access with nested AlternatedAccess.
I changed the definition as in ISO 9506-2 (2003).
I also added MMSString which was not present.

I also added the definition for UtcTime as in the annex G of IEC61850-8-1 

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4404

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31584 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 61 insertions, 46 deletions

diff --git a/asn1/mms/mms.asn b/asn1/mms/mms.asn
index 21bbe2fc1d..2f1eb66b52 100644
--- a/asn1/mms/mms.asn
+++ b/asn1/mms/mms.asn
@@ -276,6 +276,8 @@ TimeOfDay ::= OCTET STRING -- (SIZE (4 | 6))
 
 Identifier ::= VisibleString
 
+MMSString ::= UTF8String
+
 Integer8   ::= INTEGER
 Integer16  ::= INTEGER
 Integer32  ::= INTEGER
@@ -1128,20 +1130,43 @@ AlternateAccess ::= SEQUENCE OF CHOICE
 		}
 	}
 
-AlternateAccessSelection ::= CHOICE
-	{
-	selectAccess	CHOICE
-		{
-		component	[1] IMPLICIT Identifier,
-		index		[2] IMPLICIT Unsigned32,
-		indexRange	[3] IMPLICIT SEQUENCE
-			{
-			lowIndex			[0] IMPLICIT Unsigned32,
-			numberOfElements		[1] IMPLICIT Unsigned32
-			},
-		allElements	[4] IMPLICIT NULL	-- all array elements
-		}
-	}
+AlternateAccessSelection ::= CHOICE 
+    {
+    selectAlternateAccess    [0] IMPLICIT SEQUENCE 
+       {
+       accessSelection CHOICE 
+          {
+          component    [0] IMPLICIT Identifier,
+          index        [1] IMPLICIT Unsigned32,
+          indexRange   [2] IMPLICIT SEQUENCE 
+             {
+             lowIndex            [0] IMPLICIT Unsigned32,
+             numberOfElements    [1] IMPLICIT Unsigned32},
+             allElements         [3] IMPLICIT NULL
+             },
+          alternateAccess  AlternateAccess
+          },
+    selectAccess CHOICE 
+       {
+       component    [1] IMPLICIT Identifier,
+       index        [2] IMPLICIT Unsigned32,
+       indexRange   [3] IMPLICIT SEQUENCE 
+          {
+          lowIndex          [0] IMPLICIT Unsigned32,
+          nmberOfElements  [1] IMPLICIT Unsigned32
+          },
+       allElements  [4] IMPLICIT NULL
+       }
+   }
+
+
+
+
+
+
+
+
+
 
 
 -- READ
@@ -1357,27 +1382,11 @@ DeleteNamedType-Error ::= Unsigned32	--	number Deleted
 
 -- SUPPORT DEFINITIONS
 
-AccessResult ::= CHOICE
-	{
-	failure		[0] IMPLICIT DataAccessError,
---      success Data
---  Expand Data here to get correct WS dissection
-        array                   [1] IMPLICIT SEQUENCE OF Data,
-        structure               [2] IMPLICIT SEQUENCE OF Data,
-        boolean                 [3] IMPLICIT BOOLEAN,   
-        bit-string              [4] IMPLICIT BIT STRING,
-        integer                 [5] IMPLICIT INTEGER,
-        unsigned                [6] IMPLICIT INTEGER,
-        floating-point          [7] IMPLICIT FloatingPoint,
--- XXX asn2wrs and packet-ber can not handle REAL yet
---      real                    [8] IMPLICIT REAL,
-        octet-string            [9] IMPLICIT OCTET STRING,
-        visible-string          [10] IMPLICIT VisibleString,
-        binary-time             [12] IMPLICIT TimeOfDay,
-        bcd                     [13] IMPLICIT INTEGER,
-        booleanArray            [14] IMPLICIT BIT STRING
-	}
-
+AccessResult ::= CHOICE 
+    {
+    failure  [0] IMPLICIT DataAccessError,
+    success  Data
+    }
 
 DataAccessError ::= INTEGER
 	{
@@ -1399,21 +1408,27 @@ DataAccessError ::= INTEGER
 Data ::= CHOICE
 	{
 	-- context tag 0 is reserved for AccessResult
-	array			[1] IMPLICIT SEQUENCE OF Data,
-	structure		[2] IMPLICIT SEQUENCE OF Data,
-	boolean			[3] IMPLICIT BOOLEAN,	
-	bit-string		[4] IMPLICIT BIT STRING,
-	integer			[5] IMPLICIT INTEGER,
-	unsigned		[6] IMPLICIT INTEGER,
+	array			    [1] IMPLICIT SEQUENCE OF Data,
+	structure		    [2] IMPLICIT SEQUENCE OF Data,
+	boolean			    [3] IMPLICIT BOOLEAN,	
+	bit-string		    [4] IMPLICIT BIT STRING,
+	integer			    [5] IMPLICIT INTEGER,
+	unsigned		    [6] IMPLICIT INTEGER,
 	floating-point		[7] IMPLICIT FloatingPoint,
 -- XXX asn2wrs and packet-ber can not handle REAL yet
---	real		 	[8] IMPLICIT REAL,
+--	real		 	    [8] IMPLICIT REAL,
 	octet-string		[9] IMPLICIT OCTET STRING,
 	visible-string		[10] IMPLICIT VisibleString,
-	binary-time		[12] IMPLICIT TimeOfDay,
-	bcd			[13] IMPLICIT INTEGER,
-	booleanArray		[14] IMPLICIT BIT STRING
-	}
+	binary-time		    [12] IMPLICIT TimeOfDay,
+	bcd			        [13] IMPLICIT INTEGER,
+	booleanArray		[14] IMPLICIT BIT STRING,
+    objId               [15] IMPLICIT OBJECT IDENTIFIER,
+  ...,
+    mMSString           [16] IMPLICIT MMSString,
+    utc-time            [17] IMPLICIT UtcTime				-- added by IEC61850 8.1 G3	
+    }
+
+UtcTime ::= OCTET STRING    		                        -- added by IEC61850 8.1 G3	
 
 FloatingPoint ::= OCTET STRING