diff options
Diffstat (limited to 'lib/minitasn1/element.c')
| -rw-r--r-- | lib/minitasn1/element.c | 1113 |
1 files changed, 647 insertions, 466 deletions
diff --git a/lib/minitasn1/element.c b/lib/minitasn1/element.c index afc1423d20..fd66f248aa 100644 --- a/lib/minitasn1/element.c +++ b/lib/minitasn1/element.c @@ -34,27 +34,29 @@ #include "structure.h" void -_asn1_hierarchical_name(node_asn *node,char *name,int name_size) +_asn1_hierarchical_name (node_asn * node, char *name, int name_size) { node_asn *p; char tmp_name[64]; - p=node; + p = node; - name[0]=0; + name[0] = 0; - while(p != NULL){ - if(p->name != NULL){ - _asn1_str_cpy(tmp_name,sizeof(tmp_name),name), - - _asn1_str_cpy(name,name_size,p->name); - _asn1_str_cat(name,name_size,"."); - _asn1_str_cat(name,name_size,tmp_name); + while (p != NULL) + { + if (p->name != NULL) + { + _asn1_str_cpy (tmp_name, sizeof (tmp_name), name), + _asn1_str_cpy (name, name_size, p->name); + _asn1_str_cat (name, name_size, "."); + _asn1_str_cat (name, name_size, tmp_name); + } + p = _asn1_find_up (p); } - p=_asn1_find_up(p); - } - if(name[0]==0) _asn1_str_cpy(name,name_size,"ROOT"); + if (name[0] == 0) + _asn1_str_cpy (name, name_size, "ROOT"); } @@ -73,45 +75,52 @@ _asn1_hierarchical_name(node_asn *node,char *name,int name_size) /* Return: ASN1_MEM_ERROR or ASN1_SUCCESS */ /******************************************************************/ asn1_retCode -_asn1_convert_integer(const char *value,unsigned char *value_out,int value_out_size, int *len) +_asn1_convert_integer (const char *value, unsigned char *value_out, + int value_out_size, int *len) { char negative; unsigned char val[SIZEOF_UNSIGNED_LONG_INT]; long valtmp; - int k,k2; + int k, k2; - valtmp=strtol(value,NULL,10); - - for(k=0;k<SIZEOF_UNSIGNED_LONG_INT;k++){ - val[SIZEOF_UNSIGNED_LONG_INT-k-1]=(valtmp >> (8*k)) & 0xFF; - } + valtmp = strtol (value, NULL, 10); - if(val[0]&0x80) negative=1; - else negative=0; + for (k = 0; k < SIZEOF_UNSIGNED_LONG_INT; k++) + { + val[SIZEOF_UNSIGNED_LONG_INT - k - 1] = (valtmp >> (8 * k)) & 0xFF; + } - for(k=0;k<SIZEOF_UNSIGNED_LONG_INT-1;k++){ - if(negative && (val[k]!=0xFF)) break; - else if(!negative && val[k]) break; - } - - if((negative && !(val[k]&0x80)) || - (!negative && (val[k]&0x80))) k--; + if (val[0] & 0x80) + negative = 1; + else + negative = 0; - *len=SIZEOF_UNSIGNED_LONG_INT-k; + for (k = 0; k < SIZEOF_UNSIGNED_LONG_INT - 1; k++) + { + if (negative && (val[k] != 0xFF)) + break; + else if (!negative && val[k]) + break; + } + + if ((negative && !(val[k] & 0x80)) || (!negative && (val[k] & 0x80))) + k--; - if (SIZEOF_UNSIGNED_LONG_INT-k> value_out_size) + *len = SIZEOF_UNSIGNED_LONG_INT - k; + + if (SIZEOF_UNSIGNED_LONG_INT - k > value_out_size) /* VALUE_OUT is too short to contain the value conversion */ return ASN1_MEM_ERROR; - for(k2=k;k2<SIZEOF_UNSIGNED_LONG_INT;k2++) - value_out[k2-k]=val[k2]; + for (k2 = k; k2 < SIZEOF_UNSIGNED_LONG_INT; k2++) + value_out[k2 - k] = val[k2]; #ifdef LIBTASN1_DEBUG_INTEGER - _libtasn1_log("_asn1_convert_integer: valueIn=%s, lenOut=%d",value,*len); - for(k=0;k<SIZEOF_UNSIGNED_LONG_INT;k++) - _libtasn1_log(", vOut[%d]=%d",k,value_out[k]); - _libtasn1_log("\n"); + _libtasn1_log ("_asn1_convert_integer: valueIn=%s, lenOut=%d", value, *len); + for (k = 0; k < SIZEOF_UNSIGNED_LONG_INT; k++) + _libtasn1_log (", vOut[%d]=%d", k, value_out[k]); + _libtasn1_log ("\n"); #endif @@ -119,29 +128,35 @@ _asn1_convert_integer(const char *value,unsigned char *value_out,int value_out_s } -int -_asn1_append_sequence_set(node_asn *node) +int +_asn1_append_sequence_set (node_asn * node) { - node_asn *p,*p2; + node_asn *p, *p2; char temp[10]; long n; - if(!node || !(node->down)) return ASN1_GENERIC_ERROR; - - p=node->down; - while((type_field(p->type)==TYPE_TAG) || (type_field(p->type)==TYPE_SIZE)) p=p->right; - p2=_asn1_copy_structure3(p); - while(p->right) p=p->right; - _asn1_set_right(p,p2); - - if(p->name==NULL) _asn1_str_cpy(temp,sizeof(temp),"?1"); - else{ - n=strtol(p->name+1,NULL,0); - n++; - temp[0]='?'; - _asn1_ltostr(n,temp+1); - } - _asn1_set_name(p2,temp); + if (!node || !(node->down)) + return ASN1_GENERIC_ERROR; + + p = node->down; + while ((type_field (p->type) == TYPE_TAG) + || (type_field (p->type) == TYPE_SIZE)) + p = p->right; + p2 = _asn1_copy_structure3 (p); + while (p->right) + p = p->right; + _asn1_set_right (p, p2); + + if (p->name == NULL) + _asn1_str_cpy (temp, sizeof (temp), "?1"); + else + { + n = strtol (p->name + 1, NULL, 0); + n++; + temp[0] = '?'; + _asn1_ltostr (n, temp + 1); + } + _asn1_set_name (p2, temp); /* p2->type |= CONST_OPTION; */ return ASN1_SUCCESS; @@ -260,262 +275,362 @@ _asn1_append_sequence_set(node_asn *node) * **/ asn1_retCode -asn1_write_value(ASN1_TYPE node_root,const char *name, - const void *ivalue,int len) +asn1_write_value (ASN1_TYPE node_root, const char *name, + const void *ivalue, int len) { - node_asn *node,*p,*p2; - unsigned char *temp,*value_temp=NULL,*default_temp=NULL; - int len2,k,k2,negative; - const unsigned char* value = ivalue; - - node=asn1_find_node(node_root,name); - if(node==NULL) return ASN1_ELEMENT_NOT_FOUND; - - if((node->type & CONST_OPTION) && (value==NULL) && (len==0)){ - asn1_delete_structure(&node); - return ASN1_SUCCESS; - } - - if((type_field(node->type) == TYPE_SEQUENCE_OF) && (value == NULL) && (len==0)){ - p=node->down; - while((type_field(p->type)==TYPE_TAG) || (type_field(p->type)==TYPE_SIZE)) p=p->right; - - while(p->right) - asn1_delete_structure(&p->right); - - return ASN1_SUCCESS; - } - - switch(type_field(node->type)){ - case TYPE_BOOLEAN: - if(!strcmp(value,"TRUE")){ - if(node->type&CONST_DEFAULT){ - p=node->down; - while(type_field(p->type)!=TYPE_DEFAULT) p=p->right; - if(p->type&CONST_TRUE) _asn1_set_value(node,NULL,0); - else _asn1_set_value(node,"T",1); - } - else _asn1_set_value(node,"T",1); + node_asn *node, *p, *p2; + unsigned char *temp, *value_temp = NULL, *default_temp = NULL; + int len2, k, k2, negative; + const unsigned char *value = ivalue; + + node = asn1_find_node (node_root, name); + if (node == NULL) + return ASN1_ELEMENT_NOT_FOUND; + + if ((node->type & CONST_OPTION) && (value == NULL) && (len == 0)) + { + asn1_delete_structure (&node); + return ASN1_SUCCESS; } - else if(!strcmp(value,"FALSE")){ - if(node->type&CONST_DEFAULT){ - p=node->down; - while(type_field(p->type)!=TYPE_DEFAULT) p=p->right; - if(p->type&CONST_FALSE) _asn1_set_value(node,NULL,0); - else _asn1_set_value(node,"F",1); - } - else _asn1_set_value(node,"F",1); - } - else return ASN1_VALUE_NOT_VALID; - break; - case TYPE_INTEGER: case TYPE_ENUMERATED: - if(len==0){ - if((isdigit(value[0])) || (value[0]=='-')){ - value_temp=(unsigned char *)_asn1_alloca(SIZEOF_UNSIGNED_LONG_INT); - if (value_temp==NULL) return ASN1_MEM_ALLOC_ERROR; - - _asn1_convert_integer(value,value_temp,SIZEOF_UNSIGNED_LONG_INT, &len); - } - else{ /* is an identifier like v1 */ - if(!(node->type&CONST_LIST)) return ASN1_VALUE_NOT_VALID; - p=node->down; - while(p){ - if(type_field(p->type)==TYPE_CONSTANT){ - if((p->name) && (!strcmp(p->name,value))){ - value_temp=(unsigned char *)_asn1_alloca(SIZEOF_UNSIGNED_LONG_INT); - if (value_temp==NULL) return ASN1_MEM_ALLOC_ERROR; - - _asn1_convert_integer(p->value,value_temp,SIZEOF_UNSIGNED_LONG_INT, &len); - break; - } - } - p=p->right; - } - if(p==NULL) return ASN1_VALUE_NOT_VALID; - } - } - else{ /* len != 0 */ - value_temp=(unsigned char *)_asn1_alloca(len); - if (value_temp==NULL) return ASN1_MEM_ALLOC_ERROR; - memcpy(value_temp,value,len); - } - - - if(value_temp[0]&0x80) negative=1; - else negative=0; - if(negative && (type_field(node->type)==TYPE_ENUMERATED)) - {_asn1_afree(value_temp);return ASN1_VALUE_NOT_VALID;} + if ((type_field (node->type) == TYPE_SEQUENCE_OF) && (value == NULL) + && (len == 0)) + { + p = node->down; + while ((type_field (p->type) == TYPE_TAG) + || (type_field (p->type) == TYPE_SIZE)) + p = p->right; - for(k=0;k<len-1;k++) - if(negative && (value_temp[k]!=0xFF)) break; - else if(!negative && value_temp[k]) break; + while (p->right) + asn1_delete_structure (&p->right); - if((negative && !(value_temp[k]&0x80)) || - (!negative && (value_temp[k]&0x80))) k--; + return ASN1_SUCCESS; + } - asn1_length_der(len-k,NULL,&len2); - temp=(unsigned char *)_asn1_alloca(len-k+len2); - if (temp==NULL) return ASN1_MEM_ALLOC_ERROR; + switch (type_field (node->type)) + { + case TYPE_BOOLEAN: + if (!strcmp (value, "TRUE")) + { + if (node->type & CONST_DEFAULT) + { + p = node->down; + while (type_field (p->type) != TYPE_DEFAULT) + p = p->right; + if (p->type & CONST_TRUE) + _asn1_set_value (node, NULL, 0); + else + _asn1_set_value (node, "T", 1); + } + else + _asn1_set_value (node, "T", 1); + } + else if (!strcmp (value, "FALSE")) + { + if (node->type & CONST_DEFAULT) + { + p = node->down; + while (type_field (p->type) != TYPE_DEFAULT) + p = p->right; + if (p->type & CONST_FALSE) + _asn1_set_value (node, NULL, 0); + else + _asn1_set_value (node, "F", 1); + } + else + _asn1_set_value (node, "F", 1); + } + else + return ASN1_VALUE_NOT_VALID; + break; + case TYPE_INTEGER: + case TYPE_ENUMERATED: + if (len == 0) + { + if ((isdigit (value[0])) || (value[0] == '-')) + { + value_temp = + (unsigned char *) _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT); + if (value_temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + _asn1_convert_integer (value, value_temp, + SIZEOF_UNSIGNED_LONG_INT, &len); + } + else + { /* is an identifier like v1 */ + if (!(node->type & CONST_LIST)) + return ASN1_VALUE_NOT_VALID; + p = node->down; + while (p) + { + if (type_field (p->type) == TYPE_CONSTANT) + { + if ((p->name) && (!strcmp (p->name, value))) + { + value_temp = + (unsigned char *) + _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT); + if (value_temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + _asn1_convert_integer (p->value, + value_temp, + SIZEOF_UNSIGNED_LONG_INT, + &len); + break; + } + } + p = p->right; + } + if (p == NULL) + return ASN1_VALUE_NOT_VALID; + } + } + else + { /* len != 0 */ + value_temp = (unsigned char *) _asn1_alloca (len); + if (value_temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + memcpy (value_temp, value, len); + } - asn1_octet_der(value_temp+k,len-k,temp,&len2); - _asn1_set_value(node,temp,len2); - _asn1_afree(temp); + if (value_temp[0] & 0x80) + negative = 1; + else + negative = 0; + if (negative && (type_field (node->type) == TYPE_ENUMERATED)) + { + _asn1_afree (value_temp); + return ASN1_VALUE_NOT_VALID; + } - if(node->type&CONST_DEFAULT){ - p=node->down; - while(type_field(p->type)!=TYPE_DEFAULT) p=p->right; - if((isdigit(p->value[0])) || (p->value[0]=='-')){ - default_temp=(unsigned char *)_asn1_alloca(SIZEOF_UNSIGNED_LONG_INT); - if (default_temp==NULL) return ASN1_MEM_ALLOC_ERROR; + for (k = 0; k < len - 1; k++) + if (negative && (value_temp[k] != 0xFF)) + break; + else if (!negative && value_temp[k]) + break; + + if ((negative && !(value_temp[k] & 0x80)) || + (!negative && (value_temp[k] & 0x80))) + k--; + + asn1_length_der (len - k, NULL, &len2); + temp = (unsigned char *) _asn1_alloca (len - k + len2); + if (temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + asn1_octet_der (value_temp + k, len - k, temp, &len2); + _asn1_set_value (node, temp, len2); + + _asn1_afree (temp); + + + if (node->type & CONST_DEFAULT) + { + p = node->down; + while (type_field (p->type) != TYPE_DEFAULT) + p = p->right; + if ((isdigit (p->value[0])) || (p->value[0] == '-')) + { + default_temp = + (unsigned char *) _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT); + if (default_temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + _asn1_convert_integer (p->value, default_temp, + SIZEOF_UNSIGNED_LONG_INT, &len2); + } + else + { /* is an identifier like v1 */ + if (!(node->type & CONST_LIST)) + return ASN1_VALUE_NOT_VALID; + p2 = node->down; + while (p2) + { + if (type_field (p2->type) == TYPE_CONSTANT) + { + if ((p2->name) && (!strcmp (p2->name, p->value))) + { + default_temp = + (unsigned char *) + _asn1_alloca (SIZEOF_UNSIGNED_LONG_INT); + if (default_temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + _asn1_convert_integer (p2->value, + default_temp, + SIZEOF_UNSIGNED_LONG_INT, + &len2); + break; + } + } + p2 = p2->right; + } + if (p2 == NULL) + return ASN1_VALUE_NOT_VALID; + } - _asn1_convert_integer(p->value,default_temp,SIZEOF_UNSIGNED_LONG_INT,&len2); - } - else{ /* is an identifier like v1 */ - if(!(node->type&CONST_LIST)) return ASN1_VALUE_NOT_VALID; - p2=node->down; - while(p2){ - if(type_field(p2->type)==TYPE_CONSTANT){ - if((p2->name) && (!strcmp(p2->name,p->value))){ - default_temp=(unsigned char *)_asn1_alloca(SIZEOF_UNSIGNED_LONG_INT); - if (default_temp==NULL) return ASN1_MEM_ALLOC_ERROR; - _asn1_convert_integer(p2->value,default_temp,SIZEOF_UNSIGNED_LONG_INT,&len2); + if ((len - k) == len2) + { + for (k2 = 0; k2 < len2; k2++) + if (value_temp[k + k2] != default_temp[k2]) + { + break; + } + if (k2 == len2) + _asn1_set_value (node, NULL, 0); + } + _asn1_afree (default_temp); + } + _asn1_afree (value_temp); + break; + case TYPE_OBJECT_ID: + for (k = 0; k < strlen (value); k++) + if ((!isdigit (value[k])) && (value[k] != '.') && (value[k] != '+')) + return ASN1_VALUE_NOT_VALID; + if (node->type & CONST_DEFAULT) + { + p = node->down; + while (type_field (p->type) != TYPE_DEFAULT) + p = p->right; + if (!strcmp (value, p->value)) + { + _asn1_set_value (node, NULL, 0); break; } - } - p2=p2->right; } - if(p2==NULL) return ASN1_VALUE_NOT_VALID; - } - - - if((len-k)==len2){ - for(k2=0;k2<len2;k2++) - if(value_temp[k+k2]!=default_temp[k2]){ - break; - } - if(k2==len2) _asn1_set_value(node,NULL,0); - } - _asn1_afree(default_temp); - } - _asn1_afree(value_temp); - break; - case TYPE_OBJECT_ID: - for(k=0;k<strlen(value);k++) - if((!isdigit(value[k])) && (value[k]!='.') && (value[k]!='+')) - return ASN1_VALUE_NOT_VALID; - if(node->type&CONST_DEFAULT){ - p=node->down; - while(type_field(p->type)!=TYPE_DEFAULT) p=p->right; - if(!strcmp(value,p->value)){ - _asn1_set_value(node,NULL,0); - break; - } - } - _asn1_set_value(node,value,strlen(value)+1); - break; - case TYPE_TIME: - if(node->type&CONST_UTC){ - if(strlen(value)<11) return ASN1_VALUE_NOT_VALID; - for(k=0;k<10;k++) - if(!isdigit(value[k])) return ASN1_VALUE_NOT_VALID; - switch(strlen(value)){ - case 11: - if(value[10]!='Z') return ASN1_VALUE_NOT_VALID; + _asn1_set_value (node, value, strlen (value) + 1); break; - case 13: - if((!isdigit(value[10])) || (!isdigit(value[11])) || - (value[12]!='Z')) return ASN1_VALUE_NOT_VALID; - break; - case 15: - if((value[10]!='+') && (value[10]!='-')) return ASN1_VALUE_NOT_VALID; - for(k=11;k<15;k++) - if(!isdigit(value[k])) return ASN1_VALUE_NOT_VALID; - break; - case 17: - if((!isdigit(value[10])) || (!isdigit(value[11]))) - return ASN1_VALUE_NOT_VALID; - if((value[12]!='+') && (value[12]!='-')) return ASN1_VALUE_NOT_VALID; - for(k=13;k<17;k++) - if(!isdigit(value[k])) return ASN1_VALUE_NOT_VALID; - break; - default: - return ASN1_VALUE_NOT_FOUND; - } - _asn1_set_value(node,value,strlen(value)+1); - } - else{ /* GENERALIZED TIME */ - if(value) _asn1_set_value(node,value,strlen(value)+1); - } - break; - case TYPE_OCTET_STRING: - if(len==0) - len=strlen(value); - asn1_length_der(len,NULL,&len2); - temp=(unsigned char *)_asn1_alloca(len+len2); - if (temp==NULL) return ASN1_MEM_ALLOC_ERROR; - - asn1_octet_der(value,len,temp,&len2); - _asn1_set_value(node,temp,len2); - _asn1_afree(temp); - break; - case TYPE_GENERALSTRING: - if(len==0) - len=strlen(value); - asn1_length_der(len,NULL,&len2); - temp=(unsigned char *)_asn1_alloca(len+len2); - if (temp==NULL) return ASN1_MEM_ALLOC_ERROR; - - asn1_octet_der(value,len,temp,&len2); - _asn1_set_value(node,temp,len2); - _asn1_afree(temp); - break; - case TYPE_BIT_STRING: - if(len==0) - len=strlen(value); - asn1_length_der((len>>3)+2,NULL,&len2); - temp=(unsigned char *)_asn1_alloca((len>>3)+2+len2); - if (temp==NULL) return ASN1_MEM_ALLOC_ERROR; - - asn1_bit_der(value,len,temp,&len2); - _asn1_set_value(node,temp,len2); - _asn1_afree(temp); - break; - case TYPE_CHOICE: - p=node->down; - while(p){ - if(!strcmp(p->name,value)){ - p2=node->down; - while(p2){ - if(p2!=p){asn1_delete_structure(&p2); p2=node->down;} - else p2=p2->right; + case TYPE_TIME: + if (node->type & CONST_UTC) + { + if (strlen (value) < 11) + return ASN1_VALUE_NOT_VALID; + for (k = 0; k < 10; k++) + if (!isdigit (value[k])) + return ASN1_VALUE_NOT_VALID; + switch (strlen (value)) + { + case 11: + if (value[10] != 'Z') + return ASN1_VALUE_NOT_VALID; + break; + case 13: + if ((!isdigit (value[10])) || (!isdigit (value[11])) || + (value[12] != 'Z')) + return ASN1_VALUE_NOT_VALID; + break; + case 15: + if ((value[10] != '+') && (value[10] != '-')) + return ASN1_VALUE_NOT_VALID; + for (k = 11; k < 15; k++) + if (!isdigit (value[k])) + return ASN1_VALUE_NOT_VALID; + break; + case 17: + if ((!isdigit (value[10])) || (!isdigit (value[11]))) + return ASN1_VALUE_NOT_VALID; + if ((value[12] != '+') && (value[12] != '-')) + return ASN1_VALUE_NOT_VALID; + for (k = 13; k < 17; k++) + if (!isdigit (value[k])) + return ASN1_VALUE_NOT_VALID; + break; + default: + return ASN1_VALUE_NOT_FOUND; + } + _asn1_set_value (node, value, strlen (value) + 1); } - break; - } - p=p->right; + else + { /* GENERALIZED TIME */ + if (value) + _asn1_set_value (node, value, strlen (value) + 1); + } + break; + case TYPE_OCTET_STRING: + if (len == 0) + len = strlen (value); + asn1_length_der (len, NULL, &len2); + temp = (unsigned char *) _asn1_alloca (len + len2); + if (temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + asn1_octet_der (value, len, temp, &len2); + _asn1_set_value (node, temp, len2); + _asn1_afree (temp); + break; + case TYPE_GENERALSTRING: + if (len == 0) + len = strlen (value); + asn1_length_der (len, NULL, &len2); + temp = (unsigned char *) _asn1_alloca (len + len2); + if (temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + asn1_octet_der (value, len, temp, &len2); + _asn1_set_value (node, temp, len2); + _asn1_afree (temp); + break; + case TYPE_BIT_STRING: + if (len == 0) + len = strlen (value); + asn1_length_der ((len >> 3) + 2, NULL, &len2); + temp = (unsigned char *) _asn1_alloca ((len >> 3) + 2 + len2); + if (temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + asn1_bit_der (value, len, temp, &len2); + _asn1_set_value (node, temp, len2); + _asn1_afree (temp); + break; + case TYPE_CHOICE: + p = node->down; + while (p) + { + if (!strcmp (p->name, value)) + { + p2 = node->down; + while (p2) + { + if (p2 != p) + { + asn1_delete_structure (&p2); + p2 = node->down; + } + else + p2 = p2->right; + } + break; + } + p = p->right; + } + if (!p) + return ASN1_ELEMENT_NOT_FOUND; + break; + case TYPE_ANY: + asn1_length_der (len, NULL, &len2); + temp = (unsigned char *) _asn1_alloca (len + len2); + if (temp == NULL) + return ASN1_MEM_ALLOC_ERROR; + + asn1_octet_der (value, len, temp, &len2); + _asn1_set_value (node, temp, len2); + _asn1_afree (temp); + break; + case TYPE_SEQUENCE_OF: + case TYPE_SET_OF: + if (strcmp (value, "NEW")) + return ASN1_VALUE_NOT_VALID; + _asn1_append_sequence_set (node); + break; + default: + return ASN1_ELEMENT_NOT_FOUND; + break; } - if(!p) return ASN1_ELEMENT_NOT_FOUND; - break; - case TYPE_ANY: - asn1_length_der(len,NULL,&len2); - temp=(unsigned char *)_asn1_alloca(len+len2); - if (temp==NULL) return ASN1_MEM_ALLOC_ERROR; - - asn1_octet_der(value,len,temp,&len2); - _asn1_set_value(node,temp,len2); - _asn1_afree(temp); - break; - case TYPE_SEQUENCE_OF: case TYPE_SET_OF: - if(strcmp(value,"NEW")) return ASN1_VALUE_NOT_VALID; - _asn1_append_sequence_set(node); - break; - default: - return ASN1_ELEMENT_NOT_FOUND; - break; - } return ASN1_SUCCESS; } @@ -537,7 +652,7 @@ asn1_write_value(ASN1_TYPE node_root,const char *name, /* this strcpy is checked */ \ strcpy(ptr, data); \ } - + #define ADD_STR_VALUE( ptr, ptr_size, data) \ *len = strlen(data) + 1; \ if (ptr_size < strlen(ptr)+(*len)) { \ @@ -614,124 +729,164 @@ asn1_write_value(ASN1_TYPE node_root,const char *name, * **/ asn1_retCode -asn1_read_value(ASN1_TYPE root,const char *name,void* ivalue, int *len) +asn1_read_value (ASN1_TYPE root, const char *name, void *ivalue, int *len) { - node_asn *node,*p,*p2; - int len2,len3; + node_asn *node, *p, *p2; + int len2, len3; int value_size = *len; - unsigned char* value = ivalue; + unsigned char *value = ivalue; - node=asn1_find_node(root,name); - if(node==NULL) return ASN1_ELEMENT_NOT_FOUND; + node = asn1_find_node (root, name); + if (node == NULL) + return ASN1_ELEMENT_NOT_FOUND; - if((type_field(node->type)!=TYPE_NULL) && - (type_field(node->type)!=TYPE_CHOICE) && - !(node->type&CONST_DEFAULT) && !(node->type&CONST_ASSIGN) && - (node->value==NULL)) + if ((type_field (node->type) != TYPE_NULL) && + (type_field (node->type) != TYPE_CHOICE) && + !(node->type & CONST_DEFAULT) && !(node->type & CONST_ASSIGN) && + (node->value == NULL)) return ASN1_VALUE_NOT_FOUND; - switch(type_field(node->type)){ - case TYPE_NULL: - PUT_STR_VALUE( value, value_size, "NULL"); - break; - case TYPE_BOOLEAN: - if((node->type&CONST_DEFAULT) && (node->value==NULL)){ - p=node->down; - while(type_field(p->type)!=TYPE_DEFAULT) p=p->right; - if(p->type&CONST_TRUE) { - PUT_STR_VALUE( value, value_size, "TRUE"); - } else { - PUT_STR_VALUE(value, value_size, "FALSE"); - } - } - else if(node->value[0]=='T') { - PUT_STR_VALUE(value, value_size, "TRUE"); - } - else { - PUT_STR_VALUE(value, value_size, "FALSE"); - } - break; - case TYPE_INTEGER: case TYPE_ENUMERATED: - if((node->type&CONST_DEFAULT) && (node->value==NULL)){ - p=node->down; - while(type_field(p->type)!=TYPE_DEFAULT) p=p->right; - if((isdigit(p->value[0])) || (p->value[0]=='-') || (p->value[0]=='+')){ - if (_asn1_convert_integer(p->value,value,value_size, len) != - ASN1_SUCCESS) - return ASN1_MEM_ERROR; - } - else{ /* is an identifier like v1 */ - p2=node->down; - while(p2){ - if(type_field(p2->type)==TYPE_CONSTANT){ - if((p2->name) && (!strcmp(p2->name,p->value))){ - if (_asn1_convert_integer(p2->value,value,value_size, len) != - ASN1_SUCCESS) + switch (type_field (node->type)) + { + case TYPE_NULL: + PUT_STR_VALUE (value, value_size, "NULL"); + break; + case TYPE_BOOLEAN: + if ((node->type & CONST_DEFAULT) && (node->value == NULL)) + { + p = node->down; + while (type_field (p->type) != TYPE_DEFAULT) + p = p->right; + if (p->type & CONST_TRUE) + { + PUT_STR_VALUE (value, value_size, "TRUE"); + } + else + { + PUT_STR_VALUE (value, value_size, "FALSE"); + } + } + else if (node->value[0] == 'T') + { + PUT_STR_VALUE (value, value_size, "TRUE"); + } + else + { + PUT_STR_VALUE (value, value_size, "FALSE"); + } + break; + case TYPE_INTEGER: + case TYPE_ENUMERATED: + if ((node->type & CONST_DEFAULT) && (node->value == NULL)) + { + p = node->down; + while (type_field (p->type) != TYPE_DEFAULT) + p = p->right; + if ((isdigit (p->value[0])) || (p->value[0] == '-') + || (p->value[0] == '+')) + { + if (_asn1_convert_integer + (p->value, value, value_size, len) != ASN1_SUCCESS) return ASN1_MEM_ERROR; - break; } - } - p2=p2->right; + else + { /* is an identifier like v1 */ + p2 = node->down; + while (p2) + { + if (type_field (p2->type) == TYPE_CONSTANT) + { + if ((p2->name) && (!strcmp (p2->name, p->value))) + { + if (_asn1_convert_integer + (p2->value, value, value_size, + len) != ASN1_SUCCESS) + return ASN1_MEM_ERROR; + break; + } + } + p2 = p2->right; + } + } } - } - } - else{ - len2=-1; - if (asn1_get_octet_der(node->value,node->value_len,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR; - } - break; - case TYPE_OBJECT_ID: - if(node->type&CONST_ASSIGN){ - value[0]=0; - p=node->down; - while(p){ - if(type_field(p->type)==TYPE_CONSTANT){ - ADD_STR_VALUE(value,value_size,p->value); - if(p->right) { - ADD_STR_VALUE(value,value_size,"."); - } + else + { + len2 = -1; + if (asn1_get_octet_der + (node->value, node->value_len, &len2, value, value_size, + len) != ASN1_SUCCESS) + return ASN1_MEM_ERROR; + } + break; + case TYPE_OBJECT_ID: + if (node->type & CONST_ASSIGN) + { + value[0] = 0; + p = node->down; + while (p) + { + if (type_field (p->type) == TYPE_CONSTANT) + { + ADD_STR_VALUE (value, value_size, p->value); + if (p->right) + { + ADD_STR_VALUE (value, value_size, "."); + } + } + p = p->right; + } + *len = strlen (value) + 1; + } + else if ((node->type & CONST_DEFAULT) && (node->value == NULL)) + { + p = node->down; + while (type_field (p->type) != TYPE_DEFAULT) + p = p->right; + PUT_STR_VALUE (value, value_size, p->value); } - p=p->right; - } - *len = strlen(value) + 1; - } - else if((node->type&CONST_DEFAULT) && (node->value==NULL)){ - p=node->down; - while(type_field(p->type)!=TYPE_DEFAULT) p=p->right; - PUT_STR_VALUE(value, value_size, p->value); - } - else { - PUT_STR_VALUE(value, value_size, node->value); + else + { + PUT_STR_VALUE (value, value_size, node->value); + } + break; + case TYPE_TIME: + PUT_STR_VALUE (value, value_size, node->value); + break; + case TYPE_OCTET_STRING: + len2 = -1; + if (asn1_get_octet_der + (node->value, node->value_len, &len2, value, value_size, + len) != ASN1_SUCCESS) + return ASN1_MEM_ERROR; + break; + case TYPE_GENERALSTRING: + len2 = -1; + if (asn1_get_octet_der + (node->value, node->value_len, &len2, value, value_size, + len) != ASN1_SUCCESS) + return ASN1_MEM_ERROR; + break; + case TYPE_BIT_STRING: + len2 = -1; + if (asn1_get_bit_der + (node->value, node->value_len, &len2, value, value_size, + len) != ASN1_SUCCESS) + return ASN1_MEM_ERROR; + break; + case TYPE_CHOICE: + PUT_STR_VALUE (value, value_size, node->down->name); + break; + case TYPE_ANY: + len3 = -1; + len2 = asn1_get_length_der (node->value, node->value_len, &len3); + if (len2 < 0) + return ASN1_DER_ERROR; + PUT_VALUE (value, value_size, node->value + len3, len2); + break; + default: + return ASN1_ELEMENT_NOT_FOUND; + break; } - break; - case TYPE_TIME: - PUT_STR_VALUE( value, value_size, node->value); - break; - case TYPE_OCTET_STRING: - len2=-1; - if (asn1_get_octet_der(node->value,node->value_len,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR; - break; - case TYPE_GENERALSTRING: - len2=-1; - if (asn1_get_octet_der(node->value,node->value_len,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR; - break; - case TYPE_BIT_STRING: - len2=-1; - if (asn1_get_bit_der(node->value,node->value_len,&len2,value,value_size,len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR; - break; - case TYPE_CHOICE: - PUT_STR_VALUE( value, value_size, node->down->name); - break; - case TYPE_ANY: - len3=-1; - len2=asn1_get_length_der(node->value,node->value_len,&len3); - if (len2 < 0) return ASN1_DER_ERROR; - PUT_VALUE( value, value_size, node->value+len3, len2); - break; - default: - return ASN1_ELEMENT_NOT_FOUND; - break; - } return ASN1_SUCCESS; } @@ -755,76 +910,102 @@ asn1_read_value(ASN1_TYPE root,const char *name,void* ivalue, int *len) * ASN1_ELEMENT_NOT_FOUND: NAME is not a valid element. * **/ -asn1_retCode -asn1_read_tag(node_asn *root,const char *name,int *tagValue, int *classValue) +asn1_retCode +asn1_read_tag (node_asn * root, const char *name, int *tagValue, + int *classValue) { - node_asn *node,*p,*pTag; - - node=asn1_find_node(root,name); - if(node==NULL) return ASN1_ELEMENT_NOT_FOUND; + node_asn *node, *p, *pTag; - p=node->down; + node = asn1_find_node (root, name); + if (node == NULL) + return ASN1_ELEMENT_NOT_FOUND; + + p = node->down; /* pTag will points to the IMPLICIT TAG */ - pTag=NULL; - if(node->type&CONST_TAG){ - while(p){ - if(type_field(p->type)==TYPE_TAG){ - if((p->type&CONST_IMPLICIT) && (pTag==NULL)) - pTag=p; - else if(p->type&CONST_EXPLICIT) - pTag=NULL; - } - p=p->right; + pTag = NULL; + if (node->type & CONST_TAG) + { + while (p) + { + if (type_field (p->type) == TYPE_TAG) + { + if ((p->type & CONST_IMPLICIT) && (pTag == NULL)) + pTag = p; + else if (p->type & CONST_EXPLICIT) + pTag = NULL; + } + p = p->right; + } } - } - - if(pTag){ - *tagValue=strtoul(pTag->value,NULL,10); - - if(pTag->type&CONST_APPLICATION) *classValue=ASN1_CLASS_APPLICATION; - else if(pTag->type&CONST_UNIVERSAL) *classValue=ASN1_CLASS_UNIVERSAL; - else if(pTag->type&CONST_PRIVATE) *classValue=ASN1_CLASS_PRIVATE; - else *classValue=ASN1_CLASS_CONTEXT_SPECIFIC; - } - else{ - *classValue=ASN1_CLASS_UNIVERSAL; - - switch(type_field(node->type)){ - case TYPE_NULL: - *tagValue=ASN1_TAG_NULL;break; - case TYPE_BOOLEAN: - *tagValue=ASN1_TAG_BOOLEAN;break; - case TYPE_INTEGER: - *tagValue=ASN1_TAG_INTEGER;break; - case TYPE_ENUMERATED: - *tagValue=ASN1_TAG_ENUMERATED;break; - case TYPE_OBJECT_ID: - *tagValue=ASN1_TAG_OBJECT_ID;break; - case TYPE_TIME: - if(node->type&CONST_UTC){ - *tagValue=ASN1_TAG_UTCTime; - } - else *tagValue=ASN1_TAG_GENERALIZEDTime; - break; - case TYPE_OCTET_STRING: - *tagValue=ASN1_TAG_OCTET_STRING;break; - case TYPE_GENERALSTRING: - *tagValue=ASN1_TAG_GENERALSTRING;break; - case TYPE_BIT_STRING: - *tagValue=ASN1_TAG_BIT_STRING;break; - case TYPE_SEQUENCE: case TYPE_SEQUENCE_OF: - *tagValue=ASN1_TAG_SEQUENCE;break; - case TYPE_SET: case TYPE_SET_OF: - *tagValue=ASN1_TAG_SET;break; - case TYPE_TAG: - case TYPE_CHOICE: - case TYPE_ANY: - break; - default: - break; + + if (pTag) + { + *tagValue = strtoul (pTag->value, NULL, 10); + + if (pTag->type & CONST_APPLICATION) + *classValue = ASN1_CLASS_APPLICATION; + else if (pTag->type & CONST_UNIVERSAL) + *classValue = ASN1_CLASS_UNIVERSAL; + else if (pTag->type & CONST_PRIVATE) + *classValue = ASN1_CLASS_PRIVATE; + else + *classValue = ASN1_CLASS_CONTEXT_SPECIFIC; + } + else + { + *classValue = ASN1_CLASS_UNIVERSAL; + + switch (type_field (node->type)) + { + case TYPE_NULL: + *tagValue = ASN1_TAG_NULL; + break; + case TYPE_BOOLEAN: + *tagValue = ASN1_TAG_BOOLEAN; + break; + case TYPE_INTEGER: + *tagValue = ASN1_TAG_INTEGER; + break; + case TYPE_ENUMERATED: + *tagValue = ASN1_TAG_ENUMERATED; + break; + case TYPE_OBJECT_ID: + *tagValue = ASN1_TAG_OBJECT_ID; + break; + case TYPE_TIME: + if (node->type & CONST_UTC) + { + *tagValue = ASN1_TAG_UTCTime; + } + else + *tagValue = ASN1_TAG_GENERALIZEDTime; + break; + case TYPE_OCTET_STRING: + *tagValue = ASN1_TAG_OCTET_STRING; + break; + case TYPE_GENERALSTRING: + *tagValue = ASN1_TAG_GENERALSTRING; + break; + case TYPE_BIT_STRING: + *tagValue = ASN1_TAG_BIT_STRING; + break; + case TYPE_SEQUENCE: + case TYPE_SEQUENCE_OF: + *tagValue = ASN1_TAG_SEQUENCE; + break; + case TYPE_SET: + case TYPE_SET_OF: + *tagValue = ASN1_TAG_SET; + break; + case TYPE_TAG: + case TYPE_CHOICE: + case TYPE_ANY: + break; + default: + break; + } } - } return ASN1_SUCCESS; |