diff options
-rw-r--r-- | src/cli-gaa.c | 129 | ||||
-rw-r--r-- | src/cli-gaa.h | 28 | ||||
-rw-r--r-- | src/cli.c | 13 | ||||
-rw-r--r-- | src/cli.gaa | 5 | ||||
-rw-r--r-- | src/serv-gaa.c | 155 | ||||
-rw-r--r-- | src/serv-gaa.h | 54 | ||||
-rw-r--r-- | src/serv.c | 12 | ||||
-rw-r--r-- | src/serv.gaa | 5 |
8 files changed, 161 insertions, 240 deletions
diff --git a/src/cli-gaa.c b/src/cli-gaa.c index 990168818f..86ce639ab6 100644 --- a/src/cli-gaa.c +++ b/src/cli-gaa.c @@ -147,7 +147,6 @@ void gaa_help(void) __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."); @@ -178,34 +177,32 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 125 "cli.gaa" +#line 122 "cli.gaa" char *rest_args; -#line 116 "cli.gaa" - int insecure; #line 113 "cli.gaa" - char *port; + int insecure; #line 110 "cli.gaa" - char *opaque_prf_input; + char *port; #line 107 "cli.gaa" - char *authz_saml_assertion; + char *opaque_prf_input; #line 104 "cli.gaa" - char *authz_x509_attr_cert; + char *authz_saml_assertion; #line 101 "cli.gaa" - char *psk_key; + char *authz_x509_attr_cert; #line 98 "cli.gaa" - char *psk_username; + char *psk_key; #line 95 "cli.gaa" - char *srp_passwd; + char *psk_username; #line 92 "cli.gaa" - char *srp_username; + char *srp_passwd; #line 89 "cli.gaa" - char *x509_certfile; + char *srp_username; #line 86 "cli.gaa" - char *x509_keyfile; + char *x509_certfile; #line 83 "cli.gaa" - char *pgp_certfile; + char *x509_keyfile; #line 80 "cli.gaa" - char *pgp_trustdb; + char *pgp_certfile; #line 77 "cli.gaa" char *pgp_keyring; #line 74 "cli.gaa" @@ -312,7 +309,7 @@ static int gaa_error = 0; #define GAA_MULTIPLE_OPTION 3 #define GAA_REST 0 -#define GAA_NB_OPTION 37 +#define GAA_NB_OPTION 36 #define GAAOPTID_copyright 1 #define GAAOPTID_version 2 #define GAAOPTID_help 3 @@ -329,27 +326,26 @@ static int gaa_error = 0; #define GAAOPTID_x509certfile 14 #define GAAOPTID_x509keyfile 15 #define GAAOPTID_pgpcertfile 16 -#define GAAOPTID_pgptrustdb 17 -#define GAAOPTID_pgpkeyring 18 -#define GAAOPTID_pgpkeyfile 19 -#define GAAOPTID_x509crlfile 20 -#define GAAOPTID_x509cafile 21 -#define GAAOPTID_ctypes 22 -#define GAAOPTID_kx 23 -#define GAAOPTID_macs 24 -#define GAAOPTID_comp 25 -#define GAAOPTID_protocols 26 -#define GAAOPTID_ciphers 27 -#define GAAOPTID_verbose 28 -#define GAAOPTID_recordsize 29 -#define GAAOPTID_print_cert 30 -#define GAAOPTID_disable_extensions 31 -#define GAAOPTID_fingerprint 32 -#define GAAOPTID_x509fmtder 33 -#define GAAOPTID_crlf 34 -#define GAAOPTID_starttls 35 -#define GAAOPTID_resume 36 -#define GAAOPTID_debug 37 +#define GAAOPTID_pgpkeyring 17 +#define GAAOPTID_pgpkeyfile 18 +#define GAAOPTID_x509crlfile 19 +#define GAAOPTID_x509cafile 20 +#define GAAOPTID_ctypes 21 +#define GAAOPTID_kx 22 +#define GAAOPTID_macs 23 +#define GAAOPTID_comp 24 +#define GAAOPTID_protocols 25 +#define GAAOPTID_ciphers 26 +#define GAAOPTID_verbose 27 +#define GAAOPTID_recordsize 28 +#define GAAOPTID_print_cert 29 +#define GAAOPTID_disable_extensions 30 +#define GAAOPTID_fingerprint 31 +#define GAAOPTID_x509fmtder 32 +#define GAAOPTID_crlf 33 +#define GAAOPTID_starttls 34 +#define GAAOPTID_resume 35 +#define GAAOPTID_debug 36 #line 168 "gaa.skel" @@ -602,12 +598,6 @@ struct GAAOPTION_pgpcertfile int size1; }; -struct GAAOPTION_pgptrustdb -{ - char* arg1; - int size1; -}; - struct GAAOPTION_pgpkeyring { char* arg1; @@ -727,7 +717,6 @@ static int gaa_get_option_num(char *str, int status) 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); @@ -775,7 +764,6 @@ static int gaa_get_option_num(char *str, int status) 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); @@ -819,7 +807,6 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) 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; @@ -854,35 +841,35 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) { case GAAOPTID_copyright: OK = 0; -#line 123 "cli.gaa" +#line 120 "cli.gaa" { print_license(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_version: OK = 0; -#line 122 "cli.gaa" +#line 119 "cli.gaa" { cli_version(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_help: OK = 0; -#line 120 "cli.gaa" +#line 117 "cli.gaa" { gaa_help(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_list: OK = 0; -#line 119 "cli.gaa" +#line 116 "cli.gaa" { print_list(gaaval->verbose); exit(0); ;}; return GAA_OK; break; case GAAOPTID_insecure: OK = 0; -#line 117 "cli.gaa" +#line 114 "cli.gaa" { gaaval->insecure = 1 ;}; return GAA_OK; @@ -892,7 +879,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_port.arg1, gaa_getstr, GAATMP_port.size1); gaa_index++; -#line 114 "cli.gaa" +#line 111 "cli.gaa" { gaaval->port = GAATMP_port.arg1 ;}; return GAA_OK; @@ -902,7 +889,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_opaque_prf_input.arg1, gaa_getstr, GAATMP_opaque_prf_input.size1); gaa_index++; -#line 111 "cli.gaa" +#line 108 "cli.gaa" { gaaval->opaque_prf_input = GAATMP_opaque_prf_input.arg1 ;}; return GAA_OK; @@ -912,7 +899,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_authz_saml_assertion.arg1, gaa_getstr, GAATMP_authz_saml_assertion.size1); gaa_index++; -#line 108 "cli.gaa" +#line 105 "cli.gaa" { gaaval->authz_saml_assertion = GAATMP_authz_saml_assertion.arg1 ;}; return GAA_OK; @@ -922,7 +909,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_authz_x509_attr_cert.arg1, gaa_getstr, GAATMP_authz_x509_attr_cert.size1); gaa_index++; -#line 105 "cli.gaa" +#line 102 "cli.gaa" { gaaval->authz_x509_attr_cert = GAATMP_authz_x509_attr_cert.arg1 ;}; return GAA_OK; @@ -932,7 +919,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_pskkey.arg1, gaa_getstr, GAATMP_pskkey.size1); gaa_index++; -#line 102 "cli.gaa" +#line 99 "cli.gaa" { gaaval->psk_key = GAATMP_pskkey.arg1 ;}; return GAA_OK; @@ -942,7 +929,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_pskusername.arg1, gaa_getstr, GAATMP_pskusername.size1); gaa_index++; -#line 99 "cli.gaa" +#line 96 "cli.gaa" { gaaval->psk_username = GAATMP_pskusername.arg1 ;}; return GAA_OK; @@ -952,7 +939,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_srppasswd.arg1, gaa_getstr, GAATMP_srppasswd.size1); gaa_index++; -#line 96 "cli.gaa" +#line 93 "cli.gaa" { gaaval->srp_passwd = GAATMP_srppasswd.arg1 ;}; return GAA_OK; @@ -962,7 +949,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_srpusername.arg1, gaa_getstr, GAATMP_srpusername.size1); gaa_index++; -#line 93 "cli.gaa" +#line 90 "cli.gaa" { gaaval->srp_username = GAATMP_srpusername.arg1 ;}; return GAA_OK; @@ -972,7 +959,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_x509certfile.arg1, gaa_getstr, GAATMP_x509certfile.size1); gaa_index++; -#line 90 "cli.gaa" +#line 87 "cli.gaa" { gaaval->x509_certfile = GAATMP_x509certfile.arg1 ;}; return GAA_OK; @@ -982,7 +969,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_x509keyfile.arg1, gaa_getstr, GAATMP_x509keyfile.size1); gaa_index++; -#line 87 "cli.gaa" +#line 84 "cli.gaa" { gaaval->x509_keyfile = GAATMP_x509keyfile.arg1 ;}; return GAA_OK; @@ -992,18 +979,8 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_pgpcertfile.arg1, gaa_getstr, GAATMP_pgpcertfile.size1); gaa_index++; -#line 84 "cli.gaa" -{ gaaval->pgp_certfile = GAATMP_pgpcertfile.arg1 ;}; - - return GAA_OK; - break; - case GAAOPTID_pgptrustdb: - OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_pgptrustdb.arg1, gaa_getstr, GAATMP_pgptrustdb.size1); - gaa_index++; #line 81 "cli.gaa" -{ gaaval->pgp_trustdb = GAATMP_pgptrustdb.arg1 ;}; +{ gaaval->pgp_certfile = GAATMP_pgpcertfile.arg1 ;}; return GAA_OK; break; @@ -1175,7 +1152,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAAREST_tmp.arg1, gaa_getstr, GAAREST_tmp.size1); gaa_index++; -#line 126 "cli.gaa" +#line 123 "cli.gaa" { gaaval->rest_args = GAAREST_tmp.arg1; ;}; return GAA_OK; @@ -1204,11 +1181,11 @@ int gaa(int argc, char **argv, gaainfo *gaaval) if(inited == 0) { -#line 128 "cli.gaa" +#line 125 "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->fingerprint=0; 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->srp_username=NULL; gaaval->srp_passwd=NULL; gaaval->fmtder = 0; gaaval->starttls =0; diff --git a/src/cli-gaa.h b/src/cli-gaa.h index 87fb4facff..2fcdcf0946 100644 --- a/src/cli-gaa.h +++ b/src/cli-gaa.h @@ -8,34 +8,32 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 125 "cli.gaa" +#line 122 "cli.gaa" char *rest_args; -#line 116 "cli.gaa" - int insecure; #line 113 "cli.gaa" - char *port; + int insecure; #line 110 "cli.gaa" - char *opaque_prf_input; + char *port; #line 107 "cli.gaa" - char *authz_saml_assertion; + char *opaque_prf_input; #line 104 "cli.gaa" - char *authz_x509_attr_cert; + char *authz_saml_assertion; #line 101 "cli.gaa" - char *psk_key; + char *authz_x509_attr_cert; #line 98 "cli.gaa" - char *psk_username; + char *psk_key; #line 95 "cli.gaa" - char *srp_passwd; + char *psk_username; #line 92 "cli.gaa" - char *srp_username; + char *srp_passwd; #line 89 "cli.gaa" - char *x509_certfile; + char *srp_username; #line 86 "cli.gaa" - char *x509_keyfile; + char *x509_certfile; #line 83 "cli.gaa" - char *pgp_certfile; + char *x509_keyfile; #line 80 "cli.gaa" - char *pgp_trustdb; + char *pgp_certfile; #line 77 "cli.gaa" char *pgp_keyring; #line 74 "cli.gaa" @@ -73,7 +73,6 @@ char *srp_username; char *pgp_keyfile; char *pgp_certfile; char *pgp_keyring; -char *pgp_trustdb; char *x509_keyfile; char *x509_certfile; char *x509_cafile; @@ -905,7 +904,6 @@ gaa_parser (int argc, char **argv) psk_key.size = 0; pgp_keyring = info.pgp_keyring; - pgp_trustdb = info.pgp_trustdb; crlf = info.crlf; @@ -982,7 +980,7 @@ do_handshake (socket_st * socket) /* print some information */ print_info (socket->session, socket->hostname); - if ((x509_cafile || pgp_trustdb) && !insecure) + if ((x509_cafile || pgp_keyring) && !insecure) { int rc; unsigned int status; @@ -1075,15 +1073,6 @@ init_global_tls_stuff (void) fprintf (stderr, "Error setting the OpenPGP keyring file\n"); } } - - if (pgp_trustdb != NULL) - { - ret = gnutls_certificate_set_openpgp_trustdb (xcred, pgp_trustdb); - if (ret < 0) - { - fprintf (stderr, "Error setting the OpenPGP trustdb file\n"); - } - } #endif #ifdef ENABLE_SRP diff --git a/src/cli.gaa b/src/cli.gaa index e22863e60c..bbdd097e20 100644 --- a/src/cli.gaa +++ b/src/cli.gaa @@ -77,9 +77,6 @@ option (pgpkeyfile) STR "FILE" { $pgp_keyfile = $1 } "PGP Key file to use." #char *pgp_keyring; option (pgpkeyring) STR "FILE" { $pgp_keyring = $1 } "PGP Key ring file to use." -#char *pgp_trustdb; -option (pgptrustdb) STR "FILE" { $pgp_trustdb = $1 } "PGP trustdb file to use." - #char *pgp_certfile; option (pgpcertfile) STR "FILE" { $pgp_certfile = $1 } "PGP Public Key (certificate) file to use." @@ -128,7 +125,7 @@ rest STR "hostname" { $rest_args = $1; } init { $resume=0; $port="443"; $rest_args=NULL; $ciphers=NULL; $kx=NULL; $comp=NULL; $macs=NULL; $ctype=NULL; $nciphers=0; $nkx=0; $ncomp=0; $nmacs=0; $nctype = 0; $record_size=0; - $fingerprint=0; $pgp_trustdb=NULL; $pgp_keyring=NULL; $x509_crlfile = NULL; + $fingerprint=0; $pgp_keyring=NULL; $x509_crlfile = NULL; $x509_cafile = NULL; $pgp_keyfile=NULL; $pgp_certfile=NULL; $disable_extensions = 0; $x509_keyfile=NULL; $x509_certfile=NULL; $crlf = 0; $srp_username=NULL; $srp_passwd=NULL; $fmtder = 0; $starttls =0; diff --git a/src/serv-gaa.c b/src/serv-gaa.c index cd1b11bf54..ff671a05ec 100644 --- a/src/serv-gaa.c +++ b/src/serv-gaa.c @@ -137,7 +137,6 @@ void gaa_help(void) __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file to use."); __gaa_helpsingle(0, "x509crlfile", "FILE ", "CRL 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, "pgpkeyfile", "FILE ", "PGP Key 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."); @@ -176,60 +175,58 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 112 "serv.gaa" +#line 109 "serv.gaa" char **ctype; -#line 111 "serv.gaa" - int nctype; #line 108 "serv.gaa" + int nctype; +#line 105 "serv.gaa" char **kx; -#line 107 "serv.gaa" - int nkx; #line 104 "serv.gaa" + int nkx; +#line 101 "serv.gaa" char **macs; -#line 103 "serv.gaa" - int nmacs; #line 100 "serv.gaa" + int nmacs; +#line 97 "serv.gaa" char **comp; -#line 99 "serv.gaa" - int ncomp; #line 96 "serv.gaa" + int ncomp; +#line 93 "serv.gaa" char **proto; -#line 95 "serv.gaa" - int nproto; #line 92 "serv.gaa" + int nproto; +#line 89 "serv.gaa" char **ciphers; -#line 91 "serv.gaa" - int nciphers; #line 88 "serv.gaa" - char *opaque_prf_input; + int nciphers; #line 85 "serv.gaa" - char *authz_saml_assertion; + char *opaque_prf_input; #line 82 "serv.gaa" - char *authz_x509_attr_cert; + char *authz_saml_assertion; #line 79 "serv.gaa" - char *srp_passwd_conf; + char *authz_x509_attr_cert; #line 76 "serv.gaa" - char *srp_passwd; + char *srp_passwd_conf; #line 73 "serv.gaa" - char *psk_passwd; + char *srp_passwd; #line 70 "serv.gaa" - int disable_client_cert; + char *psk_passwd; #line 67 "serv.gaa" - int require_cert; + int disable_client_cert; #line 64 "serv.gaa" - char *x509_dsacertfile; + int require_cert; #line 61 "serv.gaa" - char *x509_dsakeyfile; + char *x509_dsacertfile; #line 58 "serv.gaa" - char *x509_certfile; + char *x509_dsakeyfile; #line 55 "serv.gaa" - char *x509_keyfile; + char *x509_certfile; #line 52 "serv.gaa" - char *pgp_certfile; + char *x509_keyfile; #line 49 "serv.gaa" - char *pgp_keyfile; + char *pgp_certfile; #line 46 "serv.gaa" - char *pgp_trustdb; + char *pgp_keyfile; #line 43 "serv.gaa" char *pgp_keyring; #line 40 "serv.gaa" @@ -306,7 +303,7 @@ static int gaa_error = 0; #define GAA_MULTIPLE_OPTION 3 #define GAA_REST 0 -#define GAA_NB_OPTION 37 +#define GAA_NB_OPTION 36 #define GAAOPTID_copyright 1 #define GAAOPTID_version 2 #define GAAOPTID_help 3 @@ -331,19 +328,18 @@ static int gaa_error = 0; #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 +#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 #line 168 "gaa.skel" @@ -638,12 +634,6 @@ struct GAAOPTION_pgpkeyfile int size1; }; -struct GAAOPTION_pgptrustdb -{ - char* arg1; - int size1; -}; - struct GAAOPTION_pgpkeyring { char* arg1; @@ -727,7 +717,6 @@ static int gaa_get_option_num(char *str, int status) GAA_CHECK1STR("", GAAOPTID_x509keyfile); GAA_CHECK1STR("", GAAOPTID_pgpcertfile); GAA_CHECK1STR("", GAAOPTID_pgpkeyfile); - GAA_CHECK1STR("", GAAOPTID_pgptrustdb); GAA_CHECK1STR("", GAAOPTID_pgpkeyring); GAA_CHECK1STR("", GAAOPTID_x509crlfile); GAA_CHECK1STR("", GAAOPTID_x509cafile); @@ -776,7 +765,6 @@ static int gaa_get_option_num(char *str, int status) GAA_CHECKSTR("x509keyfile", GAAOPTID_x509keyfile); GAA_CHECKSTR("pgpcertfile", GAAOPTID_pgpcertfile); GAA_CHECKSTR("pgpkeyfile", GAAOPTID_pgpkeyfile); - GAA_CHECKSTR("pgptrustdb", GAAOPTID_pgptrustdb); GAA_CHECKSTR("pgpkeyring", GAAOPTID_pgpkeyring); GAA_CHECKSTR("x509crlfile", GAAOPTID_x509crlfile); GAA_CHECKSTR("x509cafile", GAAOPTID_x509cafile); @@ -819,7 +807,6 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) struct GAAOPTION_x509keyfile GAATMP_x509keyfile; struct GAAOPTION_pgpcertfile GAATMP_pgpcertfile; struct GAAOPTION_pgpkeyfile GAATMP_pgpkeyfile; - struct GAAOPTION_pgptrustdb GAATMP_pgptrustdb; struct GAAOPTION_pgpkeyring GAATMP_pgpkeyring; struct GAAOPTION_x509crlfile GAATMP_x509crlfile; struct GAAOPTION_x509cafile GAATMP_x509cafile; @@ -848,28 +835,28 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) { case GAAOPTID_copyright: OK = 0; -#line 119 "serv.gaa" +#line 116 "serv.gaa" { print_serv_license(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_version: OK = 0; -#line 118 "serv.gaa" +#line 115 "serv.gaa" { serv_version(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_help: OK = 0; -#line 116 "serv.gaa" +#line 113 "serv.gaa" { gaa_help(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_list: OK = 0; -#line 115 "serv.gaa" +#line 112 "serv.gaa" { print_list(0); exit(0); ;}; return GAA_OK; @@ -877,7 +864,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 113 "serv.gaa" +#line 110 "serv.gaa" { gaaval->ctype = GAATMP_ctypes.arg1; gaaval->nctype = GAATMP_ctypes.size1 ;}; return GAA_OK; @@ -885,7 +872,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 109 "serv.gaa" +#line 106 "serv.gaa" { gaaval->kx = GAATMP_kx.arg1; gaaval->nkx = GAATMP_kx.size1 ;}; return GAA_OK; @@ -893,7 +880,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 105 "serv.gaa" +#line 102 "serv.gaa" { gaaval->macs = GAATMP_macs.arg1; gaaval->nmacs = GAATMP_macs.size1 ;}; return GAA_OK; @@ -901,7 +888,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 101 "serv.gaa" +#line 98 "serv.gaa" { gaaval->comp = GAATMP_comp.arg1; gaaval->ncomp = GAATMP_comp.size1 ;}; return GAA_OK; @@ -909,7 +896,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 97 "serv.gaa" +#line 94 "serv.gaa" { gaaval->proto = GAATMP_protocols.arg1; gaaval->nproto = GAATMP_protocols.size1 ;}; return GAA_OK; @@ -917,7 +904,7 @@ 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 93 "serv.gaa" +#line 90 "serv.gaa" { gaaval->ciphers = GAATMP_ciphers.arg1; gaaval->nciphers = GAATMP_ciphers.size1 ;}; return GAA_OK; @@ -927,7 +914,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_opaque_prf_input.arg1, gaa_getstr, GAATMP_opaque_prf_input.size1); gaa_index++; -#line 89 "serv.gaa" +#line 86 "serv.gaa" { gaaval->opaque_prf_input = GAATMP_opaque_prf_input.arg1 ;}; return GAA_OK; @@ -937,7 +924,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_authz_saml_assertion.arg1, gaa_getstr, GAATMP_authz_saml_assertion.size1); gaa_index++; -#line 86 "serv.gaa" +#line 83 "serv.gaa" { gaaval->authz_saml_assertion = GAATMP_authz_saml_assertion.arg1 ;}; return GAA_OK; @@ -947,7 +934,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_authz_x509_attr_cert.arg1, gaa_getstr, GAATMP_authz_x509_attr_cert.size1); gaa_index++; -#line 83 "serv.gaa" +#line 80 "serv.gaa" { gaaval->authz_x509_attr_cert = GAATMP_authz_x509_attr_cert.arg1 ;}; return GAA_OK; @@ -957,7 +944,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_srppasswdconf.arg1, gaa_getstr, GAATMP_srppasswdconf.size1); gaa_index++; -#line 80 "serv.gaa" +#line 77 "serv.gaa" { gaaval->srp_passwd_conf = GAATMP_srppasswdconf.arg1 ;}; return GAA_OK; @@ -967,7 +954,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_srppasswd.arg1, gaa_getstr, GAATMP_srppasswd.size1); gaa_index++; -#line 77 "serv.gaa" +#line 74 "serv.gaa" { gaaval->srp_passwd = GAATMP_srppasswd.arg1 ;}; return GAA_OK; @@ -977,21 +964,21 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_pskpasswd.arg1, gaa_getstr, GAATMP_pskpasswd.size1); gaa_index++; -#line 74 "serv.gaa" +#line 71 "serv.gaa" { gaaval->psk_passwd = GAATMP_pskpasswd.arg1 ;}; return GAA_OK; break; case GAAOPTID_disable_client_cert: OK = 0; -#line 71 "serv.gaa" +#line 68 "serv.gaa" { gaaval->disable_client_cert = 1 ;}; return GAA_OK; break; case GAAOPTID_require_cert: OK = 0; -#line 68 "serv.gaa" +#line 65 "serv.gaa" { gaaval->require_cert = 1 ;}; return GAA_OK; @@ -1001,7 +988,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_x509dsacertfile.arg1, gaa_getstr, GAATMP_x509dsacertfile.size1); gaa_index++; -#line 65 "serv.gaa" +#line 62 "serv.gaa" { gaaval->x509_dsacertfile = GAATMP_x509dsacertfile.arg1 ;}; return GAA_OK; @@ -1011,7 +998,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_x509dsakeyfile.arg1, gaa_getstr, GAATMP_x509dsakeyfile.size1); gaa_index++; -#line 62 "serv.gaa" +#line 59 "serv.gaa" { gaaval->x509_dsakeyfile = GAATMP_x509dsakeyfile.arg1 ;}; return GAA_OK; @@ -1021,7 +1008,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_x509certfile.arg1, gaa_getstr, GAATMP_x509certfile.size1); gaa_index++; -#line 59 "serv.gaa" +#line 56 "serv.gaa" { gaaval->x509_certfile = GAATMP_x509certfile.arg1 ;}; return GAA_OK; @@ -1031,7 +1018,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_x509keyfile.arg1, gaa_getstr, GAATMP_x509keyfile.size1); gaa_index++; -#line 56 "serv.gaa" +#line 53 "serv.gaa" { gaaval->x509_keyfile = GAATMP_x509keyfile.arg1 ;}; return GAA_OK; @@ -1041,7 +1028,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_pgpcertfile.arg1, gaa_getstr, GAATMP_pgpcertfile.size1); gaa_index++; -#line 53 "serv.gaa" +#line 50 "serv.gaa" { gaaval->pgp_certfile = GAATMP_pgpcertfile.arg1 ;}; return GAA_OK; @@ -1051,18 +1038,8 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_pgpkeyfile.arg1, gaa_getstr, GAATMP_pgpkeyfile.size1); gaa_index++; -#line 50 "serv.gaa" -{ gaaval->pgp_keyfile = GAATMP_pgpkeyfile.arg1 ;}; - - return GAA_OK; - break; - case GAAOPTID_pgptrustdb: - OK = 0; - GAA_TESTMOREARGS; - GAA_FILL(GAATMP_pgptrustdb.arg1, gaa_getstr, GAATMP_pgptrustdb.size1); - gaa_index++; #line 47 "serv.gaa" -{ gaaval->pgp_trustdb = GAATMP_pgptrustdb.arg1 ;}; +{ gaaval->pgp_keyfile = GAATMP_pgpkeyfile.arg1 ;}; return GAA_OK; break; @@ -1192,7 +1169,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval) if(inited == 0) { -#line 123 "serv.gaa" +#line 120 "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; @@ -1200,7 +1177,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval) gaaval->x509_keyfile=NULL; gaaval->x509_certfile=NULL; gaaval->x509_crlfile = NULL; gaaval->x509_dsakeyfile=NULL; gaaval->x509_dsacertfile=NULL; gaaval->srp_passwd=NULL; gaaval->srp_passwd_conf=NULL; gaaval->quiet = 0; - gaaval->pgp_trustdb=NULL; gaaval->pgp_keyring=NULL; gaaval->fmtder = 0; + gaaval->pgp_keyring=NULL; gaaval->fmtder = 0; gaaval->disable_client_cert = 0; gaaval->dh_params_file=NULL; gaaval->debug=0; gaaval->require_cert = 0; gaaval->psk_passwd = 0; gaaval->authz_x509_attr_cert = NULL; gaaval->authz_saml_assertion = NULL; @@ -1353,7 +1330,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; diff --git a/src/serv-gaa.h b/src/serv-gaa.h index d4952e2e26..4a5804ebf7 100644 --- a/src/serv-gaa.h +++ b/src/serv-gaa.h @@ -8,60 +8,58 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 112 "serv.gaa" +#line 109 "serv.gaa" char **ctype; -#line 111 "serv.gaa" - int nctype; #line 108 "serv.gaa" + int nctype; +#line 105 "serv.gaa" char **kx; -#line 107 "serv.gaa" - int nkx; #line 104 "serv.gaa" + int nkx; +#line 101 "serv.gaa" char **macs; -#line 103 "serv.gaa" - int nmacs; #line 100 "serv.gaa" + int nmacs; +#line 97 "serv.gaa" char **comp; -#line 99 "serv.gaa" - int ncomp; #line 96 "serv.gaa" + int ncomp; +#line 93 "serv.gaa" char **proto; -#line 95 "serv.gaa" - int nproto; #line 92 "serv.gaa" + int nproto; +#line 89 "serv.gaa" char **ciphers; -#line 91 "serv.gaa" - int nciphers; #line 88 "serv.gaa" - char *opaque_prf_input; + int nciphers; #line 85 "serv.gaa" - char *authz_saml_assertion; + char *opaque_prf_input; #line 82 "serv.gaa" - char *authz_x509_attr_cert; + char *authz_saml_assertion; #line 79 "serv.gaa" - char *srp_passwd_conf; + char *authz_x509_attr_cert; #line 76 "serv.gaa" - char *srp_passwd; + char *srp_passwd_conf; #line 73 "serv.gaa" - char *psk_passwd; + char *srp_passwd; #line 70 "serv.gaa" - int disable_client_cert; + char *psk_passwd; #line 67 "serv.gaa" - int require_cert; + int disable_client_cert; #line 64 "serv.gaa" - char *x509_dsacertfile; + int require_cert; #line 61 "serv.gaa" - char *x509_dsakeyfile; + char *x509_dsacertfile; #line 58 "serv.gaa" - char *x509_certfile; + char *x509_dsakeyfile; #line 55 "serv.gaa" - char *x509_keyfile; + char *x509_certfile; #line 52 "serv.gaa" - char *pgp_certfile; + char *x509_keyfile; #line 49 "serv.gaa" - char *pgp_keyfile; + char *pgp_certfile; #line 46 "serv.gaa" - char *pgp_trustdb; + char *pgp_keyfile; #line 43 "serv.gaa" char *pgp_keyring; #line 40 "serv.gaa" diff --git a/src/serv.c b/src/serv.c index 100165fcae..4abeb57698 100644 --- a/src/serv.c +++ b/src/serv.c @@ -65,7 +65,6 @@ char *psk_passwd; char *srp_passwd; char *srp_passwd_conf; char *pgp_keyring; -char *pgp_trustdb; char *pgp_keyfile; char *pgp_certfile; char *x509_keyfile; @@ -1001,16 +1000,6 @@ main (int argc, char **argv) } } - if (pgp_trustdb != NULL) - { - ret = gnutls_certificate_set_openpgp_trustdb (cert_cred, pgp_trustdb); - if (ret < 0) - { - fprintf (stderr, "Error setting the OpenPGP trustdb file\n"); - GERR (ret); - } - } - if (pgp_certfile != NULL) if ((ret = gnutls_certificate_set_openpgp_key_file (cert_cred, pgp_certfile, pgp_keyfile)) < 0) @@ -1483,7 +1472,6 @@ gaa_parser (int argc, char **argv) psk_passwd = info.psk_passwd; pgp_keyring = info.pgp_keyring; - pgp_trustdb = info.pgp_trustdb; parse_protocols (info.proto, info.nproto, protocol_priority); parse_ciphers (info.ciphers, info.nciphers, cipher_priority); diff --git a/src/serv.gaa b/src/serv.gaa index 4bacca651c..8a54e1a292 100644 --- a/src/serv.gaa +++ b/src/serv.gaa @@ -43,9 +43,6 @@ option (x509crlfile) STR "FILE" { $x509_crlfile = $1 } "CRL file to use." #char *pgp_keyring; option (pgpkeyring) STR "FILE" { $pgp_keyring = $1 } "PGP Key ring file to use." -#char *pgp_trustdb; -option (pgptrustdb) STR "FILE" { $pgp_trustdb = $1 } "PGP trustdb file to use." - #char *pgp_keyfile; option (pgpkeyfile) STR "FILE" { $pgp_keyfile = $1 } "PGP Key file to use." @@ -127,7 +124,7 @@ init { $generate=0; $port=5556; $http=0; $ciphers=NULL; $x509_keyfile=NULL; $x509_certfile=NULL; $x509_crlfile = NULL; $x509_dsakeyfile=NULL; $x509_dsacertfile=NULL; $srp_passwd=NULL; $srp_passwd_conf=NULL; $quiet = 0; - $pgp_trustdb=NULL; $pgp_keyring=NULL; $fmtder = 0; + $pgp_keyring=NULL; $fmtder = 0; $disable_client_cert = 0; $dh_params_file=NULL; $debug=0; $require_cert = 0; $psk_passwd = 0; $authz_x509_attr_cert = NULL; $authz_saml_assertion = NULL; |