remove LTC_ASN1_CONSTRUCTED and LTC_ASN1_CONTEXT_SPECIFIC

src/headers/tomcrypt_pk.h

@@ -513,9 +513,6 @@ typedef enum ltc_asn1_type_ {
  LTC_ASN1_SETOF,
  LTC_ASN1_RAW_BIT_STRING,
  LTC_ASN1_TELETEX_STRING,
- LTC_ASN1_CONSTRUCTED,
- LTC_ASN1_CONTEXT_SPECIFIC,
- /* 20 */
  LTC_ASN1_GENERALIZEDTIME,
  LTC_ASN1_CUSTOM_TYPE,
 } ltc_asn1_type;

src/misc/crypt/crypt_constants.c

@@ -129,8 +129,6 @@ static const crypt_constant _crypt_constants[] = {
     _C_STRINGIFY(LTC_ASN1_SETOF),
     _C_STRINGIFY(LTC_ASN1_RAW_BIT_STRING),
     _C_STRINGIFY(LTC_ASN1_TELETEX_STRING),
-    _C_STRINGIFY(LTC_ASN1_CONSTRUCTED),
-    _C_STRINGIFY(LTC_ASN1_CONTEXT_SPECIFIC),
     _C_STRINGIFY(LTC_ASN1_GENERALIZEDTIME),
     _C_STRINGIFY(LTC_ASN1_CUSTOM_TYPE),
 #endif

src/pk/asn1/der/choice/der_decode_choice.c

@@ -216,8 +216,6 @@ int der_decode_choice(const unsigned char *in,   unsigned long *inlen,
                break;
 
            case LTC_ASN1_CHOICE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_EOL:
                return CRYPT_INVALID_ARG;
        }

src/pk/asn1/der/custom_type/der_decode_custom_type.c

@@ -308,8 +308,6 @@ int der_decode_custom_type(const unsigned char *in, unsigned long  inlen,
                }
                break;
 
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_EOL:
                err = CRYPT_INVALID_ARG;
                goto LBL_ERR;

src/pk/asn1/der/custom_type/der_encode_custom_type.c

@@ -210,8 +210,6 @@ int der_encode_custom_type(const ltc_asn1_list *root,
                break;
 
            case LTC_ASN1_CHOICE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_EOL:
            case LTC_ASN1_TELETEX_STRING:
                err = CRYPT_INVALID_ARG;

src/pk/asn1/der/custom_type/der_length_custom_type.c

@@ -173,8 +173,6 @@ int der_length_custom_type(const ltc_asn1_list *root, unsigned long *outlen, uns
                break;
 
            case LTC_ASN1_CHOICE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_EOL:
                err = CRYPT_INVALID_ARG;
                goto LBL_ERR;

src/pk/asn1/der/general/der_asn1_maps.c

@@ -42,9 +42,6 @@ const int der_asn1_type_to_identifier_map[] =
  49, /* LTC_ASN1_SETOF, */
   3, /* LTC_ASN1_RAW_BIT_STRING, */
  20, /* LTC_ASN1_TELETEX_STRING, */
- -1, /* LTC_ASN1_CONSTRUCTED, */
- -1, /* LTC_ASN1_CONTEXT_SPECIFIC, */
-     /* 20 */
  24, /* LTC_ASN1_GENERALIZEDTIME, */
  -1, /* LTC_ASN1_CUSTOM_TYPE, */
 };

src/pk/asn1/der/general/der_decode_asn1_identifier.c

@@ -52,9 +52,6 @@ static const unsigned char tag_constructed_map[] =
  LTC_ASN1_PC_PRIMITIVE,
  LTC_ASN1_PC_PRIMITIVE,
  LTC_ASN1_PC_PRIMITIVE,
- LTC_ASN1_PC_PRIMITIVE,
- /* 30 */
- LTC_ASN1_PC_PRIMITIVE,
 };
  static const unsigned long tag_constructed_map_sz = sizeof(tag_constructed_map)/sizeof(tag_constructed_map[0]);
 

src/pk/asn1/der/sequence/der_decode_sequence_ex.c

@@ -286,8 +286,6 @@ int der_decode_sequence_ex(const unsigned char *in, unsigned long  inlen,
                }
                break;
 
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_EOL:
                err = CRYPT_INVALID_ARG;
                goto LBL_ERR;

src/pk/asn1/der/sequence/der_decode_sequence_multi.c

@@ -73,8 +73,6 @@ int der_decode_sequence_multi(const unsigned char *in, unsigned long inlen, ...)
 
            case LTC_ASN1_EOL:
            case LTC_ASN1_CUSTOM_TYPE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
                va_end(args);
                return CRYPT_INVALID_ARG;
        }
