oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

quel 64bit warnings, fixup implicit encoding for template, fix spelling

Browse Source
This commit is contained in:
Love Hornquist Astrand
2013-06-03 21:45:51 -07:00
parent b301e47fb8
commit 060474df16
44 changed files with 977 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/asn1/main.c
View File

@@ -35,8 +35,6 @@
#include <getarg.h>
#include "lex.h"
RCSID("$Id$");
extern FILE *yyin;
static getarg_strings preserve;
@@ -62,22 +60,29 @@ seq_type(const char *p)
return 0;
}
const char *fuzzer_string = "";
int fuzzer_flag;
int support_ber;
int template_flag;
int rfc1510_bitstring;
int one_code_file;
char *option_file;
int parse_units_flag = 1;
char *type_file_string = "krb5-types.h";
int version_flag;
int help_flag;
struct getargs args[] = {
{ "fuzzer", 0, arg_flag, &fuzzer_flag, NULL, NULL },
{ "template", 0, arg_flag, &template_flag, NULL, NULL },
{ "encode-rfc1510-bit-string", 0, arg_flag, &rfc1510_bitstring, NULL, NULL},
{ "encode-rfc1510-bit-string", 0, arg_flag, &rfc1510_bitstring, NULL, NULL },
{ "decode-dce-ber", 0, arg_flag, &support_ber, NULL, NULL },
{ "support-ber", 0, arg_flag, &support_ber, NULL, NULL },
{ "preserve-binary", 0, arg_strings, &preserve, NULL, NULL },
{ "sequence", 0, arg_strings, &seq, NULL, NULL },
{ "one-code-file", 0, arg_flag, &one_code_file, NULL, NULL },
{ "option-file", 0, arg_string, &option_file, NULL, NULL },
{ "parse-units", 0, arg_negative_flag, &parse_units_flag, NULL, NULL },
{ "type-file", 0, arg_string, &type_file_string, NULL, NULL },
{ "version", 0, arg_flag, &version_flag, NULL, NULL },
{ "help", 0, arg_flag, &help_flag, NULL, NULL }
};
@@ -100,7 +105,7 @@ main(int argc, char **argv)
const char *name = NULL;
int optidx = 0;
char **arg = NULL;
size_t len = 0, i;
int len = 0, i;
setprogname(argv[0]);
if(getarg(args, num_args, argc, argv, &optidx))
@@ -180,6 +185,16 @@ main(int argc, char **argv)
}
}
if (fuzzer_flag) {
if (!template_flag) {
printf("can't do fuzzer w/o --template");
exit(1);
}
#ifdef ASN1_FUZZER
fuzzer_string = "_fuzzer";
#endif
}
init_generate (file, name);