renamed types

diff --git a/lib/ASN1.c b/lib/ASN1.c
index 477addd..928d28d 100644 (file)
--- a/lib/ASN1.c
+++ b/lib/ASN1.c
@@ -2047,14 +2047,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 254 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_NUMERICSTRING|CONST_UNIVERSAL);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_NUMERIC_STRING|CONST_UNIVERSAL);}
     break;
 
   case 47:
 
 /* Line 1806 of yacc.c  */
 #line 255 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_NUMERICSTRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_NUMERIC_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 
@@ -2062,14 +2062,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 259 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_IA5STRING);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_IA5_STRING);}
     break;
 
   case 49:
 
 /* Line 1806 of yacc.c  */
 #line 260 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_IA5STRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_IA5_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 
@@ -2077,14 +2077,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 264 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_TELETEXSTRING);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_TELETEX_STRING);}
     break;
 
   case 51:
 
 /* Line 1806 of yacc.c  */
 #line 265 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_TELETEXSTRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_TELETEX_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 
@@ -2092,14 +2092,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 269 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_PRINTABLESTRING);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_PRINTABLE_STRING);}
     break;
 
   case 53:
 
 /* Line 1806 of yacc.c  */
 #line 270 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_PRINTABLESTRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_PRINTABLE_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 
@@ -2107,14 +2107,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 274 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UNIVERSALSTRING);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UNIVERSAL_STRING);}
     break;
 
   case 55:
 
 /* Line 1806 of yacc.c  */
 #line 275 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UNIVERSALSTRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UNIVERSAL_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 
@@ -2122,14 +2122,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 279 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_BMPSTRING);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_BMP_STRING);}
     break;
 
   case 57:
 
 /* Line 1806 of yacc.c  */
 #line 280 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_BMPSTRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_BMP_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 
@@ -2137,14 +2137,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 284 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UTF8STRING);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UTF8_STRING);}
     break;
 
   case 59:
 
 /* Line 1806 of yacc.c  */
 #line 285 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UTF8STRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_UTF8_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 
@@ -2152,14 +2152,14 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 289 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_VISIBLESTRING);}
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_VISIBLE_STRING);}
     break;
 
   case 61:
 
 /* Line 1806 of yacc.c  */
 #line 290 "ASN1.y"
-    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_VISIBLESTRING|CONST_SIZE);
+    {(yyval.node)=_asn1_add_static_node(ASN1_ETYPE_VISIBLE_STRING|CONST_SIZE);
                                          _asn1_set_down((yyval.node),(yyvsp[(2) - (2)].node));}
     break;
 

