diff options
Diffstat (limited to 'src/serv-gaa.c')
| -rw-r--r-- | src/serv-gaa.c | 125 |
1 files changed, 74 insertions, 51 deletions
diff --git a/src/serv-gaa.c b/src/serv-gaa.c index 5351f58fdb..c5b1e35f6a 100644 --- a/src/serv-gaa.c +++ b/src/serv-gaa.c @@ -151,6 +151,7 @@ void gaa_help(void) __gaa_helpsingle(0, "srppasswdconf", "FILE ", "SRP password conf file to use."); __gaa_helpsingle(0, "authz-x509-attr-cert", "FILE ", "Use X.509 Attribute Certificate in FILE as authorization data."); __gaa_helpsingle(0, "authz-saml-assertion", "FILE ", "Use SAML Assertion in FILE as authorization data."); + __gaa_helpsingle(0, "opaque_prf_input", "DATA ", "Use Opaque PRF Input DATA."); __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."); @@ -175,30 +176,32 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 109 "serv.gaa" +#line 112 "serv.gaa" char **ctype; -#line 108 "serv.gaa" +#line 111 "serv.gaa" int nctype; -#line 105 "serv.gaa" +#line 108 "serv.gaa" char **kx; -#line 104 "serv.gaa" +#line 107 "serv.gaa" int nkx; -#line 101 "serv.gaa" +#line 104 "serv.gaa" char **macs; -#line 100 "serv.gaa" +#line 103 "serv.gaa" int nmacs; -#line 97 "serv.gaa" +#line 100 "serv.gaa" char **comp; -#line 96 "serv.gaa" +#line 99 "serv.gaa" int ncomp; -#line 93 "serv.gaa" +#line 96 "serv.gaa" char **proto; -#line 92 "serv.gaa" +#line 95 "serv.gaa" int nproto; -#line 89 "serv.gaa" +#line 92 "serv.gaa" char **ciphers; -#line 88 "serv.gaa" +#line 91 "serv.gaa" int nciphers; +#line 88 "serv.gaa" + char *opaque_prf_input; #line 85 "serv.gaa" char *authz_saml_assertion; #line 82 "serv.gaa" @@ -303,7 +306,7 @@ static int gaa_error = 0; #define GAA_MULTIPLE_OPTION 3 #define GAA_REST 0 -#define GAA_NB_OPTION 36 +#define GAA_NB_OPTION 37 #define GAAOPTID_copyright 1 #define GAAOPTID_version 2 #define GAAOPTID_help 3 @@ -314,32 +317,33 @@ static int gaa_error = 0; #define GAAOPTID_comp 8 #define GAAOPTID_protocols 9 #define GAAOPTID_ciphers 10 -#define GAAOPTID_authz_saml_assertion 11 -#define GAAOPTID_authz_x509_attr_cert 12 -#define GAAOPTID_srppasswdconf 13 -#define GAAOPTID_srppasswd 14 -#define GAAOPTID_pskpasswd 15 -#define GAAOPTID_disable_client_cert 16 -#define GAAOPTID_require_cert 17 -#define GAAOPTID_x509dsacertfile 18 -#define GAAOPTID_x509dsakeyfile 19 -#define GAAOPTID_x509certfile 20 -#define GAAOPTID_x509keyfile 21 -#define GAAOPTID_pgpcertfile 22 -#define GAAOPTID_pgpkeyfile 23 -#define GAAOPTID_pgptrustdb 24 -#define GAAOPTID_pgpkeyring 25 -#define GAAOPTID_x509crlfile 26 -#define GAAOPTID_x509cafile 27 -#define GAAOPTID_x509fmtder 28 -#define GAAOPTID_dhparams 29 -#define GAAOPTID_echo 30 -#define GAAOPTID_http 31 -#define GAAOPTID_nodb 32 -#define GAAOPTID_quiet 33 -#define GAAOPTID_port 34 -#define GAAOPTID_generate 35 -#define GAAOPTID_debug 36 +#define GAAOPTID_opaque_prf_input 11 +#define GAAOPTID_authz_saml_assertion 12 +#define GAAOPTID_authz_x509_attr_cert 13 +#define GAAOPTID_srppasswdconf 14 +#define GAAOPTID_srppasswd 15 +#define GAAOPTID_pskpasswd 16 +#define GAAOPTID_disable_client_cert 17 +#define GAAOPTID_require_cert 18 +#define GAAOPTID_x509dsacertfile 19 +#define GAAOPTID_x509dsakeyfile 20 +#define GAAOPTID_x509certfile 21 +#define GAAOPTID_x509keyfile 22 +#define GAAOPTID_pgpcertfile 23 +#define GAAOPTID_pgpkeyfile 24 +#define GAAOPTID_pgptrustdb 25 +#define GAAOPTID_pgpkeyring 26 +#define GAAOPTID_x509crlfile 27 +#define GAAOPTID_x509cafile 28 +#define GAAOPTID_x509fmtder 29 +#define GAAOPTID_dhparams 30 +#define GAAOPTID_echo 31 +#define GAAOPTID_http 32 +#define GAAOPTID_nodb 33 +#define GAAOPTID_quiet 34 +#define GAAOPTID_port 35 +#define GAAOPTID_generate 36 +#define GAAOPTID_debug 37 #line 168 "gaa.skel" @@ -562,6 +566,12 @@ struct GAAOPTION_ciphers int size1; }; +struct GAAOPTION_opaque_prf_input +{ + char* arg1; + int size1; +}; + struct GAAOPTION_authz_saml_assertion { char* arg1; @@ -705,6 +715,7 @@ static int gaa_get_option_num(char *str, int status) GAA_CHECK1STR("", GAAOPTID_comp); GAA_CHECK1STR("", GAAOPTID_protocols); GAA_CHECK1STR("", GAAOPTID_ciphers); + GAA_CHECK1STR("", GAAOPTID_opaque_prf_input); GAA_CHECK1STR("", GAAOPTID_authz_saml_assertion); GAA_CHECK1STR("", GAAOPTID_authz_x509_attr_cert); GAA_CHECK1STR("", GAAOPTID_srppasswdconf); @@ -751,6 +762,7 @@ static int gaa_get_option_num(char *str, int status) GAA_CHECKSTR("comp", GAAOPTID_comp); GAA_CHECKSTR("protocols", GAAOPTID_protocols); GAA_CHECKSTR("ciphers", GAAOPTID_ciphers); + GAA_CHECKSTR("opaque_prf_input", GAAOPTID_opaque_prf_input); GAA_CHECKSTR("authz-saml-assertion", GAAOPTID_authz_saml_assertion); GAA_CHECKSTR("authz-x509-attr-cert", GAAOPTID_authz_x509_attr_cert); GAA_CHECKSTR("srppasswdconf", GAAOPTID_srppasswdconf); @@ -795,6 +807,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) struct GAAOPTION_comp GAATMP_comp; struct GAAOPTION_protocols GAATMP_protocols; struct GAAOPTION_ciphers GAATMP_ciphers; + struct GAAOPTION_opaque_prf_input GAATMP_opaque_prf_input; struct GAAOPTION_authz_saml_assertion GAATMP_authz_saml_assertion; struct GAAOPTION_authz_x509_attr_cert GAATMP_authz_x509_attr_cert; struct GAAOPTION_srppasswdconf GAATMP_srppasswdconf; @@ -835,28 +848,28 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) { case GAAOPTID_copyright: OK = 0; -#line 116 "serv.gaa" +#line 119 "serv.gaa" { print_serv_license(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_version: OK = 0; -#line 115 "serv.gaa" +#line 118 "serv.gaa" { serv_version(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_help: OK = 0; -#line 113 "serv.gaa" +#line 116 "serv.gaa" { gaa_help(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_list: OK = 0; -#line 112 "serv.gaa" +#line 115 "serv.gaa" { print_list(0); exit(0); ;}; return GAA_OK; @@ -864,7 +877,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) case GAAOPTID_ctypes: OK = 0; GAA_LIST_FILL(GAATMP_ctypes.arg1, gaa_getstr, char*, GAATMP_ctypes.size1); -#line 110 "serv.gaa" +#line 113 "serv.gaa" { gaaval->ctype = GAATMP_ctypes.arg1; gaaval->nctype = GAATMP_ctypes.size1 ;}; return GAA_OK; @@ -872,7 +885,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) case GAAOPTID_kx: OK = 0; GAA_LIST_FILL(GAATMP_kx.arg1, gaa_getstr, char*, GAATMP_kx.size1); -#line 106 "serv.gaa" +#line 109 "serv.gaa" { gaaval->kx = GAATMP_kx.arg1; gaaval->nkx = GAATMP_kx.size1 ;}; return GAA_OK; @@ -880,7 +893,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) case GAAOPTID_macs: OK = 0; GAA_LIST_FILL(GAATMP_macs.arg1, gaa_getstr, char*, GAATMP_macs.size1); -#line 102 "serv.gaa" +#line 105 "serv.gaa" { gaaval->macs = GAATMP_macs.arg1; gaaval->nmacs = GAATMP_macs.size1 ;}; return GAA_OK; @@ -888,7 +901,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) case GAAOPTID_comp: OK = 0; GAA_LIST_FILL(GAATMP_comp.arg1, gaa_getstr, char*, GAATMP_comp.size1); -#line 98 "serv.gaa" +#line 101 "serv.gaa" { gaaval->comp = GAATMP_comp.arg1; gaaval->ncomp = GAATMP_comp.size1 ;}; return GAA_OK; @@ -896,7 +909,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) case GAAOPTID_protocols: OK = 0; GAA_LIST_FILL(GAATMP_protocols.arg1, gaa_getstr, char*, GAATMP_protocols.size1); -#line 94 "serv.gaa" +#line 97 "serv.gaa" { gaaval->proto = GAATMP_protocols.arg1; gaaval->nproto = GAATMP_protocols.size1 ;}; return GAA_OK; @@ -904,11 +917,21 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) case GAAOPTID_ciphers: OK = 0; GAA_LIST_FILL(GAATMP_ciphers.arg1, gaa_getstr, char*, GAATMP_ciphers.size1); -#line 90 "serv.gaa" +#line 93 "serv.gaa" { gaaval->ciphers = GAATMP_ciphers.arg1; gaaval->nciphers = GAATMP_ciphers.size1 ;}; return GAA_OK; break; + case GAAOPTID_opaque_prf_input: + OK = 0; + GAA_TESTMOREARGS; + GAA_FILL(GAATMP_opaque_prf_input.arg1, gaa_getstr, GAATMP_opaque_prf_input.size1); + gaa_index++; +#line 89 "serv.gaa" +{ gaaval->opaque_prf_input = GAATMP_opaque_prf_input.arg1 ;}; + + return GAA_OK; + break; case GAAOPTID_authz_saml_assertion: OK = 0; GAA_TESTMOREARGS; @@ -1169,7 +1192,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval) if(inited == 0) { -#line 120 "serv.gaa" +#line 123 "serv.gaa" { gaaval->generate=0; gaaval->port=5556; gaaval->http=0; 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->nodb = 0; @@ -1327,7 +1350,7 @@ static int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc len++; a = fgetc( file); - if(a==EOF) return 0; //a = ' '; + if(a==EOF) return 0; /* a = ' '; */ } len += 1; |