diff options
Diffstat (limited to 'src/daemon/https/minitasn1/parser_aux.c')
-rw-r--r-- | src/daemon/https/minitasn1/parser_aux.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/daemon/https/minitasn1/parser_aux.c b/src/daemon/https/minitasn1/parser_aux.c index 5f36a5ff..438b8e76 100644 --- a/src/daemon/https/minitasn1/parser_aux.c +++ b/src/daemon/https/minitasn1/parser_aux.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | 30 | ||
31 | 31 | ||
32 | char MHD__asn1_identifierMissing[MAX_NAME_SIZE + 1]; /* identifier name not found */ | 32 | char MHD__asn1_identifierMissing[MAX_NAME_SIZE + 1]; /* identifier name not found */ |
33 | 33 | ||
34 | /***********************************************/ | 34 | /***********************************************/ |
35 | /* Type: list_type */ | 35 | /* Type: list_type */ |
@@ -443,7 +443,8 @@ MHD__asn1_change_integer_value (ASN1_TYPE node) | |||
443 | { | 443 | { |
444 | if (p->value) | 444 | if (p->value) |
445 | { | 445 | { |
446 | MHD__asn1_convert_integer ((const char*) p->value, val, sizeof (val), &len); | 446 | MHD__asn1_convert_integer ((const char *) p->value, val, |
447 | sizeof (val), &len); | ||
447 | MHD__asn1_octet_der (val, len, val2, &len); | 448 | MHD__asn1_octet_der (val, len, val2, &len); |
448 | MHD__asn1_set_value (p, val2, len); | 449 | MHD__asn1_set_value (p, val2, len); |
449 | } | 450 | } |
@@ -521,7 +522,8 @@ MHD__asn1_expand_object_id (ASN1_TYPE node) | |||
521 | { | 522 | { |
522 | MHD__asn1_str_cpy (name2, sizeof (name2), name_root); | 523 | MHD__asn1_str_cpy (name2, sizeof (name2), name_root); |
523 | MHD__asn1_str_cat (name2, sizeof (name2), "."); | 524 | MHD__asn1_str_cat (name2, sizeof (name2), "."); |
524 | MHD__asn1_str_cat (name2, sizeof (name2), (const char*) p2->value); | 525 | MHD__asn1_str_cat (name2, sizeof (name2), |
526 | (const char *) p2->value); | ||
525 | p3 = MHD__asn1_find_node (node, name2); | 527 | p3 = MHD__asn1_find_node (node, name2); |
526 | if (!p3 || (type_field (p3->type) != TYPE_OBJECT_ID) || | 528 | if (!p3 || (type_field (p3->type) != TYPE_OBJECT_ID) || |
527 | !(p3->type & CONST_ASSIGN)) | 529 | !(p3->type & CONST_ASSIGN)) |
@@ -536,7 +538,7 @@ MHD__asn1_expand_object_id (ASN1_TYPE node) | |||
536 | { | 538 | { |
537 | p5 = MHD__asn1_add_node_only (TYPE_CONSTANT); | 539 | p5 = MHD__asn1_add_node_only (TYPE_CONSTANT); |
538 | MHD__asn1_set_name (p5, p4->name); | 540 | MHD__asn1_set_name (p5, p4->name); |
539 | tlen = strlen ( (const char*) p4->value); | 541 | tlen = strlen ((const char *) p4->value); |
540 | if (tlen > 0) | 542 | if (tlen > 0) |
541 | MHD__asn1_set_value (p5, p4->value, tlen + 1); | 543 | MHD__asn1_set_value (p5, p4->value, tlen + 1); |
542 | if (p2 == p) | 544 | if (p2 == p) |
@@ -607,7 +609,8 @@ MHD__asn1_expand_object_id (ASN1_TYPE node) | |||
607 | { | 609 | { |
608 | MHD__asn1_str_cpy (name2, sizeof (name2), name_root); | 610 | MHD__asn1_str_cpy (name2, sizeof (name2), name_root); |
609 | MHD__asn1_str_cat (name2, sizeof (name2), "."); | 611 | MHD__asn1_str_cat (name2, sizeof (name2), "."); |
610 | MHD__asn1_str_cat (name2, sizeof (name2), (const char*) p2->value); | 612 | MHD__asn1_str_cat (name2, sizeof (name2), |
613 | (const char *) p2->value); | ||
611 | p3 = MHD__asn1_find_node (node, name2); | 614 | p3 = MHD__asn1_find_node (node, name2); |
612 | if (!p3 || (type_field (p3->type) != TYPE_OBJECT_ID) || | 615 | if (!p3 || (type_field (p3->type) != TYPE_OBJECT_ID) || |
613 | !(p3->type & CONST_ASSIGN)) | 616 | !(p3->type & CONST_ASSIGN)) |
@@ -620,7 +623,8 @@ MHD__asn1_expand_object_id (ASN1_TYPE node) | |||
620 | { | 623 | { |
621 | if (name2[0]) | 624 | if (name2[0]) |
622 | MHD__asn1_str_cat (name2, sizeof (name2), "."); | 625 | MHD__asn1_str_cat (name2, sizeof (name2), "."); |
623 | MHD__asn1_str_cat (name2, sizeof (name2), (const char*) p4->value); | 626 | MHD__asn1_str_cat (name2, sizeof (name2), |
627 | (const char *) p4->value); | ||
624 | } | 628 | } |
625 | p4 = p4->right; | 629 | p4 = p4->right; |
626 | } | 630 | } |
@@ -691,11 +695,11 @@ MHD__asn1_check_identifier (ASN1_TYPE node) | |||
691 | { | 695 | { |
692 | MHD__asn1_str_cpy (name2, sizeof (name2), node->name); | 696 | MHD__asn1_str_cpy (name2, sizeof (name2), node->name); |
693 | MHD__asn1_str_cat (name2, sizeof (name2), "."); | 697 | MHD__asn1_str_cat (name2, sizeof (name2), "."); |
694 | MHD__asn1_str_cat (name2, sizeof (name2), (const char*) p->value); | 698 | MHD__asn1_str_cat (name2, sizeof (name2), (const char *) p->value); |
695 | p2 = MHD__asn1_find_node (node, name2); | 699 | p2 = MHD__asn1_find_node (node, name2); |
696 | if (p2 == NULL) | 700 | if (p2 == NULL) |
697 | { | 701 | { |
698 | strcpy (MHD__asn1_identifierMissing, (const char*) p->value); | 702 | strcpy (MHD__asn1_identifierMissing, (const char *) p->value); |
699 | return ASN1_IDENTIFIER_NOT_FOUND; | 703 | return ASN1_IDENTIFIER_NOT_FOUND; |
700 | } | 704 | } |
701 | } | 705 | } |
@@ -707,8 +711,9 @@ MHD__asn1_check_identifier (ASN1_TYPE node) | |||
707 | { | 711 | { |
708 | MHD__asn1_str_cpy (name2, sizeof (name2), node->name); | 712 | MHD__asn1_str_cpy (name2, sizeof (name2), node->name); |
709 | MHD__asn1_str_cat (name2, sizeof (name2), "."); | 713 | MHD__asn1_str_cat (name2, sizeof (name2), "."); |
710 | MHD__asn1_str_cat (name2, sizeof (name2), (const char*) p2->value); | 714 | MHD__asn1_str_cat (name2, sizeof (name2), |
711 | strcpy (MHD__asn1_identifierMissing, (const char*) p2->value); | 715 | (const char *) p2->value); |
716 | strcpy (MHD__asn1_identifierMissing, (const char *) p2->value); | ||
712 | p2 = MHD__asn1_find_node (node, name2); | 717 | p2 = MHD__asn1_find_node (node, name2); |
713 | if (!p2 || (type_field (p2->type) != TYPE_OBJECT_ID) || | 718 | if (!p2 || (type_field (p2->type) != TYPE_OBJECT_ID) || |
714 | !(p2->type & CONST_ASSIGN)) | 719 | !(p2->type & CONST_ASSIGN)) |
@@ -727,8 +732,10 @@ MHD__asn1_check_identifier (ASN1_TYPE node) | |||
727 | { | 732 | { |
728 | MHD__asn1_str_cpy (name2, sizeof (name2), node->name); | 733 | MHD__asn1_str_cpy (name2, sizeof (name2), node->name); |
729 | MHD__asn1_str_cat (name2, sizeof (name2), "."); | 734 | MHD__asn1_str_cat (name2, sizeof (name2), "."); |
730 | MHD__asn1_str_cat (name2, sizeof (name2), (const char*) p2->value); | 735 | MHD__asn1_str_cat (name2, sizeof (name2), |
731 | strcpy (MHD__asn1_identifierMissing, (const char*) p2->value); | 736 | (const char *) p2->value); |
737 | strcpy (MHD__asn1_identifierMissing, | ||
738 | (const char *) p2->value); | ||
732 | p2 = MHD__asn1_find_node (node, name2); | 739 | p2 = MHD__asn1_find_node (node, name2); |
733 | if (!p2 || (type_field (p2->type) != TYPE_OBJECT_ID) || | 740 | if (!p2 || (type_field (p2->type) != TYPE_OBJECT_ID) || |
734 | !(p2->type & CONST_ASSIGN)) | 741 | !(p2->type & CONST_ASSIGN)) |