diff --git a/lib/ASN1.y b/lib/ASN1.y
index aa0baa7..dafe15a 100644 (file)
--- a/lib/ASN1.y
+++ b/lib/ASN1.y
@@ -251,43 +251,43 @@ generalstring_def: GeneralString {$$=_asn1_add_static_node(ASN1_ETYPE_GENERALSTR
                                          _asn1_set_down($$,$2);}
 ;
 
-numericstring_def: NumericString {$$=_asn1_add_static_node(ASN1_ETYPE_NUMERICSTRING|CONST_UNIVERSAL);}
-                | NumericString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_NUMERICSTRING|CONST_SIZE);
+numericstring_def: NumericString {$$=_asn1_add_static_node(ASN1_ETYPE_NUMERIC_STRING|CONST_UNIVERSAL);}
+                | NumericString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_NUMERIC_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 
-ia5string_def: IA5String {$$=_asn1_add_static_node(ASN1_ETYPE_IA5STRING);}
-                | IA5String size_def {$$=_asn1_add_static_node(ASN1_ETYPE_IA5STRING|CONST_SIZE);
+ia5string_def: IA5String {$$=_asn1_add_static_node(ASN1_ETYPE_IA5_STRING);}
+                | IA5String size_def {$$=_asn1_add_static_node(ASN1_ETYPE_IA5_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 
-teletexstring_def: TeletexString {$$=_asn1_add_static_node(ASN1_ETYPE_TELETEXSTRING);}
-                | TeletexString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_TELETEXSTRING|CONST_SIZE);
+teletexstring_def: TeletexString {$$=_asn1_add_static_node(ASN1_ETYPE_TELETEX_STRING);}
+                | TeletexString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_TELETEX_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 
-printablestring_def: PrintableString {$$=_asn1_add_static_node(ASN1_ETYPE_PRINTABLESTRING);}
-                | PrintableString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_PRINTABLESTRING|CONST_SIZE);
+printablestring_def: PrintableString {$$=_asn1_add_static_node(ASN1_ETYPE_PRINTABLE_STRING);}
+                | PrintableString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_PRINTABLE_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 
-universalstring_def: UniversalString {$$=_asn1_add_static_node(ASN1_ETYPE_UNIVERSALSTRING);}
-                | UniversalString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_UNIVERSALSTRING|CONST_SIZE);
+universalstring_def: UniversalString {$$=_asn1_add_static_node(ASN1_ETYPE_UNIVERSAL_STRING);}
+                | UniversalString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_UNIVERSAL_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 
-bmpstring_def: BMPString {$$=_asn1_add_static_node(ASN1_ETYPE_BMPSTRING);}
-                | BMPString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_BMPSTRING|CONST_SIZE);
+bmpstring_def: BMPString {$$=_asn1_add_static_node(ASN1_ETYPE_BMP_STRING);}
+                | BMPString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_BMP_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 
-utf8string_def: UTF8String {$$=_asn1_add_static_node(ASN1_ETYPE_UTF8STRING);}
-                | UTF8String size_def {$$=_asn1_add_static_node(ASN1_ETYPE_UTF8STRING|CONST_SIZE);
+utf8string_def: UTF8String {$$=_asn1_add_static_node(ASN1_ETYPE_UTF8_STRING);}
+                | UTF8String size_def {$$=_asn1_add_static_node(ASN1_ETYPE_UTF8_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 
-visiblestring_def: VisibleString {$$=_asn1_add_static_node(ASN1_ETYPE_VISIBLESTRING);}
-                | VisibleString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_VISIBLESTRING|CONST_SIZE);
+visiblestring_def: VisibleString {$$=_asn1_add_static_node(ASN1_ETYPE_VISIBLE_STRING);}
+                | VisibleString size_def {$$=_asn1_add_static_node(ASN1_ETYPE_VISIBLE_STRING|CONST_SIZE);
                                          _asn1_set_down($$,$2);}
 ;
 

diff --git a/lib/coding.c b/lib/coding.c
index 1d67f5f..007703c 100644 (file)
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -515,14 +515,14 @@ _asn1_complete_explicit_tag (asn1_node node, unsigned char *der,
 const tag_and_class_st _asn1_tags[] =
 {
   [ASN1_ETYPE_GENERALSTRING] = {ASN1_TAG_GENERALSTRING, ASN1_CLASS_UNIVERSAL, "type:GENERALSTRING"},
-  [ASN1_ETYPE_NUMERICSTRING] = {ASN1_TAG_NUMERICSTRING, ASN1_CLASS_UNIVERSAL, "type:NUMERIC_STR"},
-  [ASN1_ETYPE_IA5STRING] =     {ASN1_TAG_IA5STRING, ASN1_CLASS_UNIVERSAL, "type:IA5_STR"},
-  [ASN1_ETYPE_TELETEXSTRING] = {ASN1_TAG_TELETEXSTRING, ASN1_CLASS_UNIVERSAL, "type:TELETEX_STR"},
-  [ASN1_ETYPE_PRINTABLESTRING] = {ASN1_TAG_PRINTABLESTRING, ASN1_CLASS_UNIVERSAL, "type:PRINTABLE_STR"},
-  [ASN1_ETYPE_UNIVERSALSTRING] = {ASN1_TAG_UNIVERSALSTRING, ASN1_CLASS_UNIVERSAL, "type:UNIVERSAL_STR"},
-  [ASN1_ETYPE_BMPSTRING] =       {ASN1_TAG_BMPSTRING, ASN1_CLASS_UNIVERSAL, "type:BMP_STR"},
-  [ASN1_ETYPE_UTF8STRING] =      {ASN1_TAG_UTF8STRING, ASN1_CLASS_UNIVERSAL, "type:UTF8_STR"},
-  [ASN1_ETYPE_VISIBLESTRING] =   {ASN1_TAG_VISIBLESTRING, ASN1_CLASS_UNIVERSAL, "type:VISIBLE_STR"},
+  [ASN1_ETYPE_NUMERIC_STRING] = {ASN1_TAG_NUMERIC_STRING, ASN1_CLASS_UNIVERSAL, "type:NUMERIC_STR"},
+  [ASN1_ETYPE_IA5_STRING] =     {ASN1_TAG_IA5_STRING, ASN1_CLASS_UNIVERSAL, "type:IA5_STR"},
+  [ASN1_ETYPE_TELETEX_STRING] = {ASN1_TAG_TELETEX_STRING, ASN1_CLASS_UNIVERSAL, "type:TELETEX_STR"},
+  [ASN1_ETYPE_PRINTABLE_STRING] = {ASN1_TAG_PRINTABLE_STRING, ASN1_CLASS_UNIVERSAL, "type:PRINTABLE_STR"},
+  [ASN1_ETYPE_UNIVERSAL_STRING] = {ASN1_TAG_UNIVERSAL_STRING, ASN1_CLASS_UNIVERSAL, "type:UNIVERSAL_STR"},
+  [ASN1_ETYPE_BMP_STRING] =       {ASN1_TAG_BMP_STRING, ASN1_CLASS_UNIVERSAL, "type:BMP_STR"},
+  [ASN1_ETYPE_UTF8_STRING] =      {ASN1_TAG_UTF8_STRING, ASN1_CLASS_UNIVERSAL, "type:UTF8_STR"},
+  [ASN1_ETYPE_VISIBLE_STRING] =   {ASN1_TAG_VISIBLE_STRING, ASN1_CLASS_UNIVERSAL, "type:VISIBLE_STR"},
   [ASN1_ETYPE_OCTET_STRING] =    {ASN1_TAG_OCTET_STRING, ASN1_CLASS_UNIVERSAL, "type:OCT_STR"},
   [ASN1_ETYPE_BIT_STRING] = {ASN1_TAG_BIT_STRING, ASN1_CLASS_UNIVERSAL, "type:BIT_STR"},
   [ASN1_ETYPE_OBJECT_ID] =  {ASN1_TAG_OBJECT_ID, ASN1_CLASS_UNIVERSAL, "type:OBJ_STR"},
@@ -1080,14 +1080,14 @@ asn1_der_coding (asn1_node element, const char *name, void *ider, int *len,
          break;
        case ASN1_ETYPE_OCTET_STRING:
        case ASN1_ETYPE_GENERALSTRING:
-       case ASN1_ETYPE_NUMERICSTRING:
-       case ASN1_ETYPE_IA5STRING:
-       case ASN1_ETYPE_TELETEXSTRING:
-       case ASN1_ETYPE_PRINTABLESTRING:
-       case ASN1_ETYPE_UNIVERSALSTRING:
-       case ASN1_ETYPE_BMPSTRING:
-       case ASN1_ETYPE_UTF8STRING:
-       case ASN1_ETYPE_VISIBLESTRING:
+       case ASN1_ETYPE_NUMERIC_STRING:
+       case ASN1_ETYPE_IA5_STRING:
+       case ASN1_ETYPE_TELETEX_STRING:
+       case ASN1_ETYPE_PRINTABLE_STRING:
+       case ASN1_ETYPE_UNIVERSAL_STRING:
+       case ASN1_ETYPE_BMP_STRING:
+       case ASN1_ETYPE_UTF8_STRING:
+       case ASN1_ETYPE_VISIBLE_STRING:
        case ASN1_ETYPE_BIT_STRING:
          if (p->value == NULL)
            {

diff --git a/lib/decoding.c b/lib/decoding.c
index d11a5a7..82e5f4e 100644 (file)
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -498,14 +498,14 @@ _asn1_extract_tag_der (asn1_node node, const unsigned char *der, int der_len,
        case ASN1_ETYPE_ENUMERATED:
        case ASN1_ETYPE_OBJECT_ID:
        case ASN1_ETYPE_GENERALSTRING:
-       case ASN1_ETYPE_NUMERICSTRING:
-       case ASN1_ETYPE_IA5STRING:
-       case ASN1_ETYPE_TELETEXSTRING:
-       case ASN1_ETYPE_PRINTABLESTRING:
-       case ASN1_ETYPE_UNIVERSALSTRING:
-       case ASN1_ETYPE_BMPSTRING:
-       case ASN1_ETYPE_UTF8STRING:
-       case ASN1_ETYPE_VISIBLESTRING:
+       case ASN1_ETYPE_NUMERIC_STRING:
+       case ASN1_ETYPE_IA5_STRING:
+       case ASN1_ETYPE_TELETEX_STRING:
+       case ASN1_ETYPE_PRINTABLE_STRING:
+       case ASN1_ETYPE_UNIVERSAL_STRING:
+       case ASN1_ETYPE_BMP_STRING:
+       case ASN1_ETYPE_UTF8_STRING:
+       case ASN1_ETYPE_VISIBLE_STRING:
        case ASN1_ETYPE_BIT_STRING:
        case ASN1_ETYPE_SEQUENCE:
        case ASN1_ETYPE_SEQUENCE_OF:
@@ -1078,14 +1078,14 @@ asn1_der_decoding (asn1_node * element, const void *ider, int len,
              move = RIGHT;
              break;
            case ASN1_ETYPE_GENERALSTRING:
-            case ASN1_ETYPE_NUMERICSTRING:
-            case ASN1_ETYPE_IA5STRING:
-            case ASN1_ETYPE_TELETEXSTRING:
-            case ASN1_ETYPE_PRINTABLESTRING:
-            case ASN1_ETYPE_UNIVERSALSTRING:
-            case ASN1_ETYPE_BMPSTRING:
-            case ASN1_ETYPE_UTF8STRING:
-            case ASN1_ETYPE_VISIBLESTRING:
+            case ASN1_ETYPE_NUMERIC_STRING:
+            case ASN1_ETYPE_IA5_STRING:
+            case ASN1_ETYPE_TELETEX_STRING:
+            case ASN1_ETYPE_PRINTABLE_STRING:
+            case ASN1_ETYPE_UNIVERSAL_STRING:
+            case ASN1_ETYPE_BMP_STRING:
+            case ASN1_ETYPE_UTF8_STRING:
+            case ASN1_ETYPE_VISIBLE_STRING:
            case ASN1_ETYPE_BIT_STRING:
              len2 =
                asn1_get_length_der (der + counter, len - counter, &len3);
@@ -1756,14 +1756,14 @@ asn1_der_decoding_element (asn1_node * structure, const char *elementName,
              move = RIGHT;
              break;
            case ASN1_ETYPE_GENERALSTRING:
-            case ASN1_ETYPE_NUMERICSTRING:
-            case ASN1_ETYPE_IA5STRING:
-            case ASN1_ETYPE_TELETEXSTRING:
-            case ASN1_ETYPE_PRINTABLESTRING:
-            case ASN1_ETYPE_UNIVERSALSTRING:
-            case ASN1_ETYPE_BMPSTRING:
-            case ASN1_ETYPE_UTF8STRING:
-            case ASN1_ETYPE_VISIBLESTRING:
+            case ASN1_ETYPE_NUMERIC_STRING:
+            case ASN1_ETYPE_IA5_STRING:
+            case ASN1_ETYPE_TELETEX_STRING:
+            case ASN1_ETYPE_PRINTABLE_STRING:
+            case ASN1_ETYPE_UNIVERSAL_STRING:
+            case ASN1_ETYPE_BMP_STRING:
+            case ASN1_ETYPE_UTF8_STRING:
+            case ASN1_ETYPE_VISIBLE_STRING:
            case ASN1_ETYPE_BIT_STRING:
              len2 =
                asn1_get_length_der (der + counter, len - counter, &len3);
@@ -2352,14 +2352,14 @@ asn1_der_decoding_startEnd (asn1_node element, const void *ider, int len,
            case ASN1_ETYPE_INTEGER:
            case ASN1_ETYPE_ENUMERATED:
            case ASN1_ETYPE_GENERALSTRING:
-            case ASN1_ETYPE_NUMERICSTRING:
-            case ASN1_ETYPE_IA5STRING:
-            case ASN1_ETYPE_TELETEXSTRING:
-            case ASN1_ETYPE_PRINTABLESTRING:
-            case ASN1_ETYPE_UNIVERSALSTRING:
-            case ASN1_ETYPE_BMPSTRING:
-            case ASN1_ETYPE_UTF8STRING:
-            case ASN1_ETYPE_VISIBLESTRING:
+            case ASN1_ETYPE_NUMERIC_STRING:
+            case ASN1_ETYPE_IA5_STRING:
+            case ASN1_ETYPE_TELETEX_STRING:
+            case ASN1_ETYPE_PRINTABLE_STRING:
+            case ASN1_ETYPE_UNIVERSAL_STRING:
+            case ASN1_ETYPE_BMP_STRING:
+            case ASN1_ETYPE_UTF8_STRING:
+            case ASN1_ETYPE_VISIBLE_STRING:
            case ASN1_ETYPE_BIT_STRING:
              len2 =
                asn1_get_length_der (der + counter, len - counter, &len3);

diff --git a/lib/element.c b/lib/element.c
index 32d2894..d5df2e5 100644 (file)
--- a/lib/element.c
+++ b/lib/element.c
@@ -544,14 +544,14 @@ asn1_write_value (asn1_node node_root, const char *name,
       break;
     case ASN1_ETYPE_OCTET_STRING:
     case ASN1_ETYPE_GENERALSTRING:
-    case ASN1_ETYPE_NUMERICSTRING:
-    case ASN1_ETYPE_IA5STRING:
-    case ASN1_ETYPE_TELETEXSTRING:
-    case ASN1_ETYPE_PRINTABLESTRING:
-    case ASN1_ETYPE_UNIVERSALSTRING:
-    case ASN1_ETYPE_BMPSTRING:
-    case ASN1_ETYPE_UTF8STRING:
-    case ASN1_ETYPE_VISIBLESTRING:
+    case ASN1_ETYPE_NUMERIC_STRING:
+    case ASN1_ETYPE_IA5_STRING:
+    case ASN1_ETYPE_TELETEX_STRING:
+    case ASN1_ETYPE_PRINTABLE_STRING:
+    case ASN1_ETYPE_UNIVERSAL_STRING:
+    case ASN1_ETYPE_BMP_STRING:
+    case ASN1_ETYPE_UTF8_STRING:
+    case ASN1_ETYPE_VISIBLE_STRING:
       if (len == 0)
        len = _asn1_strlen (value);
       _asn1_set_value_lv (node, value, len);
@@ -823,14 +823,14 @@ asn1_read_value (asn1_node root, const char *name, void *ivalue, int *len)
       break;
     case ASN1_ETYPE_OCTET_STRING:
     case ASN1_ETYPE_GENERALSTRING:
-    case ASN1_ETYPE_NUMERICSTRING:
-    case ASN1_ETYPE_IA5STRING:
-    case ASN1_ETYPE_TELETEXSTRING:
-    case ASN1_ETYPE_PRINTABLESTRING:
-    case ASN1_ETYPE_UNIVERSALSTRING:
-    case ASN1_ETYPE_BMPSTRING:
-    case ASN1_ETYPE_UTF8STRING:
-    case ASN1_ETYPE_VISIBLESTRING:
+    case ASN1_ETYPE_NUMERIC_STRING:
+    case ASN1_ETYPE_IA5_STRING:
+    case ASN1_ETYPE_TELETEX_STRING:
+    case ASN1_ETYPE_PRINTABLE_STRING:
+    case ASN1_ETYPE_UNIVERSAL_STRING:
+    case ASN1_ETYPE_BMP_STRING:
+    case ASN1_ETYPE_UTF8_STRING:
+    case ASN1_ETYPE_VISIBLE_STRING:
       len2 = -1;
       if (asn1_get_octet_der
          (node->value, node->value_len, &len2, value, value_size,

diff --git a/lib/int.h b/lib/int.h
index 6bbf084..daecada 100644 (file)
--- a/lib/int.h
+++ b/lib/int.h
@@ -74,14 +74,14 @@ typedef struct tag_and_class_st {
        case ASN1_ETYPE_OBJECT_ID: \
        case ASN1_ETYPE_OCTET_STRING: \
        case ASN1_ETYPE_GENERALSTRING: \
-        case ASN1_ETYPE_NUMERICSTRING: \
-        case ASN1_ETYPE_IA5STRING: \
-        case ASN1_ETYPE_TELETEXSTRING: \
-        case ASN1_ETYPE_PRINTABLESTRING: \
-        case ASN1_ETYPE_UNIVERSALSTRING: \
-        case ASN1_ETYPE_BMPSTRING: \
-        case ASN1_ETYPE_UTF8STRING: \
-        case ASN1_ETYPE_VISIBLESTRING: \
+        case ASN1_ETYPE_NUMERIC_STRING: \
+        case ASN1_ETYPE_IA5_STRING: \
+        case ASN1_ETYPE_TELETEX_STRING: \
+        case ASN1_ETYPE_PRINTABLE_STRING: \
+        case ASN1_ETYPE_UNIVERSAL_STRING: \
+        case ASN1_ETYPE_BMP_STRING: \
+        case ASN1_ETYPE_UTF8_STRING: \
+        case ASN1_ETYPE_VISIBLE_STRING: \
        case ASN1_ETYPE_BIT_STRING: \
        case ASN1_ETYPE_SEQUENCE: \
        case ASN1_ETYPE_SEQUENCE_OF: \

diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index 9f3eae4..8c68205 100644 (file)
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -100,14 +100,14 @@ extern "C"
 #define ASN1_TAG_ENUMERATED            0x0A
 #define ASN1_TAG_NULL                  0x05
 #define ASN1_TAG_GENERALSTRING         0x1B
-#define ASN1_TAG_NUMERICSTRING         0x12
-#define ASN1_TAG_IA5STRING             0x16
-#define ASN1_TAG_TELETEXSTRING         0x14
-#define ASN1_TAG_PRINTABLESTRING       0x13
-#define ASN1_TAG_UNIVERSALSTRING       0x1C
-#define ASN1_TAG_BMPSTRING             0x1E
-#define ASN1_TAG_UTF8STRING            0x0C
-#define ASN1_TAG_VISIBLESTRING         0x1A
+#define ASN1_TAG_NUMERIC_STRING                0x12
+#define ASN1_TAG_IA5_STRING            0x16
+#define ASN1_TAG_TELETEX_STRING                0x14
+#define ASN1_TAG_PRINTABLE_STRING      0x13
+#define ASN1_TAG_UNIVERSAL_STRING      0x1C
+#define ASN1_TAG_BMP_STRING            0x1E
+#define ASN1_TAG_UTF8_STRING           0x0C
+#define ASN1_TAG_VISIBLE_STRING                0x1A
 
   /******************************************************/
   /* Structure definition used for the node of the tree */
@@ -157,14 +157,14 @@ extern "C"
 #define ASN1_ETYPE_NULL          20
 #define ASN1_ETYPE_ENUMERATED    21
 #define ASN1_ETYPE_GENERALSTRING 27
-#define ASN1_ETYPE_NUMERICSTRING 28
-#define ASN1_ETYPE_IA5STRING     29
-#define ASN1_ETYPE_TELETEXSTRING 30
-#define ASN1_ETYPE_PRINTABLESTRING 31
-#define ASN1_ETYPE_UNIVERSALSTRING 32
-#define ASN1_ETYPE_BMPSTRING     33
-#define ASN1_ETYPE_UTF8STRING    34
-#define ASN1_ETYPE_VISIBLESTRING 35
+#define ASN1_ETYPE_NUMERIC_STRING 28
+#define ASN1_ETYPE_IA5_STRING     29
+#define ASN1_ETYPE_TELETEX_STRING 30
+#define ASN1_ETYPE_PRINTABLE_STRING 31
+#define ASN1_ETYPE_UNIVERSAL_STRING 32
+#define ASN1_ETYPE_BMP_STRING     33
+#define ASN1_ETYPE_UTF8_STRING    34
+#define ASN1_ETYPE_VISIBLE_STRING 35
 
   struct asn1_data_node_st
   {

diff --git a/lib/structure.c b/lib/structure.c
index 9136799..a508030 100644 (file)
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -855,14 +855,14 @@ asn1_print_structure (FILE * out, asn1_node structure, const char *name,
              break;
            case ASN1_ETYPE_OCTET_STRING:
            case ASN1_ETYPE_GENERALSTRING:
-           case ASN1_ETYPE_NUMERICSTRING:
-           case ASN1_ETYPE_IA5STRING:
-           case ASN1_ETYPE_TELETEXSTRING:
-           case ASN1_ETYPE_PRINTABLESTRING:
-           case ASN1_ETYPE_UNIVERSALSTRING:
-           case ASN1_ETYPE_BMPSTRING:
-           case ASN1_ETYPE_UTF8STRING:
-           case ASN1_ETYPE_VISIBLESTRING:
+           case ASN1_ETYPE_NUMERIC_STRING:
+           case ASN1_ETYPE_IA5_STRING:
+           case ASN1_ETYPE_TELETEX_STRING:
+           case ASN1_ETYPE_PRINTABLE_STRING:
+           case ASN1_ETYPE_UNIVERSAL_STRING:
+           case ASN1_ETYPE_BMP_STRING:
+           case ASN1_ETYPE_UTF8_STRING:
+           case ASN1_ETYPE_VISIBLE_STRING:
              if (p->value)
                {
                  len2 = -1;

diff --git a/tests/Test_strings.c b/tests/Test_strings.c
index 8a6a9f7..c2b9da1 100644 (file)
--- a/tests/Test_strings.c
+++ b/tests/Test_strings.c
@@ -36,13 +36,13 @@ struct tv
 };
 
 static const struct tv tv[] = {
-  {ASN1_ETYPE_IA5STRING, 20, "\x63\x73\x63\x61\x40\x70\x61\x73\x73\x70\x6f\x72\x74\x2e\x67\x6f\x76\x2e\x67\x72",
+  {ASN1_ETYPE_IA5_STRING, 20, "\x63\x73\x63\x61\x40\x70\x61\x73\x73\x70\x6f\x72\x74\x2e\x67\x6f\x76\x2e\x67\x72",
                          22, "\x16\x14\x63\x73\x63\x61\x40\x70\x61\x73\x73\x70\x6f\x72\x74\x2e\x67\x6f\x76\x2e\x67\x72"},
-  {ASN1_ETYPE_PRINTABLESTRING, 5, "\x4e\x69\x6b\x6f\x73", 
+  {ASN1_ETYPE_PRINTABLE_STRING, 5, "\x4e\x69\x6b\x6f\x73", 
                                7, "\x13\x05\x4e\x69\x6b\x6f\x73"},
-  {ASN1_ETYPE_UTF8STRING, 12, "Αττική",
+  {ASN1_ETYPE_UTF8_STRING, 12, "Αττική",
                           14, "\x0c\x0c\xce\x91\xcf\x84\xcf\x84\xce\xb9\xce\xba\xce\xae"},
-  {ASN1_ETYPE_TELETEXSTRING, 15, "\x53\x69\x6d\x6f\x6e\x20\x4a\x6f\x73\x65\x66\x73\x73\x6f\x6e",
+  {ASN1_ETYPE_TELETEX_STRING, 15, "\x53\x69\x6d\x6f\x6e\x20\x4a\x6f\x73\x65\x66\x73\x73\x6f\x6e",
                              17, "\x14\x0f\x53\x69\x6d\x6f\x6e\x20\x4a\x6f\x73\x65\x66\x73\x73\x6f\x6e"},
   {ASN1_ETYPE_OCTET_STRING, 36, "\x30\x22\x80\x0F\x32\x30\x31\x31\x30\x38\x32\x31\x30\x38\x30\x30\x30\x36\x5A\x81\x0F\x32\x30\x31\x31\x30\x38\x32\x33\x32\x30\x35\x39\x35\x39\x5A",
                            38, "\x04\x24\x30\x22\x80\x0F\x32\x30\x31\x31\x30\x38\x32\x31\x30\x38\x30\x30\x30\x36\x5A\x81\x0F\x32\x30\x31\x31\x30\x38\x32\x33\x32\x30\x35\x39\x35\x39\x5A"}