@@ -127,8 +125,6 @@ int der_decode_sequence_multi(const unsigned char *in, unsigned long inlen, ...)
            /* coverity[dead_error_line] */
            case LTC_ASN1_EOL:
            case LTC_ASN1_CUSTOM_TYPE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
                 break;
        }
    }

src/pk/asn1/der/sequence/der_encode_sequence_ex.c

@@ -189,8 +189,6 @@ int der_encode_sequence_ex(ltc_asn1_list *list, unsigned long inlen,
                break;
 
            case LTC_ASN1_CHOICE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_EOL:
            case LTC_ASN1_TELETEX_STRING:
                err = CRYPT_INVALID_ARG;

src/pk/asn1/der/sequence/der_encode_sequence_multi.c

@@ -71,8 +71,6 @@ int der_encode_sequence_multi(unsigned char *out, unsigned long *outlen, ...)
                 break;
 
            case LTC_ASN1_CHOICE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_CUSTOM_TYPE:
            case LTC_ASN1_EOL:
            case LTC_ASN1_TELETEX_STRING:
@@ -125,8 +123,6 @@ int der_encode_sequence_multi(unsigned char *out, unsigned long *outlen, ...)
                 break;
 
            case LTC_ASN1_CHOICE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_CUSTOM_TYPE:
            case LTC_ASN1_EOL:
            case LTC_ASN1_TELETEX_STRING:

src/pk/asn1/der/sequence/der_length_sequence.c

@@ -160,8 +160,6 @@ int der_length_sequence_ex(ltc_asn1_list *list, unsigned long inlen,
                break;
 
            case LTC_ASN1_CHOICE:
-           case LTC_ASN1_CONSTRUCTED:
-           case LTC_ASN1_CONTEXT_SPECIFIC:
            case LTC_ASN1_EOL:
                err = CRYPT_INVALID_ARG;
                goto LBL_ERR;

src/pk/asn1/der/sequence/der_sequence_shrink.c

@@ -32,7 +32,7 @@ void der_sequence_shrink(ltc_asn1_list *in)
       }
 
       switch (in->type) {
-         case LTC_ASN1_CONSTRUCTED:
+         case LTC_ASN1_CUSTOM_TYPE:
          case LTC_ASN1_SET:
          case LTC_ASN1_SEQUENCE : if (in->data != NULL) { XFREE(in->data); in->data = NULL; } break;
          default: break;

src/pk/asn1/der/set/der_encode_set.c

@@ -37,8 +37,6 @@ static int _ltc_to_asn1(ltc_asn1_type v)
       case LTC_ASN1_SET:
       case LTC_ASN1_SETOF:                   return 0x31;
       case LTC_ASN1_CHOICE:
-      case LTC_ASN1_CONSTRUCTED:
-      case LTC_ASN1_CONTEXT_SPECIFIC:
       case LTC_ASN1_CUSTOM_TYPE:
       case LTC_ASN1_EOL:                     return -1;
    }

tests/der_test.c

@@ -374,39 +374,6 @@ static void _der_tests_print_flexi(ltc_asn1_list* l, unsigned int level)
     name = "TELETEX STRING";
     text = l->data;
     break;
-  case LTC_ASN1_CONSTRUCTED:
-    if (l->used & 0x80)
-      name = "CONTEXT SPECIFIC";
-    else
-      name = "CONSTRUCTED";
-    snprintf(buf, sizeof(buf), "[%d]", l->used & 0x1f);
-    text = buf;
-    break;
-  case LTC_ASN1_CONTEXT_SPECIFIC:
-    name = "CONTEXT SPECIFIC";
-    {
-      int r;
-      char* s = buf;
-      int sz = sizeof(buf);
-      r = snprintf(s, sz, "[%d] ", l->used & 0x1f);
-      if (r < 0 || r >= sz) {
-          printf("Context Specific boom");
-          exit(EXIT_FAILURE);
-      }
-      s += r;
-      sz -= r;
-      for (n = 0; n < l->size; ++n) {
-          r = snprintf(s, sz, "%02X", ((unsigned char*)l->data)[n]);
-          if (r < 0 || r >= sz) {
-              printf("Context Specific boom");
-              exit(EXIT_FAILURE);
-          }
-          s += r;
-          sz -= r;
-      }
-      text = buf;
-    }
-    break;
   }
 
   for (n = 0; n < level; ++n) {