[Redbutton-devel] SF.net SVN: redbutton: [399] redbutton-author/trunk

[<ski...@us...>]

Revision: 399
          http://redbutton.svn.sourceforge.net/redbutton/?rev=399&view=rev
Author:   skilvington
Date:     2007-09-18 12:52:00 -0700 (Tue, 18 Sep 2007)

Log Message:
-----------
an OctetString in the grammar is different than an ASN1 OCTETSTRING type

Modified Paths:
--------------
    redbutton-author/trunk/asn1tag.h
    redbutton-author/trunk/parser.c.header

Modified: redbutton-author/trunk/asn1tag.h
===================================================================
--- redbutton-author/trunk/asn1tag.h	2007-09-18 16:42:05 UTC (rev 398)
+++ redbutton-author/trunk/asn1tag.h	2007-09-18 19:52:00 UTC (rev 399)
@@ -43,6 +43,7 @@
 #define ASN1TAGCLASS_LineArtBody	ASN1TAG_SYNTHETIC
 #define ASN1TAGCLASS_TextBody		ASN1TAG_SYNTHETIC
 #define ASN1TAGCLASS_PushButtonBody	ASN1TAG_SYNTHETIC
+#define ASN1TAGCLASS_OctetString	ASN1TAG_SYNTHETIC
 
 /* ASN1 CONTEXT tag values */
 #define ASN1TAG_ApplicationClass	0
@@ -549,16 +550,16 @@
 /* ASN1 UNIVERSAL tag values */
 #define ASN1TAG_BOOLEAN		1
 #define ASN1TAG_INTEGER		2
-#define ASN1TAG_OctetString	4
-#define ASN1TAG_Null		5
+#define ASN1TAG_OCTETSTRING	4
+#define ASN1TAG_NULL		5
 #define ASN1TAG_ENUMERATED	10
 #define ASN1TAG_SEQUENCE	16
 #define ASN1TAG_SET		17
 /* and with the class included */
 #define ASN1TAGCLASS_BOOLEAN		((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_BOOLEAN)
 #define ASN1TAGCLASS_INTEGER		((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_INTEGER)
-#define ASN1TAGCLASS_OctetString	((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_OctetString)
-#define ASN1TAGCLASS_Null		((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_Null)
+#define ASN1TAGCLASS_OCTETSTRING	((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_OCTETSTRING)
+#define ASN1TAGCLASS_NULL		((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_NULL)
 #define ASN1TAGCLASS_ENUMERATED		((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_ENUMERATED)
 #define ASN1TAGCLASS_SEQUENCE		((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_SEQUENCE)
 #define ASN1TAGCLASS_SET		((ASN1CLASS_UNIVERSAL << 24) | ASN1TAG_SET)

Modified: redbutton-author/trunk/parser.c.header
===================================================================
--- redbutton-author/trunk/parser.c.header	2007-09-18 16:42:05 UTC (rev 398)
+++ redbutton-author/trunk/parser.c.header	2007-09-18 19:52:00 UTC (rev 399)
@@ -129,7 +129,7 @@
 	/* give our parent a UNIVERSAL type if it is synthetic */
 	if(is_synthetic(parent->asn1tag))
 	{
-		parent->asn1tag = ASN1TAG_OctetString;
+		parent->asn1tag = ASN1TAG_OCTETSTRING;
 		parent->asn1class = ASN1CLASS_UNIVERSAL;
 	}
 
@@ -149,7 +149,7 @@
 	/* give our parent a UNIVERSAL type if it is synthetic */
 	if(is_synthetic(parent->asn1tag))
 	{
-		parent->asn1tag = ASN1TAG_OctetString;
+		parent->asn1tag = ASN1TAG_OCTETSTRING;
 		parent->asn1class = ASN1CLASS_UNIVERSAL;
 	}
 
@@ -169,7 +169,7 @@
 	/* give our parent a UNIVERSAL type if it is synthetic */
 	if(is_synthetic(parent->asn1tag))
 	{
-		parent->asn1tag = ASN1TAG_OctetString;
+		parent->asn1tag = ASN1TAG_OCTETSTRING;
 		parent->asn1class = ASN1CLASS_UNIVERSAL;
 	}
 
@@ -193,7 +193,7 @@
 	/* give our parent a UNIVERSAL type if it is synthetic */
 	if(is_synthetic(parent->asn1tag))
 	{
-		parent->asn1tag = ASN1TAG_Null;
+		parent->asn1tag = ASN1TAG_NULL;
 		parent->asn1class = ASN1CLASS_UNIVERSAL;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.