diff options
Diffstat (limited to 'src/cli-gaa.c')
| -rw-r--r-- | src/cli-gaa.c | 1580 |
1 files changed, 831 insertions, 749 deletions
diff --git a/src/cli-gaa.c b/src/cli-gaa.c index 2b93916c42..efa88ebae3 100644 --- a/src/cli-gaa.c +++ b/src/cli-gaa.c @@ -21,147 +21,153 @@ void cli_version(void); #endif #endif -static void* gaa_malloc( size_t size) { -void* ret; - ret = malloc(size); - if (ret==NULL) { - fprintf(stderr, "gaa: could not allocate memory"); - exit(1); - } - return ret; +static void *gaa_malloc(size_t size) +{ + void *ret; + ret = malloc(size); + if (ret == NULL) { + fprintf(stderr, "gaa: could not allocate memory"); + exit(1); + } + return ret; } -static void __gaa_helpsingle(char short_name, char *name, - char *arg_desc, char *opt_help) +static void __gaa_helpsingle(char short_name, char *name, + char *arg_desc, char *opt_help) { - int col1, col3, col4, tabsize = 3, curr; - int i; - - col1 = 5; /* Default values */ - col3 = 30; - col4 = 70; - - curr = 0; - for(i = 0; i < col1; i++) - { - printf(" "); - curr++; - } - if(short_name) - { - if(name && *name) - { - printf("-%c, ", short_name); - curr += 4; - } - else - { - printf("-%c ", short_name); - curr += 3; - } - } - if(name && *name) - { - printf("--%s ", name); - curr += 3 + strlen(name); - } - if(arg_desc && *arg_desc) - { - printf("%s ", arg_desc); - curr += 1 + strlen(arg_desc); - } - if(curr >= col3) - { - printf("\n"); - curr = 0; - } - if(opt_help) /* let's print the option's help body */ - { - const char *str = opt_help; - while(*str) - { - while(curr < col3) - { - printf(" "); - curr++; - } - switch(*str) - { - case '\n': - printf("\n"); - curr = 0; - break; - case '\t': - do - { - printf(" "); - curr++; - } - while((curr - col3) % tabsize != 0 && curr < col4); - case ' ': - if(*str == ' ') - { - curr++; - printf(" "); - } - for(i = 1; str[i] && str[i] != ' ' && str[i] != '\n' - && str[i] != '\t'; i++); - if(curr + i - 1 >= col4) - curr = col4; - break; - default: - printf("%c", *str); - curr++; - } - if(curr >= col4) - { - printf("\n"); - curr = 0; - } - str++; - } - } - printf("\n"); + int col1, col3, col4, tabsize = 3, curr; + int i; + + col1 = 5; /* Default values */ + col3 = 30; + col4 = 70; + + curr = 0; + for (i = 0; i < col1; i++) { + printf(" "); + curr++; + } + if (short_name) { + if (name && *name) { + printf("-%c, ", short_name); + curr += 4; + } else { + printf("-%c ", short_name); + curr += 3; + } + } + if (name && *name) { + printf("--%s ", name); + curr += 3 + strlen(name); + } + if (arg_desc && *arg_desc) { + printf("%s ", arg_desc); + curr += 1 + strlen(arg_desc); + } + if (curr >= col3) { + printf("\n"); + curr = 0; + } + if (opt_help) { /* let's print the option's help body */ + const char *str = opt_help; + while (*str) { + while (curr < col3) { + printf(" "); + curr++; + } + switch (*str) { + case '\n': + printf("\n"); + curr = 0; + break; + case '\t': + do { + printf(" "); + curr++; + } + while ((curr - col3) % tabsize != 0 && curr < col4); + case ' ': + if (*str == ' ') { + curr++; + printf(" "); + } + for (i = 1; str[i] && str[i] != ' ' && str[i] != '\n' + && str[i] != '\t'; i++); + if (curr + i - 1 >= col4) + curr = col4; + break; + default: + printf("%c", *str); + curr++; + } + if (curr >= col4) { + printf("\n"); + curr = 0; + } + str++; + } + } + printf("\n"); } void gaa_help(void) { - printf("GNU TLS test client\nUsage: gnutls-cli [options] hostname\n\n\n"); - __gaa_helpsingle('d', "debug", "integer ", "Enable debugging"); - __gaa_helpsingle('r', "resume", "", "Connect, establish a session. Connect again and resume this session."); - __gaa_helpsingle('s', "starttls", "", "Connect, establish a plain session and start TLS when EOF or a SIGALRM is received."); - __gaa_helpsingle(0, "crlf", "", "Send CR LF instead of LF."); - __gaa_helpsingle(0, "x509fmtder", "", "Use DER format for certificates to read from."); - __gaa_helpsingle('f', "fingerprint", "", "Send the openpgp fingerprint, instead of the key."); - __gaa_helpsingle(0, "disable-extensions", "", "Disable all the TLS extensions."); - __gaa_helpsingle(0, "xml", "", "Print the certificate information in XML format."); - __gaa_helpsingle(0, "print-cert", "", "Print the certificate in PEM format."); - __gaa_helpsingle('p', "port", "integer ", "The port to connect to."); - __gaa_helpsingle(0, "recordsize", "integer ", "The maximum record size to advertize."); - __gaa_helpsingle('V', "verbose", "", "More verbose output."); - __gaa_helpsingle(0, "ciphers", "cipher1 cipher2... ", "Ciphers to enable."); - __gaa_helpsingle(0, "protocols", "protocol1 protocol2... ", "Protocols to enable."); - __gaa_helpsingle(0, "comp", "comp1 comp2... ", "Compression methods to enable."); - __gaa_helpsingle(0, "macs", "mac1 mac2... ", "MACs to enable."); - __gaa_helpsingle(0, "kx", "kx1 kx2... ", "Key exchange methods to enable."); - __gaa_helpsingle(0, "ctypes", "certType1 certType2... ", "Certificate types to enable."); - __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file to use."); - __gaa_helpsingle(0, "x509crlfile", "FILE ", "CRL file to use."); - __gaa_helpsingle(0, "pgpkeyfile", "FILE ", "PGP Key file to use."); - __gaa_helpsingle(0, "pgpkeyring", "FILE ", "PGP Key ring file to use."); - __gaa_helpsingle(0, "pgptrustdb", "FILE ", "PGP trustdb file to use."); - __gaa_helpsingle(0, "pgpcertfile", "FILE ", "PGP Public Key (certificate) file to use."); - __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file to use."); - __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file to use."); - __gaa_helpsingle(0, "srpusername", "NAME ", "SRP username to use."); - __gaa_helpsingle(0, "srppasswd", "PASSWD ", "SRP password to use."); - __gaa_helpsingle('l', "list", "", "Print a list of the supported algorithms and modes."); - __gaa_helpsingle('h', "help", "", "prints this help"); - __gaa_helpsingle('v', "version", "", "prints the program's version number"); - __gaa_helpsingle(0, "copyright", "", "prints the program's license"); + printf + ("GNU TLS test client\nUsage: gnutls-cli [options] hostname\n\n\n"); + __gaa_helpsingle('d', "debug", "integer ", "Enable debugging"); + __gaa_helpsingle('r', "resume", "", + "Connect, establish a session. Connect again and resume this session."); + __gaa_helpsingle('s', "starttls", "", + "Connect, establish a plain session and start TLS when EOF or a SIGALRM is received."); + __gaa_helpsingle(0, "crlf", "", "Send CR LF instead of LF."); + __gaa_helpsingle(0, "x509fmtder", "", + "Use DER format for certificates to read from."); + __gaa_helpsingle('f', "fingerprint", "", + "Send the openpgp fingerprint, instead of the key."); + __gaa_helpsingle(0, "disable-extensions", "", + "Disable all the TLS extensions."); + __gaa_helpsingle(0, "xml", "", + "Print the certificate information in XML format."); + __gaa_helpsingle(0, "print-cert", "", + "Print the certificate in PEM format."); + __gaa_helpsingle('p', "port", "integer ", "The port to connect to."); + __gaa_helpsingle(0, "recordsize", "integer ", + "The maximum record size to advertize."); + __gaa_helpsingle('V', "verbose", "", "More verbose output."); + __gaa_helpsingle(0, "ciphers", "cipher1 cipher2... ", + "Ciphers to enable."); + __gaa_helpsingle(0, "protocols", "protocol1 protocol2... ", + "Protocols to enable."); + __gaa_helpsingle(0, "comp", "comp1 comp2... ", + "Compression methods to enable."); + __gaa_helpsingle(0, "macs", "mac1 mac2... ", "MACs to enable."); + __gaa_helpsingle(0, "kx", "kx1 kx2... ", + "Key exchange methods to enable."); + __gaa_helpsingle(0, "ctypes", "certType1 certType2... ", + "Certificate types to enable."); + __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file to use."); + __gaa_helpsingle(0, "x509crlfile", "FILE ", "CRL file to use."); + __gaa_helpsingle(0, "pgpkeyfile", "FILE ", "PGP Key file to use."); + __gaa_helpsingle(0, "pgpkeyring", "FILE ", + "PGP Key ring file to use."); + __gaa_helpsingle(0, "pgptrustdb", "FILE ", "PGP trustdb file to use."); + __gaa_helpsingle(0, "pgpcertfile", "FILE ", + "PGP Public Key (certificate) file to use."); + __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file to use."); + __gaa_helpsingle(0, "x509certfile", "FILE ", + "X.509 Certificate file to use."); + __gaa_helpsingle(0, "srpusername", "NAME ", "SRP username to use."); + __gaa_helpsingle(0, "srppasswd", "PASSWD ", "SRP password to use."); + __gaa_helpsingle('l', "list", "", + "Print a list of the supported algorithms and modes."); + __gaa_helpsingle('h', "help", "", "prints this help"); + __gaa_helpsingle('v', "version", "", + "prints the program's version number"); + __gaa_helpsingle(0, "copyright", "", "prints the program's license"); #line 100 "gaa.skel" } + /* Copy of C area */ #line 104 "gaa.skel" @@ -171,110 +177,102 @@ void gaa_help(void) typedef struct _gaainfo gaainfo; -struct _gaainfo -{ +struct _gaainfo { #line 111 "cli.gaa" - char *rest_args; + char *rest_args; #line 101 "cli.gaa" - char *srp_passwd; + char *srp_passwd; #line 98 "cli.gaa" - char *srp_username; + char *srp_username; #line 95 "cli.gaa" - char *x509_certfile; + char *x509_certfile; #line 92 "cli.gaa" - char *x509_keyfile; + char *x509_keyfile; #line 89 "cli.gaa" - char *pgp_certfile; + char *pgp_certfile; #line 86 "cli.gaa" - char *pgp_trustdb; + char *pgp_trustdb; #line 83 "cli.gaa" - char *pgp_keyring; + char *pgp_keyring; #line 80 "cli.gaa" - char *pgp_keyfile; + char *pgp_keyfile; #line 77 "cli.gaa" - char *x509_crlfile; + char *x509_crlfile; #line 74 "cli.gaa" - char *x509_cafile; + char *x509_cafile; #line 71 "cli.gaa" - char **ctype; + char **ctype; #line 70 "cli.gaa" - int nctype; + int nctype; #line 67 "cli.gaa" - char **kx; + char **kx; #line 66 "cli.gaa" - int nkx; + int nkx; #line 63 "cli.gaa" - char **macs; + char **macs; #line 62 "cli.gaa" - int nmacs; + int nmacs; #line 59 "cli.gaa" - char **comp; + char **comp; #line 58 "cli.gaa" - int ncomp; + int ncomp; #line 55 "cli.gaa" - char **proto; + char **proto; #line 54 "cli.gaa" - int nproto; + int nproto; #line 51 "cli.gaa" - char **ciphers; + char **ciphers; #line 50 "cli.gaa" - int nciphers; + int nciphers; #line 47 "cli.gaa" - int verbose; + int verbose; #line 44 "cli.gaa" - int record_size; + int record_size; #line 41 "cli.gaa" - int port; + int port; #line 38 "cli.gaa" - int print_cert; + int print_cert; #line 35 "cli.gaa" - int xml; + int xml; #line 32 "cli.gaa" - int disable_extensions; + int disable_extensions; #line 29 "cli.gaa" - int fingerprint; + int fingerprint; #line 26 "cli.gaa" - int fmtder; + int fmtder; #line 23 "cli.gaa" - int crlf; + int crlf; #line 20 "cli.gaa" - int starttls; + int starttls; #line 17 "cli.gaa" - int resume; + int resume; #line 14 "cli.gaa" - int debug; + int debug; #line 114 "gaa.skel" }; #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif - int gaa(int argc, char *argv[], gaainfo *gaaval); + int gaa(int argc, char *argv[], gaainfo * gaaval); void gaa_help(void); - - int gaa_file(const char *name, gaainfo *gaaval); - + + int gaa_file(const char *name, gaainfo * gaaval); + #ifdef __cplusplus } #endif - - #endif - #line 135 "gaa.skel" - /* C declarations */ - #define GAAERROR(x) \ { \ gaa_error = 1; \ return x; \ } - static char *gaa_current_option; static int gaa_error = 0; @@ -372,7 +370,7 @@ if(gaa_error == 1) \ { \ gaa_error = 0; \ return GAA_ERROR_INVALID_ARG; \ -} +} @@ -450,7 +448,7 @@ if(k == 0) \ printf("You must give at least one option of '%s'\n", str); \ return 0; \ } - + #define GAA_INCOMP(str) \ k = 0; \ for(i = 0; i < strlen(str); i++) \ @@ -469,7 +467,7 @@ if(k > 1) \ printf("The options '%s' are incompatible\n", str); \ return 0; \ } - + static char **GAAargv; static int GAAargc; @@ -481,25 +479,25 @@ static int gaa_getint(char *arg) { int tmp; char a; - if(sscanf(arg, "%d%c", &tmp, &a) < 1) - { - printf("Option %s: '%s' isn't an integer\n", gaa_current_option, arg); - GAAERROR(-1); + if (sscanf(arg, "%d%c", &tmp, &a) < 1) { + printf("Option %s: '%s' isn't an integer\n", gaa_current_option, + arg); + GAAERROR(-1); } return tmp; } static char gaa_getchar(char *arg) { - if(strlen(arg) != 1) - { - printf("Option %s: '%s' isn't an character\n", gaa_current_option, arg); - GAAERROR(-1); + if (strlen(arg) != 1) { + printf("Option %s: '%s' isn't an character\n", gaa_current_option, + arg); + GAAERROR(-1); } return arg[0]; } -static char* gaa_getstr(char *arg) +static char *gaa_getstr(char *arg) { return arg; } @@ -507,266 +505,247 @@ static float gaa_getfloat(char *arg) { float tmp; char a; - if(sscanf(arg, "%f%c", &tmp, &a) < 1) - { - printf("Option %s: '%s' isn't a float number\n", gaa_current_option, arg); - GAAERROR(-1); + if (sscanf(arg, "%f%c", &tmp, &a) < 1) { + printf("Option %s: '%s' isn't a float number\n", + gaa_current_option, arg); + GAAERROR(-1); } return tmp; } + /* option structures */ -struct GAAOPTION_srppasswd -{ - char* arg1; - int size1; +struct GAAOPTION_srppasswd { + char *arg1; + int size1; }; -struct GAAOPTION_srpusername -{ - char* arg1; - int size1; +struct GAAOPTION_srpusername { + char *arg1; + int size1; }; -struct GAAOPTION_x509certfile -{ - char* arg1; - int size1; +struct GAAOPTION_x509certfile { + char *arg1; + int size1; }; -struct GAAOPTION_x509keyfile -{ - char* arg1; - int size1; +struct GAAOPTION_x509keyfile { + char *arg1; + int size1; }; -struct GAAOPTION_pgpcertfile -{ - char* arg1; - int size1; +struct GAAOPTION_pgpcertfile { + char *arg1; + int size1; }; -struct GAAOPTION_pgptrustdb -{ - char* arg1; - int size1; +struct GAAOPTION_pgptrustdb { + char *arg1; + int size1; }; -struct GAAOPTION_pgpkeyring -{ - char* arg1; - int size1; +struct GAAOPTION_pgpkeyring { + char *arg1; + int size1; }; -struct GAAOPTION_pgpkeyfile -{ - char* arg1; - int size1; +struct GAAOPTION_pgpkeyfile { + char *arg1; + int size1; }; -struct GAAOPTION_x509crlfile -{ - char* arg1; - int size1; +struct GAAOPTION_x509crlfile { + char *arg1; + int size1; }; -struct GAAOPTION_x509cafile -{ - char* arg1; - int size1; +struct GAAOPTION_x509cafile { + char *arg1; + int size1; }; -struct GAAOPTION_ctypes -{ - char** arg1; - int size1; +struct GAAOPTION_ctypes { + char **arg1; + int size1; }; -struct GAAOPTION_kx -{ - char** arg1; - int size1; +struct GAAOPTION_kx { + char **arg1; + int size1; }; -struct GAAOPTION_macs -{ - char** arg1; - int size1; +struct GAAOPTION_macs { + char **arg1; + int size1; }; -struct GAAOPTION_comp -{ - char** arg1; - int size1; +struct GAAOPTION_comp { + char **arg1; + int size1; }; -struct GAAOPTION_protocols -{ - char** arg1; - int size1; +struct GAAOPTION_protocols { + char **arg1; + int size1; }; -struct GAAOPTION_ciphers -{ - char** arg1; - int size1; +struct GAAOPTION_ciphers { + char **arg1; + int size1; }; -struct GAAOPTION_recordsize -{ - int arg1; - int size1; +struct GAAOPTION_recordsize { + int arg1; + int size1; }; -struct GAAOPTION_port -{ - int arg1; - int size1; +struct GAAOPTION_port { + int arg1; + int size1; }; -struct GAAOPTION_debug -{ - int arg1; - int size1; +struct GAAOPTION_debug { + int arg1; + int size1; }; #define GAA_REST_EXISTS -struct GAAREST -{ - char* arg1; - int size1; +struct GAAREST { + char *arg1; + int size1; }; - + #line 349 "gaa.skel" static int gaa_is_an_argument(char *str) { #ifdef GAA_WIN32 - if(str[0] == '/' && str[1] != 0) + if (str[0] == '/' && str[1] != 0) return GAA_MULTIPLE_OPTION; #endif - if(str[0] != '-') - return GAA_NOT_AN_OPTION; - if(str[1] == 0) - return GAA_NOT_AN_OPTION; - if(str[1] == '-') - { - if(str[2] != 0) - return GAA_WORD_OPTION; - else - return GAA_NOT_AN_OPTION; + if (str[0] != '-') + return GAA_NOT_AN_OPTION; + if (str[1] == 0) + return GAA_NOT_AN_OPTION; + if (str[1] == '-') { + if (str[2] != 0) + return GAA_WORD_OPTION; + else + return GAA_NOT_AN_OPTION; } - if(str[2] == 0) - return GAA_LETTER_OPTION; + if (str[2] == 0) + return GAA_LETTER_OPTION; else - return GAA_MULTIPLE_OPTION; + return GAA_MULTIPLE_OPTION; } static int gaa_get_option_num(char *str, int status) { - switch(status) - { - case GAA_LETTER_OPTION: - GAA_CHECK1STR("", GAAOPTID_srppasswd); - GAA_CHECK1STR("", GAAOPTID_srpusername); - GAA_CHECK1STR("", GAAOPTID_x509certfile); - GAA_CHECK1STR("", GAAOPTID_x509keyfile); - GAA_CHECK1STR("", GAAOPTID_pgpcertfile); - GAA_CHECK1STR("", GAAOPTID_pgptrustdb); - GAA_CHECK1STR("", GAAOPTID_pgpkeyring); - GAA_CHECK1STR("", GAAOPTID_pgpkeyfile); - GAA_CHECK1STR("", GAAOPTID_x509crlfile); - GAA_CHECK1STR("", GAAOPTID_x509cafile); - GAA_CHECK1STR("", GAAOPTID_ctypes); - GAA_CHECK1STR("", GAAOPTID_kx); - GAA_CHECK1STR("", GAAOPTID_macs); - GAA_CHECK1STR("", GAAOPTID_comp); - GAA_CHECK1STR("", GAAOPTID_protocols); - GAA_CHECK1STR("", GAAOPTID_ciphers); - GAA_CHECK1STR("", GAAOPTID_recordsize); - GAA_CHECK1STR("p", GAAOPTID_port); - GAA_CHECK1STR("d", GAAOPTID_debug); - case GAA_MULTIPLE_OPTION: + switch (status) { + case GAA_LETTER_OPTION: + GAA_CHECK1STR("", GAAOPTID_srppasswd); + GAA_CHECK1STR("", GAAOPTID_srpusername); + GAA_CHECK1STR("", GAAOPTID_x509certfile); + GAA_CHECK1STR("", GAAOPTID_x509keyfile); + GAA_CHECK1STR("", GAAOPTID_pgpcertfile); + GAA_CHECK1STR("", GAAOPTID_pgptrustdb); + GAA_CHECK1STR("", GAAOPTID_pgpkeyring); + GAA_CHECK1STR("", GAAOPTID_pgpkeyfile); + GAA_CHECK1STR("", GAAOPTID_x509crlfile); + GAA_CHECK1STR("", GAAOPTID_x509cafile); + GAA_CHECK1STR("", GAAOPTID_ctypes); + GAA_CHECK1STR("", GAAOPTID_kx); + GAA_CHECK1STR("", GAAOPTID_macs); + GAA_CHECK1STR("", GAAOPTID_comp); + GAA_CHECK1STR("", GAAOPTID_protocols); + GAA_CHECK1STR("", GAAOPTID_ciphers); + GAA_CHECK1STR("", GAAOPTID_recordsize); + GAA_CHECK1STR("p", GAAOPTID_port); + GAA_CHECK1STR("d", GAAOPTID_debug); + case GAA_MULTIPLE_OPTION: #line 375 "gaa.skel" - GAA_CHECK1STR("", GAAOPTID_copyright); - GAA_CHECK1STR("v", GAAOPTID_version); - GAA_CHECK1STR("h", GAAOPTID_help); - GAA_CHECK1STR("l", GAAOPTID_list); - GAA_CHECK1STR("V", GAAOPTID_verbose); - GAA_CHECK1STR("", GAAOPTID_print_cert); - GAA_CHECK1STR("", GAAOPTID_xml); - GAA_CHECK1STR("", GAAOPTID_disable_extensions); - GAA_CHECK1STR("f", GAAOPTID_fingerprint); - GAA_CHECK1STR("", GAAOPTID_x509fmtder); - GAA_CHECK1STR("", GAAOPTID_crlf); - GAA_CHECK1STR("s", GAAOPTID_starttls); - GAA_CHECK1STR("r", GAAOPTID_resume); + GAA_CHECK1STR("", GAAOPTID_copyright); + GAA_CHECK1STR("v", GAAOPTID_version); + GAA_CHECK1STR("h", GAAOPTID_help); + GAA_CHECK1STR("l", GAAOPTID_list); + GAA_CHECK1STR("V", GAAOPTID_verbose); + GAA_CHECK1STR("", GAAOPTID_print_cert); + GAA_CHECK1STR("", GAAOPTID_xml); + GAA_CHECK1STR("", GAAOPTID_disable_extensions); + GAA_CHECK1STR("f", GAAOPTID_fingerprint); + GAA_CHECK1STR("", GAAOPTID_x509fmtder); + GAA_CHECK1STR("", GAAOPTID_crlf); + GAA_CHECK1STR("s", GAAOPTID_starttls); + GAA_CHECK1STR("r", GAAOPTID_resume); #line 277 "gaa.skel" - break; - case GAA_WORD_OPTION: - GAA_CHECKSTR("copyright", GAAOPTID_copyright); - GAA_CHECKSTR("version", GAAOPTID_version); - GAA_CHECKSTR("help", GAAOPTID_help); - GAA_CHECKSTR("list", GAAOPTID_list); - GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd); - GAA_CHECKSTR("srpusername", GAAOPTID_srpusername); - GAA_CHECKSTR("x509certfile", GAAOPTID_x509certfile); - GAA_CHECKSTR("x509keyfile", GAAOPTID_x509keyfile); - GAA_CHECKSTR("pgpcertfile", GAAOPTID_pgpcertfile); - GAA_CHECKSTR("pgptrustdb", GAAOPTID_pgptrustdb); - GAA_CHECKSTR("pgpkeyring", GAAOPTID_pgpkeyring); - GAA_CHECKSTR("pgpkeyfile", GAAOPTID_pgpkeyfile); - GAA_CHECKSTR("x509crlfile", GAAOPTID_x509crlfile); - GAA_CHECKSTR("x509cafile", GAAOPTID_x509cafile); - GAA_CHECKSTR("ctypes", GAAOPTID_ctypes); - GAA_CHECKSTR("kx", GAAOPTID_kx); - GAA_CHECKSTR("macs", GAAOPTID_macs); - GAA_CHECKSTR("comp", GAAOPTID_comp); - GAA_CHECKSTR("protocols", GAAOPTID_protocols); - GAA_CHECKSTR("ciphers", GAAOPTID_ciphers); - GAA_CHECKSTR("verbose", GAAOPTID_verbose); - GAA_CHECKSTR("recordsize", GAAOPTID_recordsize); - GAA_CHECKSTR("port", GAAOPTID_port); - GAA_CHECKSTR("print-cert", GAAOPTID_print_cert); - GAA_CHECKSTR("xml", GAAOPTID_xml); - GAA_CHECKSTR("disable-extensions", GAAOPTID_disable_extensions); - GAA_CHECKSTR("fingerprint", GAAOPTID_fingerprint); - GAA_CHECKSTR("x509fmtder", GAAOPTID_x509fmtder); - GAA_CHECKSTR("crlf", GAAOPTID_crlf); - GAA_CHECKSTR("starttls", GAAOPTID_starttls); - GAA_CHECKSTR("resume", GAAOPTID_resume); - GAA_CHECKSTR("debug", GAAOPTID_debug); + break; + case GAA_WORD_OPTION: + GAA_CHECKSTR("copyright", GAAOPTID_copyright); + GAA_CHECKSTR("version", GAAOPTID_version); + GAA_CHECKSTR("help", GAAOPTID_help); + GAA_CHECKSTR("list", GAAOPTID_list); + GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd); + GAA_CHECKSTR("srpusername", GAAOPTID_srpusername); + GAA_CHECKSTR("x509certfile", GAAOPTID_x509certfile); + GAA_CHECKSTR("x509keyfile", GAAOPTID_x509keyfile); + GAA_CHECKSTR("pgpcertfile", GAAOPTID_pgpcertfile); + GAA_CHECKSTR("pgptrustdb", GAAOPTID_pgptrustdb); + GAA_CHECKSTR("pgpkeyring", GAAOPTID_pgpkeyring); + GAA_CHECKSTR("pgpkeyfile", GAAOPTID_pgpkeyfile); + GAA_CHECKSTR("x509crlfile", GAAOPTID_x509crlfile); + GAA_CHECKSTR("x509cafile", GAAOPTID_x509cafile); + GAA_CHECKSTR("ctypes", GAAOPTID_ctypes); + GAA_CHECKSTR("kx", GAAOPTID_kx); + GAA_CHECKSTR("macs", GAAOPTID_macs); + GAA_CHECKSTR("comp", GAAOPTID_comp); + GAA_CHECKSTR("protocols", GAAOPTID_protocols); + GAA_CHECKSTR("ciphers", GAAOPTID_ciphers); + GAA_CHECKSTR("verbose", GAAOPTID_verbose); + GAA_CHECKSTR("recordsize", GAAOPTID_recordsize); + GAA_CHECKSTR("port", GAAOPTID_port); + GAA_CHECKSTR("print-cert", GAAOPTID_print_cert); + GAA_CHECKSTR("xml", GAAOPTID_xml); + GAA_CHECKSTR("disable-extensions", GAAOPTID_disable_extensions); + GAA_CHECKSTR("fingerprint", GAAOPTID_fingerprint); + GAA_CHECKSTR("x509fmtder", GAAOPTID_x509fmtder); + GAA_CHECKSTR("crlf", GAAOPTID_crlf); + GAA_CHECKSTR("starttls", GAAOPTID_starttls); + GAA_CHECKSTR("resume", GAAOPTID_resume); + GAA_CHECKSTR("debug", GAAOPTID_debug); #line 281 "gaa.skel" break; - default: break; - } + default: + break; + } return GAA_ERROR_NOMATCH; } -static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) +static int gaa_try(int gaa_num, int gaa_index, gaainfo * gaaval, + char *opt_list) { int OK = 0; int gaa_last_non_option; - struct GAAOPTION_srppasswd GAATMP_srppasswd; - struct GAAOPTION_srpusername GAATMP_srpusername; - struct GAAOPTION_x509certfile GAATMP_x509certfile; - struct GAAOPTION_x509keyfile GAATMP_x509keyfile; - struct GAAOPTION_pgpcertfile GAATMP_pgpcertfile; - struct GAAOPTION_pgptrustdb GAATMP_pgptrustdb; - struct GAAOPTION_pgpkeyring GAATMP_pgpkeyring; - struct GAAOPTION_pgpkeyfile GAATMP_pgpkeyfile; - struct GAAOPTION_x509crlfile GAATMP_x509crlfile; - struct GAAOPTION_x509cafile GAATMP_x509cafile; - struct GAAOPTION_ctypes GAATMP_ctypes; - struct GAAOPTION_kx GAATMP_kx; - struct GAAOPTION_macs GAATMP_macs; - struct GAAOPTION_comp GAATMP_comp; - struct GAAOPTION_protocols GAATMP_protocols; - struct GAAOPTION_ciphers GAATMP_ciphers; - struct GAAOPTION_recordsize GAATMP_recordsize; - struct GAAOPTION_port GAATMP_port; - struct GAAOPTION_debug GAATMP_debug; + struct GAAOPTION_srppasswd GAATMP_srppasswd; + struct GAAOPTION_srpusername GAATMP_srpusername; + struct GAAOPTION_x509certfile GAATMP_x509certfile; + struct GAAOPTION_x509keyfile GAATMP_x509keyfile; + struct GAAOPTION_pgpcertfile GAATMP_pgpcertfile; + struct GAAOPTION_pgptrustdb GAATMP_pgptrustdb; + struct GAAOPTION_pgpkeyring GAATMP_pgpkeyring; + struct GAAOPTION_pgpkeyfile GAATMP_pgpkeyfile; + struct GAAOPTION_x509crlfile GAATMP_x509crlfile; + struct GAAOPTION_x509cafile GAATMP_x509cafile; + struct GAAOPTION_ctypes GAATMP_ctypes; + struct GAAOPTION_kx GAATMP_kx; + struct GAAOPTION_macs GAATMP_macs; + struct GAAOPTION_comp GAATMP_comp; + struct GAAOPTION_protocols GAATMP_protocols; + struct GAAOPTION_ciphers GAATMP_ciphers; + struct GAAOPTION_recordsize GAATMP_recordsize; + struct GAAOPTION_port GAATMP_port; + struct GAAOPTION_debug GAATMP_debug; #line 393 "gaa.skel" #ifdef GAA_REST_EXISTS @@ -774,305 +753,397 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) #endif opt_list[gaa_num] = 1; - - for(gaa_last_non_option = gaa_index; - (gaa_last_non_option != GAAargc) && (gaa_is_an_argument(GAAargv[gaa_last_non_option]) == GAA_NOT_AN_OPTION); - gaa_last_non_option++); - - if(gaa_num == GAA_REST) - { - gaa_index = 1; - gaa_last_non_option = GAAargc; + + for (gaa_last_non_option = gaa_index; + (gaa_last_non_option != GAAargc) + && (gaa_is_an_argument(GAAargv[gaa_last_non_option]) == + GAA_NOT_AN_OPTION); gaa_last_non_option++); + + if (gaa_num == GAA_REST) { + gaa_index = 1; + gaa_last_non_option = GAAargc; } - - switch(gaa_num) - { - case GAAOPTID_copyright: + + switch (gaa_num) { + case GAAOPTID_copyright: OK = 0; #line 109 "cli.gaa" -{ print_license(); exit(0); ;}; + { + print_license(); + exit(0);; + }; - return GAA_OK; - break; - case GAAOPTID_version: + return GAA_OK; + break; + case GAAOPTID_version: OK = 0; #line 108 "cli.gaa" -{ cli_version(); exit(0); ;}; + { + cli_version(); + exit(0);; + }; - return GAA_OK; - break; - case GAAOPTID_help: + return GAA_OK; + break; + case GAAOPTID_help: OK = 0; #line 106 "cli.gaa" -{ gaa_help(); exit(0); ;}; + { + gaa_help(); + exit(0);; + }; - return GAA_OK; - break; - case GAAOPTID_list: + return GAA_OK; + break; + case GAAOPTID_list: OK = 0; #line 105 "cli.gaa" -{ print_list(); exit(0); ;}; + { + print_list(); + exit(0);; + }; - return GAA_OK; - break; - case GAAOPTID_srppasswd: + return GAA_OK; + break; + case GAAOPTID_srppasswd: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_srppasswd.arg1, gaa_getstr, GAATMP_srppasswd.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_srppasswd.arg1, gaa_getstr, + GAATMP_srppasswd.size1); + gaa_index++; #line 102 "cli.gaa" -{ gaaval->srp_passwd = GAATMP_srppasswd.arg1 ;}; + { + gaaval->srp_passwd = GAATMP_srppasswd.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_srpusername: + return GAA_OK; + break; + case GAAOPTID_srpusername: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_srpusername.arg1, gaa_getstr, GAATMP_srpusername.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_srpusername.arg1, gaa_getstr, + GAATMP_srpusername.size1); + gaa_index++; #line 99 "cli.gaa" -{ gaaval->srp_username = GAATMP_srpusername.arg1 ;}; + { + gaaval->srp_username = GAATMP_srpusername.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_x509certfile: + return GAA_OK; + break; + case GAAOPTID_x509certfile: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_x509certfile.arg1, gaa_getstr, GAATMP_x509certfile.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_x509certfile.arg1, gaa_getstr, + GAATMP_x509certfile.size1); + gaa_index++; #line 96 "cli.gaa" -{ gaaval->x509_certfile = GAATMP_x509certfile.arg1 ;}; + { + gaaval->x509_certfile = GAATMP_x509certfile.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_x509keyfile: + return GAA_OK; + break; + case GAAOPTID_x509keyfile: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_x509keyfile.arg1, gaa_getstr, GAATMP_x509keyfile.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_x509keyfile.arg1, gaa_getstr, + GAATMP_x509keyfile.size1); + gaa_index++; #line 93 "cli.gaa" -{ gaaval->x509_keyfile = GAATMP_x509keyfile.arg1 ;}; + { + gaaval->x509_keyfile = GAATMP_x509keyfile.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_pgpcertfile: + return GAA_OK; + break; + case GAAOPTID_pgpcertfile: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_pgpcertfile.arg1, gaa_getstr, GAATMP_pgpcertfile.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_pgpcertfile.arg1, gaa_getstr, + GAATMP_pgpcertfile.size1); + gaa_index++; #line 90 "cli.gaa" -{ gaaval->pgp_certfile = GAATMP_pgpcertfile.arg1 ;}; + { + gaaval->pgp_certfile = GAATMP_pgpcertfile.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_pgptrustdb: + return GAA_OK; + break; + case GAAOPTID_pgptrustdb: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_pgptrustdb.arg1, gaa_getstr, GAATMP_pgptrustdb.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_pgptrustdb.arg1, gaa_getstr, + GAATMP_pgptrustdb.size1); + gaa_index++; #line 87 "cli.gaa" -{ gaaval->pgp_trustdb = GAATMP_pgptrustdb.arg1 ;}; + { + gaaval->pgp_trustdb = GAATMP_pgptrustdb.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_pgpkeyring: + return GAA_OK; + break; + case GAAOPTID_pgpkeyring: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_pgpkeyring.arg1, gaa_getstr, GAATMP_pgpkeyring.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_pgpkeyring.arg1, gaa_getstr, + GAATMP_pgpkeyring.size1); + gaa_index++; #line 84 "cli.gaa" -{ gaaval->pgp_keyring = GAATMP_pgpkeyring.arg1 ;}; + { + gaaval->pgp_keyring = GAATMP_pgpkeyring.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_pgpkeyfile: + return GAA_OK; + break; + case GAAOPTID_pgpkeyfile: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_pgpkeyfile.arg1, gaa_getstr, GAATMP_pgpkeyfile.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_pgpkeyfile.arg1, gaa_getstr, + GAATMP_pgpkeyfile.size1); + gaa_index++; #line 81 "cli.gaa" -{ gaaval->pgp_keyfile = GAATMP_pgpkeyfile.arg1 ;}; + { + gaaval->pgp_keyfile = GAATMP_pgpkeyfile.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_x509crlfile: + return GAA_OK; + break; + case GAAOPTID_x509crlfile: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_x509crlfile.arg1, gaa_getstr, GAATMP_x509crlfile.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_x509crlfile.arg1, gaa_getstr, + GAATMP_x509crlfile.size1); + gaa_index++; #line 78 "cli.gaa" -{ gaaval->x509_crlfile = GAATMP_x509crlfile.arg1 ;}; + { + gaaval->x509_crlfile = GAATMP_x509crlfile.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_x509cafile: + return GAA_OK; + break; + case GAAOPTID_x509cafile: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_x509cafile.arg1, gaa_getstr, GAATMP_x509cafile.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_x509cafile.arg1, gaa_getstr, + GAATMP_x509cafile.size1); + gaa_index++; #line 75 "cli.gaa" -{ gaaval->x509_cafile = GAATMP_x509cafile.arg1 ;}; + { + gaaval->x509_cafile = GAATMP_x509cafile.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_ctypes: + return GAA_OK; + break; + case GAAOPTID_ctypes: OK = 0; - GAA_LIST_FILL(GAATMP_ctypes.arg1, gaa_getstr, char*, GAATMP_ctypes.size1); + GAA_LIST_FILL(GAATMP_ctypes.arg1, gaa_getstr, char *, + GAATMP_ctypes.size1); #line 72 "cli.gaa" -{ gaaval->ctype = GAATMP_ctypes.arg1; gaaval->nctype = GAATMP_ctypes.size1 ;}; + { + gaaval->ctype = GAATMP_ctypes.arg1; + gaaval->nctype = GAATMP_ctypes.size1; + }; - return GAA_OK; - break; - case GAAOPTID_kx: + return GAA_OK; + break; + case GAAOPTID_kx: OK = 0; - GAA_LIST_FILL(GAATMP_kx.arg1, gaa_getstr, char*, GAATMP_kx.size1); + GAA_LIST_FILL(GAATMP_kx.arg1, gaa_getstr, char *, GAATMP_kx.size1); #line 68 "cli.gaa" -{ gaaval->kx = GAATMP_kx.arg1; gaaval->nkx = GAATMP_kx.size1 ;}; + { + gaaval->kx = GAATMP_kx.arg1; + gaaval->nkx = GAATMP_kx.size1; + }; - return GAA_OK; - break; - case GAAOPTID_macs: + return GAA_OK; + break; + case GAAOPTID_macs: OK = 0; - GAA_LIST_FILL(GAATMP_macs.arg1, gaa_getstr, char*, GAATMP_macs.size1); + GAA_LIST_FILL(GAATMP_macs.arg1, gaa_getstr, char *, + GAATMP_macs.size1); #line 64 "cli.gaa" -{ gaaval->macs = GAATMP_macs.arg1; gaaval->nmacs = GAATMP_macs.size1 ;}; + { + gaaval->macs = GAATMP_macs.arg1; + gaaval->nmacs = GAATMP_macs.size1; + }; - return GAA_OK; - break; - case GAAOPTID_comp: + return GAA_OK; + break; + case GAAOPTID_comp: OK = 0; - GAA_LIST_FILL(GAATMP_comp.arg1, gaa_getstr, char*, GAATMP_comp.size1); + GAA_LIST_FILL(GAATMP_comp.arg1, gaa_getstr, char *, + GAATMP_comp.size1); #line 60 "cli.gaa" -{ gaaval->comp = GAATMP_comp.arg1; gaaval->ncomp = GAATMP_comp.size1 ;}; + { + gaaval->comp = GAATMP_comp.arg1; + gaaval->ncomp = GAATMP_comp.size1; + }; - return GAA_OK; - break; - case GAAOPTID_protocols: + return GAA_OK; + break; + case GAAOPTID_protocols: OK = 0; - GAA_LIST_FILL(GAATMP_protocols.arg1, gaa_getstr, char*, GAATMP_protocols.size1); + GAA_LIST_FILL(GAATMP_protocols.arg1, gaa_getstr, char *, + GAATMP_protocols.size1); #line 56 "cli.gaa" -{ gaaval->proto = GAATMP_protocols.arg1; gaaval->nproto = GAATMP_protocols.size1 ;}; + { + gaaval->proto = GAATMP_protocols.arg1; + gaaval->nproto = GAATMP_protocols.size1; + }; - return GAA_OK; - break; - case GAAOPTID_ciphers: + return GAA_OK; + break; + case GAAOPTID_ciphers: OK = 0; - GAA_LIST_FILL(GAATMP_ciphers.arg1, gaa_getstr, char*, GAATMP_ciphers.size1); + GAA_LIST_FILL(GAATMP_ciphers.arg1, gaa_getstr, char *, + GAATMP_ciphers.size1); #line 52 "cli.gaa" -{ gaaval->ciphers = GAATMP_ciphers.arg1; gaaval->nciphers = GAATMP_ciphers.size1 ;}; + { + gaaval->ciphers = GAATMP_ciphers.arg1; + gaaval->nciphers = GAATMP_ciphers.size1; + }; - return GAA_OK; - break; - case GAAOPTID_verbose: + return GAA_OK; + break; + case GAAOPTID_verbose: OK = 0; #line 48 "cli.gaa" -{ gaaval->verbose = 1 ;}; + { + gaaval->verbose = 1; + }; - return GAA_OK; - break; - case GAAOPTID_recordsize: + return GAA_OK; + break; + case GAAOPTID_recordsize: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_recordsize.arg1, gaa_getint, GAATMP_recordsize.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_recordsize.arg1, gaa_getint, + GAATMP_recordsize.size1); + gaa_index++; #line 45 "cli.gaa" -{ gaaval->record_size = GAATMP_recordsize.arg1 ;}; + { + gaaval->record_size = GAATMP_recordsize.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_port: + return GAA_OK; + break; + case GAAOPTID_port: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_port.arg1, gaa_getint, GAATMP_port.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_port.arg1, gaa_getint, GAATMP_port.size1); + gaa_index++; #line 42 "cli.gaa" -{ gaaval->port = GAATMP_port.arg1 ;}; + { + gaaval->port = GAATMP_port.arg1; + }; - return GAA_OK; - break; - case GAAOPTID_print_cert: + return GAA_OK; + break; + case GAAOPTID_print_cert: OK = 0; #line 39 "cli.gaa" -{ gaaval->print_cert = 1 ;}; + { + gaaval->print_cert = 1; + }; - return GAA_OK; - break; - case GAAOPTID_xml: + return GAA_OK; + break; + case GAAOPTID_xml: OK = 0; #line 36 "cli.gaa" -{ gaaval->xml = 1 ;}; + { + gaaval->xml = 1; + }; - return GAA_OK; - break; - case GAAOPTID_disable_extensions: + return GAA_OK; + break; + case GAAOPTID_disable_extensions: OK = 0; #line 33 "cli.gaa" -{ gaaval->disable_extensions = 1 ;}; + { + gaaval->disable_extensions = 1; + }; - return GAA_OK; - break; - case GAAOPTID_fingerprint: + return GAA_OK; + break; + case GAAOPTID_fingerprint: OK = 0; #line 30 "cli.gaa" -{ gaaval->fingerprint = 1 ;}; + { + gaaval->fingerprint = 1; + }; - return GAA_OK; - break; - case GAAOPTID_x509fmtder: + return GAA_OK; + break; + case GAAOPTID_x509fmtder: OK = 0; #line 27 "cli.gaa" -{ gaaval->fmtder = 1 ;}; + { + gaaval->fmtder = 1; + }; - return GAA_OK; - break; - case GAAOPTID_crlf: + return GAA_OK; + break; + case GAAOPTID_crlf: OK = 0; #line 24 "cli.gaa" -{ gaaval->crlf = 1 ;}; + { + gaaval->crlf = 1; + }; - return GAA_OK; - break; - case GAAOPTID_starttls: + return GAA_OK; + break; + case GAAOPTID_starttls: OK = 0; #line 21 "cli.gaa" -{ gaaval->starttls = 1 ;}; + { + gaaval->starttls = 1; + }; - return GAA_OK; - break; - case GAAOPTID_resume: + return GAA_OK; + break; + case GAAOPTID_resume: OK = 0; #line 18 "cli.gaa" -{ gaaval->resume = 1 ;}; + { + gaaval->resume = 1; + }; - return GAA_OK; - break; - case GAAOPTID_debug: + return GAA_OK; + break; + case GAAOPTID_debug: OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1); - gaa_index++; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1); + gaa_index++; #line 15 "cli.gaa" -{ gaaval->debug = GAATMP_debug.arg1 ;}; + { + gaaval->debug = GAATMP_debug.arg1; + }; - return GAA_OK; - break; - case GAA_REST: - GAA_TESTMOREARGS; - GAA_FILL(GAAREST_tmp.arg1, gaa_getstr, GAAREST_tmp.size1); - gaa_index++; + return GAA_OK; + break; + case GAA_REST: + GAA_TESTMOREARGS; + GAA_FILL(GAAREST_tmp.arg1, gaa_getstr, GAAREST_tmp.size1); + gaa_index++; #line 112 "cli.gaa" -{ gaaval->rest_args = GAAREST_tmp.arg1; ;}; + { + gaaval->rest_args = GAAREST_tmp.arg1;; + }; - return GAA_OK; - break; + return GAA_OK; + break; #line 413 "gaa.skel" - default: break; + default: + break; } return GAA_ERROR_UNKNOWN; } -int gaa(int argc, char **argv, gaainfo *gaaval) +int gaa(int argc, char **argv, gaainfo * gaaval) { int tmp1, tmp2; int i, j; @@ -1081,23 +1152,49 @@ int gaa(int argc, char **argv, gaainfo *gaaval) GAAargv = argv; GAAargc = argc; - opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1); + opt_list = (char *) gaa_malloc(GAA_NB_OPTION + 1); - for(i = 0; i < GAA_NB_OPTION + 1; i++) - opt_list[i] = 0; + for (i = 0; i < GAA_NB_OPTION + 1; i++) + opt_list[i] = 0; /* initialization */ - if(inited == 0) - { + if (inited == 0) { #line 114 "cli.gaa" -{ gaaval->resume=0; gaaval->port=443; gaaval->rest_args=NULL; gaaval->ciphers=NULL; - gaaval->kx=NULL; gaaval->comp=NULL; gaaval->macs=NULL; gaaval->ctype=NULL; gaaval->nciphers=0; - gaaval->nkx=0; gaaval->ncomp=0; gaaval->nmacs=0; gaaval->nctype = 0; gaaval->record_size=0; - gaaval->fingerprint=0; gaaval->pgp_trustdb=NULL; gaaval->pgp_keyring=NULL; gaaval->x509_crlfile = NULL; - gaaval->x509_cafile = NULL; gaaval->pgp_keyfile=NULL; gaaval->pgp_certfile=NULL; gaaval->disable_extensions = 0; - gaaval->x509_keyfile=NULL; gaaval->x509_certfile=NULL; gaaval->crlf = 0; gaaval->xml = 0; - gaaval->srp_username=NULL; gaaval->srp_passwd=NULL; gaaval->fmtder = 0; gaaval->starttls =0; - gaaval->debug = 0; gaaval->print_cert = 0; gaaval->verbose = 0; ;}; + { + gaaval->resume = 0; + gaaval->port = 443; + gaaval->rest_args = NULL; + gaaval->ciphers = NULL; + gaaval->kx = NULL; + gaaval->comp = NULL; + gaaval->macs = NULL; + gaaval->ctype = NULL; + gaaval->nciphers = 0; + gaaval->nkx = 0; + gaaval->ncomp = 0; + gaaval->nmacs = 0; + gaaval->nctype = 0; + gaaval->record_size = 0; + gaaval->fingerprint = 0; + gaaval->pgp_trustdb = NULL; + gaaval->pgp_keyring = NULL; + gaaval->x509_crlfile = NULL; + gaaval->x509_cafile = NULL; + gaaval->pgp_keyfile = NULL; + gaaval->pgp_certfile = NULL; + gaaval->disable_extensions = 0; + gaaval->x509_keyfile = NULL; + gaaval->x509_certfile = NULL; + gaaval->crlf = 0; + gaaval->xml = 0; + gaaval->srp_username = NULL; + gaaval->srp_passwd = NULL; + gaaval->fmtder = 0; + gaaval->starttls = 0; + gaaval->debug = 0; + gaaval->print_cert = 0; + gaaval->verbose = 0;; + }; } inited = 1; @@ -1105,186 +1202,173 @@ int gaa(int argc, char **argv, gaainfo *gaaval) gaa_arg_used = NULL; if (argc > 0) { - gaa_arg_used = gaa_malloc(argc * sizeof(char)); + gaa_arg_used = gaa_malloc(argc * sizeof(char)); } - for(i = 1; i < argc; i++) - gaa_arg_used[i] = 0; - for(i = 1; i < argc; i++) - { - if(gaa_arg_used[i] == 0) - { - j = 0; - tmp1 = gaa_is_an_argument(GAAargv[i]); - switch(tmp1) - { - case GAA_WORD_OPTION: - j++; - case GAA_LETTER_OPTION: - j++; - tmp2 = gaa_get_option_num(argv[i]+j, tmp1); - if(tmp2 == GAA_ERROR_NOMATCH) - { - printf("Invalid option '%s'\n", argv[i]+j); - return 0; - } - switch(gaa_try(tmp2, i+1, gaaval, opt_list)) - { - case GAA_ERROR_NOTENOUGH_ARGS: - printf("'%s': not enough arguments\n",gaa_current_option); - return 0; - case GAA_ERROR_INVALID_ARG: - printf("Invalid arguments\n"); - return 0; - case GAA_OK: - break; - default: - printf("Unknown error\n"); - } - gaa_arg_used[i] = 1; - break; - case GAA_MULTIPLE_OPTION: - for(j = 1; j < strlen(argv[i]); j++) - { - tmp2 = gaa_get_option_num(argv[i]+j, tmp1); - if(tmp2 == GAA_ERROR_NOMATCH) - { - printf("Invalid option '%c'\n", *(argv[i]+j)); - return 0; - } - switch(gaa_try(tmp2, i+1, gaaval, opt_list)) - { - case GAA_ERROR_NOTENOUGH_ARGS: - printf("'%s': not enough arguments\n",gaa_current_option); - return 0; - case GAA_ERROR_INVALID_ARG: - printf("Invalid arguments\n"); - return 0; - case GAA_OK: - break; - default: - printf("Unknown error\n"); - } - } - gaa_arg_used[i] = 1; - break; - default: break; - } - } + for (i = 1; i < argc; i++) + gaa_arg_used[i] = 0; + for (i = 1; i < argc; i++) { + if (gaa_arg_used[i] == 0) { + j = 0; + tmp1 = gaa_is_an_argument(GAAargv[i]); + switch (tmp1) { + case GAA_WORD_OPTION: + j++; + case GAA_LETTER_OPTION: + j++; + tmp2 = gaa_get_option_num(argv[i] + j, tmp1); + if (tmp2 == GAA_ERROR_NOMATCH) { + printf("Invalid option '%s'\n", argv[i] + j); + return 0; + } + switch (gaa_try(tmp2, i + 1, gaaval, opt_list)) { + case GAA_ERROR_NOTENOUGH_ARGS: + printf("'%s': not enough arguments\n", + gaa_current_option); + return 0; + case GAA_ERROR_INVALID_ARG: + printf("Invalid arguments\n"); + return 0; + case GAA_OK: + break; + default: + printf("Unknown error\n"); + } + gaa_arg_used[i] = 1; + break; + case GAA_MULTIPLE_OPTION: + for (j = 1; j < strlen(argv[i]); j++) { + tmp2 = gaa_get_option_num(argv[i] + j, tmp1); + if (tmp2 == GAA_ERROR_NOMATCH) { + printf("Invalid option '%c'\n", *(argv[i] + j)); + return 0; + } + switch (gaa_try(tmp2, i + 1, gaaval, opt_list)) { + case GAA_ERROR_NOTENOUGH_ARGS: + printf("'%s': not enough arguments\n", + gaa_current_option); + return 0; + case GAA_ERROR_INVALID_ARG: + printf("Invalid arguments\n"); + return 0; + case GAA_OK: + break; + default: + printf("Unknown error\n"); + } + } + gaa_arg_used[i] = 1; + break; + default: + break; + } + } } -if(gaa_processing_file == 0) -{ + if (gaa_processing_file == 0) { #line 507 "gaa.skel" #ifdef GAA_REST_EXISTS - switch(gaa_try(GAA_REST, 1, gaaval, opt_list)) - { - case GAA_ERROR_NOTENOUGH_ARGS: - printf("Rest: not enough arguments\n"); - return 0; - case GAA_ERROR_INVALID_ARG: - printf("Invalid arguments\n"); - return 0; - case GAA_OK: - break; - default: - printf("Unknown error\n"); - } + switch (gaa_try(GAA_REST, 1, gaaval, opt_list)) { + case GAA_ERROR_NOTENOUGH_ARGS: + printf("Rest: not enough arguments\n"); + return 0; + case GAA_ERROR_INVALID_ARG: + printf("Invalid arguments\n"); + return 0; + case GAA_OK: + break; + default: + printf("Unknown error\n"); + } #endif -} - for(i = 1; i < argc; i++) - { - if(gaa_arg_used[i] == 0) - { - printf("Too many arguments\n"); - return 0; - } + } + for (i = 1; i < argc; i++) { + if (gaa_arg_used[i] == 0) { + printf("Too many arguments\n"); + return 0; + } } free(gaa_arg_used); free(opt_list); return -1; } -struct gaastrnode -{ +struct gaastrnode { char *str; struct gaastrnode *next; }; typedef struct gaastrnode gaa_str_node; -static int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc) +static int gaa_internal_get_next_str(FILE * file, gaa_str_node * tmp_str, + int argc) { int pos_ini; int a; int i = 0, len = 0, newline = 0; - if(argc == 1) { - newline = 1; - len = 2; + if (argc == 1) { + newline = 1; + len = 2; } - - a = fgetc( file); - if (a == EOF) return 0; - - while(a == ' ' || a == 9 || a == '\n') - { - if(a == '\n') - { - newline=1; - len = 2; - } - a = fgetc( file); - if (a == EOF) return 0; + + a = fgetc(file); + if (a == EOF) + return 0; + + while (a == ' ' || a == 9 || a == '\n') { + if (a == '\n') { + newline = 1; + len = 2; + } + a = fgetc(file); + if (a == EOF) + return 0; } pos_ini = ftell(file) - 1; - while(a != ' ' && a != 9 && a != '\n') - { + while (a != ' ' && a != 9 && a != '\n') { - len++; - a = fgetc( file); - if(a==EOF) return 0; //a = ' '; + len++; + a = fgetc(file); + if (a == EOF) + return 0; //a = ' '; } len += 1; tmp_str->str = gaa_malloc((len) * sizeof(char)); - if(newline == 1) - { - tmp_str->str[0] = '-'; - tmp_str->str[1] = '-'; - i = 2; - } - else - { - i = 0; + if (newline == 1) { + tmp_str->str[0] = '-'; + tmp_str->str[1] = '-'; + i = 2; + } else { + i = 0; } - fseek(file,pos_ini, SEEK_SET); - do - { - a = fgetc( file); - - if (a == EOF) { - i+=2; - break; - } - tmp_str->str[i] = a; - i++; + fseek(file, pos_ini, SEEK_SET); + do { + a = fgetc(file); + + if (a == EOF) { + i += 2; + break; + } + tmp_str->str[i] = a; + i++; } - while(a != ' ' && a != 9 && a != '\n' && i < len); + while (a != ' ' && a != 9 && a != '\n' && i < len); tmp_str->str[i - 1] = 0; - fseek(file,- 1, SEEK_CUR); + fseek(file, -1, SEEK_CUR); /* printf("%d\n", ftell(file)); */ - + return -1; } -int gaa_file(const char *name, gaainfo *gaaval) +int gaa_file(const char *name, gaainfo * gaaval) { gaa_str_node *first_str, **tmp_str, *tmp_str2; int rval, i; @@ -1293,38 +1377,36 @@ int gaa_file(const char *name, gaainfo *gaaval) FILE *file; gaa_processing_file = 1; - - if((file = fopen(name, "r")) == NULL) - { - printf("Couldn't open '%s' configuration file for reading\n", name); - return 1; + + if ((file = fopen(name, "r")) == NULL) { + printf("Couldn't open '%s' configuration file for reading\n", + name); + return 1; } - + tmp_str = &first_str; - do - { - argc++; - *tmp_str = gaa_malloc(sizeof(gaa_str_node)); + do { + argc++; + *tmp_str = gaa_malloc(sizeof(gaa_str_node)); - (*tmp_str)->str = NULL; - (*tmp_str)->next = NULL; + (*tmp_str)->str = NULL; + (*tmp_str)->next = NULL; - rval = gaa_internal_get_next_str(file, *tmp_str, argc); - tmp_str = &((*tmp_str)->next); + rval = gaa_internal_get_next_str(file, *tmp_str, argc); + tmp_str = &((*tmp_str)->next); } - while(rval == -1); - - if(rval == 1) - return 0; - - argv = gaa_malloc((1 + argc) * sizeof(char*)); + while (rval == -1); + + if (rval == 1) + return 0; + + argv = gaa_malloc((1 + argc) * sizeof(char *)); tmp_str2 = first_str; argv[0] = "cfg"; - for(i = 1; i < argc; i++) - { - argv[i] = tmp_str2->str; - tmp_str2 = tmp_str2->next; + for (i = 1; i < argc; i++) { + argv[i] = tmp_str2->str; + tmp_str2 = tmp_str2->next; } rval = gaa(argc, argv, gaaval); |