[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-18-g9229d4c
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-18-g9229d4c |
|
Date: |
Sat, 21 Jan 2012 00:57:49 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=9229d4c9b0e305412a8a5ab4db9cd31902fcc096
The branch, master has been updated
via 9229d4c9b0e305412a8a5ab4db9cd31902fcc096 (commit)
from d2ae1e99a616b60453044055d0bb68bc0a2d2a49 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9229d4c9b0e305412a8a5ab4db9cd31902fcc096
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Jan 21 02:02:08 2012 +0100
removed serv gaa files
-----------------------------------------------------------------------
Summary of changes:
src/serv-gaa.c | 1362 --------------------------------------------------------
src/serv-gaa.h | 91 ----
src/serv.gaa | 119 -----
3 files changed, 0 insertions(+), 1572 deletions(-)
delete mode 100644 src/serv-gaa.c
delete mode 100644 src/serv-gaa.h
delete mode 100644 src/serv.gaa
diff --git a/src/serv-gaa.c b/src/serv-gaa.c
deleted file mode 100644
index d903c8e..0000000
--- a/src/serv-gaa.c
+++ /dev/null
@@ -1,1362 +0,0 @@
-/* File generated by GAA 1.6.6
- */
-#define GAA_NO_WIN32
-#line 1 "serv.gaa"
-
-
-#include <config.h>
-#include <common.h>
-
-void serv_version(void);
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifndef GAA_NO_WIN32
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(WINDOWS)
-#define GAA_WIN32
-#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_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");
-}
-
-void gaa_help(void)
-{
- printf("GnuTLS test server\nUsage: gnutls-serv [options]\n\n\n");
- __gaa_helpsingle('d', "debug", "integer ", "Enable debugging");
- __gaa_helpsingle('g', "generate", "", "Generate Diffie-Hellman and
RSA-EXPORT Parameters.");
- __gaa_helpsingle('p', "port", "integer ", "The port to connect to.");
- __gaa_helpsingle('q', "quiet", "", "Suppress some messages.");
- __gaa_helpsingle(0, "nodb", "", "Does not use the resume database.");
- __gaa_helpsingle(0, "noticket", "", "Does not issue session tickets.");
- __gaa_helpsingle(0, "http", "", "Act as an HTTP Server.");
- __gaa_helpsingle(0, "echo", "", "Act as an Echo Server.");
- __gaa_helpsingle(0, "udp", "", "Enable UDP server instead of TCP.");
- __gaa_helpsingle(0, "mtu", "integer ", "Set MTU for datagram TLS.");
- __gaa_helpsingle(0, "dhparams", "FILE ", "DH params file to use.");
- __gaa_helpsingle(0, "x509fmtder", "", "Use DER format for
certificates");
- __gaa_helpsingle(0, "x509cafile", "FILE ", "Certificate file or PKCS
#11 URL 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, "pgpkeyfile", "FILE ", "PGP Key file to use.");
- __gaa_helpsingle(0, "pgpcertfile", "FILE ", "PGP Public Key
(certificate) file to use.");
- __gaa_helpsingle(0, "pgpsubkey", "HEX|auto ", "PGP subkey to use.");
- __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file or PKCS #11
URL to use.");
- __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file or
PKCS #11 URL to use.");
- __gaa_helpsingle(0, "x509dsakeyfile", "FILE ", "Alternative X.509 key
file to use.");
- __gaa_helpsingle(0, "x509dsacertfile", "FILE ", "Alternative X.509
certificate file to use.");
- __gaa_helpsingle(0, "x509ecckeyfile", "FILE ", "Alternative X.509 key
file to use.");
- __gaa_helpsingle(0, "x509ecccertfile", "FILE ", "Alternative X.509
certificate file to use.");
- __gaa_helpsingle('r', "require-cert", "", "Require a valid
certificate.");
- __gaa_helpsingle('a', "disable-client-cert", "", "Disable request for a
client certificate.");
- __gaa_helpsingle(0, "pskpasswd", "FILE ", "PSK password file to use.");
- __gaa_helpsingle(0, "pskhint", "HINT ", "PSK identity hint to use.");
- __gaa_helpsingle(0, "srppasswd", "FILE ", "SRP password file to use.");
- __gaa_helpsingle(0, "srppasswdconf", "FILE ", "SRP password conf file
to use.");
- __gaa_helpsingle(0, "priority", "PRIORITY STRING ", "Priorities
string.");
- __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");
-
-#line 100 "gaa.skel"
-}
-/* Copy of C area */
-
-#line 104 "gaa.skel"
-/* GAA HEADER */
-#ifndef GAA_HEADER_POKY
-#define GAA_HEADER_POKY
-
-typedef struct _gaainfo gaainfo;
-
-struct _gaainfo
-{
-#line 100 "serv.gaa"
- char *priorities;
-#line 97 "serv.gaa"
- char *srp_passwd_conf;
-#line 94 "serv.gaa"
- char *srp_passwd;
-#line 91 "serv.gaa"
- char *psk_hint;
-#line 88 "serv.gaa"
- char *psk_passwd;
-#line 85 "serv.gaa"
- int disable_client_cert;
-#line 82 "serv.gaa"
- int require_cert;
-#line 79 "serv.gaa"
- char *x509_ecccertfile;
-#line 76 "serv.gaa"
- char *x509_ecckeyfile;
-#line 73 "serv.gaa"
- char *x509_dsacertfile;
-#line 70 "serv.gaa"
- char *x509_dsakeyfile;
-#line 67 "serv.gaa"
- char *x509_certfile;
-#line 64 "serv.gaa"
- char *x509_keyfile;
-#line 61 "serv.gaa"
- char *pgp_subkey;
-#line 58 "serv.gaa"
- char *pgp_certfile;
-#line 55 "serv.gaa"
- char *pgp_keyfile;
-#line 52 "serv.gaa"
- char *pgp_keyring;
-#line 49 "serv.gaa"
- char *x509_crlfile;
-#line 46 "serv.gaa"
- char *x509_cafile;
-#line 43 "serv.gaa"
- int fmtder;
-#line 40 "serv.gaa"
- char *dh_params_file;
-#line 37 "serv.gaa"
- int mtu;
-#line 34 "serv.gaa"
- int udp;
-#line 30 "serv.gaa"
- int http;
-#line 27 "serv.gaa"
- int noticket;
-#line 24 "serv.gaa"
- int nodb;
-#line 21 "serv.gaa"
- int quiet;
-#line 18 "serv.gaa"
- int port;
-#line 15 "serv.gaa"
- int generate;
-#line 12 "serv.gaa"
- int debug;
-
-#line 114 "gaa.skel"
-};
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
- int gaa(int argc, char *argv[], gaainfo *gaaval);
-
- void gaa_help(void);
-
- 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;
-
-/* Generated by gaa */
-
-#include <string.h>
-#include <stdlib.h>
-
-
-#define GAA_OK -1
-
-#define GAA_ERROR_NOMATCH 0
-#define GAA_ERROR_NOTENOUGH_ARGS 1
-#define GAA_ERROR_INVALID_ARG 2
-#define GAA_ERROR_UNKNOWN 3
-
-#define GAA_NOT_AN_OPTION 0
-#define GAA_WORD_OPTION 1
-#define GAA_LETTER_OPTION 2
-#define GAA_MULTIPLE_OPTION 3
-
-#define GAA_REST 0
-#define GAA_NB_OPTION 34
-#define GAAOPTID_version 1
-#define GAAOPTID_help 2
-#define GAAOPTID_list 3
-#define GAAOPTID_priority 4
-#define GAAOPTID_srppasswdconf 5
-#define GAAOPTID_srppasswd 6
-#define GAAOPTID_pskhint 7
-#define GAAOPTID_pskpasswd 8
-#define GAAOPTID_disable_client_cert 9
-#define GAAOPTID_require_cert 10
-#define GAAOPTID_x509ecccertfile 11
-#define GAAOPTID_x509ecckeyfile 12
-#define GAAOPTID_x509dsacertfile 13
-#define GAAOPTID_x509dsakeyfile 14
-#define GAAOPTID_x509certfile 15
-#define GAAOPTID_x509keyfile 16
-#define GAAOPTID_pgpsubkey 17
-#define GAAOPTID_pgpcertfile 18
-#define GAAOPTID_pgpkeyfile 19
-#define GAAOPTID_pgpkeyring 20
-#define GAAOPTID_x509crlfile 21
-#define GAAOPTID_x509cafile 22
-#define GAAOPTID_x509fmtder 23
-#define GAAOPTID_dhparams 24
-#define GAAOPTID_mtu 25
-#define GAAOPTID_udp 26
-#define GAAOPTID_echo 27
-#define GAAOPTID_http 28
-#define GAAOPTID_noticket 29
-#define GAAOPTID_nodb 30
-#define GAAOPTID_quiet 31
-#define GAAOPTID_port 32
-#define GAAOPTID_generate 33
-#define GAAOPTID_debug 34
-
-#line 168 "gaa.skel"
-
-#define GAA_CHECK1STR(a,b) \
-if(a[0] == str[0]) \
-{ \
- gaa_current_option = a; \
- return b; \
-}
-
-#define GAA_CHECKSTR(a,b) \
-if(strcmp(a,str) == 0) \
-{ \
- gaa_current_option = a; \
- return b; \
-}
-
-#define GAA_TESTMOREARGS \
-if(!OK) \
-{ \
-while((gaa_last_non_option != gaa_index) && (gaa_arg_used[gaa_index] == 1)) \
- gaa_index++; \
-if(gaa_last_non_option == gaa_index) \
- return GAA_ERROR_NOTENOUGH_ARGS; \
-}
-
-#define GAA_TESTMOREOPTIONALARGS
\
-if(!OK) \
-{ \
-while((gaa_last_non_option != gaa_index) && (gaa_arg_used[gaa_index] == 1)) \
- gaa_index++; \
-if(gaa_last_non_option == gaa_index) \
- OK = 1; \
-}
-
-#define GAA_FILL_2ARGS(target, func) \
-target = func(GAAargv[gaa_index]); \
-gaa_arg_used[gaa_index] = 1; \
-if(gaa_error == 1) \
-{ \
- gaa_error = 0; \
- return GAA_ERROR_INVALID_ARG; \
-}
-
-
-
-#define GAA_FILL(target, func, num) \
-if(!OK) \
-{ \
-target = func(GAAargv[gaa_index]); \
-gaa_arg_used[gaa_index] = 1; \
-if(gaa_error == 1) \
-{ \
- gaa_error = 0; \
- return GAA_ERROR_INVALID_ARG; \
-} \
-num = 1; \
-} \
-else \
-{ \
-num = 0; \
-}
-
-#define GAA_LIST_FILL(target, func, type ,num) \
-if(!OK) \
-{ \
-num = 0; \
-target = NULL; \
-if ( gaa_last_non_option - gaa_index > 0) \
- target = gaa_malloc((gaa_last_non_option - gaa_index) * sizeof(type));\
-for(; gaa_index < gaa_last_non_option; gaa_index++) \
-{ \
- if(gaa_arg_used[gaa_index] == 0) \
- { \
- GAA_FILL_2ARGS(target[num], func); \
- num++; \
- } \
-} \
-if(num == 0) \
- return GAA_ERROR_NOTENOUGH_ARGS; \
-}
-
-#define GAA_OPTIONALLIST_FILL(target, func, type ,num) \
-if(!OK) \
-{ \
-num = 0; \
-target = NULL; \
-if ( gaa_last_non_option - gaa_index > 0) \
- target = gaa_malloc((gaa_last_non_option - gaa_index) * sizeof(type));\
-for(; gaa_index < gaa_last_non_option; gaa_index++) \
-{ \
- if(gaa_arg_used[gaa_index] == 0) \
- { \
- GAA_FILL_2ARGS(target[num], func); \
- num++; \
- } \
-} \
-}
-
-#define GAA_OBLIGAT(str) \
-k = 0; \
-for(i = 0; i < strlen(str); i++) \
-{ \
- j = gaa_get_option_num(str + i, GAA_LETTER_OPTION); \
- if(j == GAA_ERROR_NOMATCH) \
- { \
- printf("Error: invalid 'obligat' set\n"); \
- exit(-1); \
- } \
- if(opt_list[j] == 1) \
- k = 1; \
-} \
-if(k == 0) \
-{ \
- if(strlen(str) == 1) \
- printf("You must give the -%s option\n", str); \
- else \
- 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++) \
-{ \
- j = gaa_get_option_num(str + i, GAA_LETTER_OPTION); \
- if(j == GAA_ERROR_NOMATCH) \
- { \
- printf("Error: invalid 'obligat' set\n"); \
- exit(-1); \
- } \
- if(opt_list[j] == 1) \
- k++; \
-} \
-if(k > 1) \
-{ \
- printf("The options '%s' are incompatible\n", str); \
- return 0; \
-}
-
-
-static char **GAAargv;
-static int GAAargc;
-static char *gaa_arg_used;
-static int gaa_processing_file = 0;
-static int inited = 0;
-
-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);
- }
- 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);
- }
- return arg[0];
-}
-
-static char* gaa_getstr(char *arg)
-{
- return arg;
-}
-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);
- }
- return tmp;
-}
-/* option structures */
-
-struct GAAOPTION_priority
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_srppasswdconf
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_srppasswd
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_pskhint
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_pskpasswd
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509ecccertfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509ecckeyfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509dsacertfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509dsakeyfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509certfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509keyfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_pgpsubkey
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_pgpcertfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_pgpkeyfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_pgpkeyring
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509crlfile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_x509cafile
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_dhparams
-{
- char* arg1;
- int size1;
-};
-
-struct GAAOPTION_mtu
-{
- int arg1;
- int size1;
-};
-
-struct GAAOPTION_port
-{
- int arg1;
- int size1;
-};
-
-struct GAAOPTION_debug
-{
- int arg1;
- int size1;
-};
-
-#line 349 "gaa.skel"
-static int gaa_is_an_argument(char *str)
-{
-#ifdef GAA_WIN32
- 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[2] == 0)
- return GAA_LETTER_OPTION;
- else
- return GAA_MULTIPLE_OPTION;
-}
-
-static int gaa_get_option_num(char *str, int status)
-{
- switch(status)
- {
- case GAA_LETTER_OPTION:
- GAA_CHECK1STR("", GAAOPTID_priority);
- GAA_CHECK1STR("", GAAOPTID_srppasswdconf);
- GAA_CHECK1STR("", GAAOPTID_srppasswd);
- GAA_CHECK1STR("", GAAOPTID_pskhint);
- GAA_CHECK1STR("", GAAOPTID_pskpasswd);
- GAA_CHECK1STR("", GAAOPTID_x509ecccertfile);
- GAA_CHECK1STR("", GAAOPTID_x509ecckeyfile);
- GAA_CHECK1STR("", GAAOPTID_x509dsacertfile);
- GAA_CHECK1STR("", GAAOPTID_x509dsakeyfile);
- GAA_CHECK1STR("", GAAOPTID_x509certfile);
- GAA_CHECK1STR("", GAAOPTID_x509keyfile);
- GAA_CHECK1STR("", GAAOPTID_pgpsubkey);
- GAA_CHECK1STR("", GAAOPTID_pgpcertfile);
- GAA_CHECK1STR("", GAAOPTID_pgpkeyfile);
- GAA_CHECK1STR("", GAAOPTID_pgpkeyring);
- GAA_CHECK1STR("", GAAOPTID_x509crlfile);
- GAA_CHECK1STR("", GAAOPTID_x509cafile);
- GAA_CHECK1STR("", GAAOPTID_dhparams);
- GAA_CHECK1STR("", GAAOPTID_mtu);
- GAA_CHECK1STR("p", GAAOPTID_port);
- GAA_CHECK1STR("d", GAAOPTID_debug);
- case GAA_MULTIPLE_OPTION:
-#line 375 "gaa.skel"
- GAA_CHECK1STR("v", GAAOPTID_version);
- GAA_CHECK1STR("h", GAAOPTID_help);
- GAA_CHECK1STR("l", GAAOPTID_list);
- GAA_CHECK1STR("a", GAAOPTID_disable_client_cert);
- GAA_CHECK1STR("r", GAAOPTID_require_cert);
- GAA_CHECK1STR("", GAAOPTID_x509fmtder);
- GAA_CHECK1STR("", GAAOPTID_udp);
- GAA_CHECK1STR("", GAAOPTID_echo);
- GAA_CHECK1STR("", GAAOPTID_http);
- GAA_CHECK1STR("", GAAOPTID_noticket);
- GAA_CHECK1STR("", GAAOPTID_nodb);
- GAA_CHECK1STR("q", GAAOPTID_quiet);
- GAA_CHECK1STR("g", GAAOPTID_generate);
-
-#line 277 "gaa.skel"
- break;
- case GAA_WORD_OPTION:
- GAA_CHECKSTR("version", GAAOPTID_version);
- GAA_CHECKSTR("help", GAAOPTID_help);
- GAA_CHECKSTR("list", GAAOPTID_list);
- GAA_CHECKSTR("priority", GAAOPTID_priority);
- GAA_CHECKSTR("srppasswdconf", GAAOPTID_srppasswdconf);
- GAA_CHECKSTR("srppasswd", GAAOPTID_srppasswd);
- GAA_CHECKSTR("pskhint", GAAOPTID_pskhint);
- GAA_CHECKSTR("pskpasswd", GAAOPTID_pskpasswd);
- GAA_CHECKSTR("disable-client-cert",
GAAOPTID_disable_client_cert);
- GAA_CHECKSTR("require-cert", GAAOPTID_require_cert);
- GAA_CHECKSTR("x509ecccertfile",
GAAOPTID_x509ecccertfile);
- GAA_CHECKSTR("x509ecckeyfile", GAAOPTID_x509ecckeyfile);
- GAA_CHECKSTR("x509dsacertfile",
GAAOPTID_x509dsacertfile);
- GAA_CHECKSTR("x509dsakeyfile", GAAOPTID_x509dsakeyfile);
- GAA_CHECKSTR("x509certfile", GAAOPTID_x509certfile);
- GAA_CHECKSTR("x509keyfile", GAAOPTID_x509keyfile);
- GAA_CHECKSTR("pgpsubkey", GAAOPTID_pgpsubkey);
- GAA_CHECKSTR("pgpcertfile", GAAOPTID_pgpcertfile);
- GAA_CHECKSTR("pgpkeyfile", GAAOPTID_pgpkeyfile);
- GAA_CHECKSTR("pgpkeyring", GAAOPTID_pgpkeyring);
- GAA_CHECKSTR("x509crlfile", GAAOPTID_x509crlfile);
- GAA_CHECKSTR("x509cafile", GAAOPTID_x509cafile);
- GAA_CHECKSTR("x509fmtder", GAAOPTID_x509fmtder);
- GAA_CHECKSTR("dhparams", GAAOPTID_dhparams);
- GAA_CHECKSTR("mtu", GAAOPTID_mtu);
- GAA_CHECKSTR("udp", GAAOPTID_udp);
- GAA_CHECKSTR("echo", GAAOPTID_echo);
- GAA_CHECKSTR("http", GAAOPTID_http);
- GAA_CHECKSTR("noticket", GAAOPTID_noticket);
- GAA_CHECKSTR("nodb", GAAOPTID_nodb);
- GAA_CHECKSTR("quiet", GAAOPTID_quiet);
- GAA_CHECKSTR("port", GAAOPTID_port);
- GAA_CHECKSTR("generate", GAAOPTID_generate);
- GAA_CHECKSTR("debug", GAAOPTID_debug);
-
-#line 281 "gaa.skel"
- break;
- default: break;
- }
- return GAA_ERROR_NOMATCH;
-}
-
-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_priority GAATMP_priority;
- struct GAAOPTION_srppasswdconf GAATMP_srppasswdconf;
- struct GAAOPTION_srppasswd GAATMP_srppasswd;
- struct GAAOPTION_pskhint GAATMP_pskhint;
- struct GAAOPTION_pskpasswd GAATMP_pskpasswd;
- struct GAAOPTION_x509ecccertfile GAATMP_x509ecccertfile;
- struct GAAOPTION_x509ecckeyfile GAATMP_x509ecckeyfile;
- struct GAAOPTION_x509dsacertfile GAATMP_x509dsacertfile;
- struct GAAOPTION_x509dsakeyfile GAATMP_x509dsakeyfile;
- struct GAAOPTION_x509certfile GAATMP_x509certfile;
- struct GAAOPTION_x509keyfile GAATMP_x509keyfile;
- struct GAAOPTION_pgpsubkey GAATMP_pgpsubkey;
- struct GAAOPTION_pgpcertfile GAATMP_pgpcertfile;
- struct GAAOPTION_pgpkeyfile GAATMP_pgpkeyfile;
- struct GAAOPTION_pgpkeyring GAATMP_pgpkeyring;
- struct GAAOPTION_x509crlfile GAATMP_x509crlfile;
- struct GAAOPTION_x509cafile GAATMP_x509cafile;
- struct GAAOPTION_dhparams GAATMP_dhparams;
- struct GAAOPTION_mtu GAATMP_mtu;
- struct GAAOPTION_port GAATMP_port;
- struct GAAOPTION_debug GAATMP_debug;
-
-#line 393 "gaa.skel"
-#ifdef GAA_REST_EXISTS
- struct GAAREST GAAREST_tmp;
-#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;
- }
-
- switch(gaa_num)
- {
- case GAAOPTID_version:
- OK = 0;
-#line 106 "serv.gaa"
-{ serv_version(); exit(0); ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_help:
- OK = 0;
-#line 104 "serv.gaa"
-{ gaa_help(); exit(0); ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_list:
- OK = 0;
-#line 103 "serv.gaa"
-{ print_list(gaaval->priorities, 0); exit(0); ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_priority:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_priority.arg1, gaa_getstr,
GAATMP_priority.size1);
- gaa_index++;
-#line 101 "serv.gaa"
-{ gaaval->priorities = GAATMP_priority.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_srppasswdconf:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_srppasswdconf.arg1, gaa_getstr,
GAATMP_srppasswdconf.size1);
- gaa_index++;
-#line 98 "serv.gaa"
-{ gaaval->srp_passwd_conf = GAATMP_srppasswdconf.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_srppasswd:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_srppasswd.arg1, gaa_getstr,
GAATMP_srppasswd.size1);
- gaa_index++;
-#line 95 "serv.gaa"
-{ gaaval->srp_passwd = GAATMP_srppasswd.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_pskhint:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_pskhint.arg1, gaa_getstr, GAATMP_pskhint.size1);
- gaa_index++;
-#line 92 "serv.gaa"
-{ gaaval->psk_hint = GAATMP_pskhint.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_pskpasswd:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_pskpasswd.arg1, gaa_getstr,
GAATMP_pskpasswd.size1);
- gaa_index++;
-#line 89 "serv.gaa"
-{ gaaval->psk_passwd = GAATMP_pskpasswd.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_disable_client_cert:
- OK = 0;
-#line 86 "serv.gaa"
-{ gaaval->disable_client_cert = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_require_cert:
- OK = 0;
-#line 83 "serv.gaa"
-{ gaaval->require_cert = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509ecccertfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509ecccertfile.arg1, gaa_getstr,
GAATMP_x509ecccertfile.size1);
- gaa_index++;
-#line 80 "serv.gaa"
-{ gaaval->x509_ecccertfile = GAATMP_x509ecccertfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509ecckeyfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509ecckeyfile.arg1, gaa_getstr,
GAATMP_x509ecckeyfile.size1);
- gaa_index++;
-#line 77 "serv.gaa"
-{ gaaval->x509_ecckeyfile = GAATMP_x509ecckeyfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509dsacertfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509dsacertfile.arg1, gaa_getstr,
GAATMP_x509dsacertfile.size1);
- gaa_index++;
-#line 74 "serv.gaa"
-{ gaaval->x509_dsacertfile = GAATMP_x509dsacertfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509dsakeyfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509dsakeyfile.arg1, gaa_getstr,
GAATMP_x509dsakeyfile.size1);
- gaa_index++;
-#line 71 "serv.gaa"
-{ gaaval->x509_dsakeyfile = GAATMP_x509dsakeyfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509certfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509certfile.arg1, gaa_getstr,
GAATMP_x509certfile.size1);
- gaa_index++;
-#line 68 "serv.gaa"
-{ gaaval->x509_certfile = GAATMP_x509certfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509keyfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509keyfile.arg1, gaa_getstr,
GAATMP_x509keyfile.size1);
- gaa_index++;
-#line 65 "serv.gaa"
-{ gaaval->x509_keyfile = GAATMP_x509keyfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_pgpsubkey:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_pgpsubkey.arg1, gaa_getstr,
GAATMP_pgpsubkey.size1);
- gaa_index++;
-#line 62 "serv.gaa"
-{ gaaval->pgp_subkey = GAATMP_pgpsubkey.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_pgpcertfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_pgpcertfile.arg1, gaa_getstr,
GAATMP_pgpcertfile.size1);
- gaa_index++;
-#line 59 "serv.gaa"
-{ gaaval->pgp_certfile = GAATMP_pgpcertfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_pgpkeyfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_pgpkeyfile.arg1, gaa_getstr,
GAATMP_pgpkeyfile.size1);
- gaa_index++;
-#line 56 "serv.gaa"
-{ gaaval->pgp_keyfile = GAATMP_pgpkeyfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_pgpkeyring:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_pgpkeyring.arg1, gaa_getstr,
GAATMP_pgpkeyring.size1);
- gaa_index++;
-#line 53 "serv.gaa"
-{ gaaval->pgp_keyring = GAATMP_pgpkeyring.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509crlfile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509crlfile.arg1, gaa_getstr,
GAATMP_x509crlfile.size1);
- gaa_index++;
-#line 50 "serv.gaa"
-{ gaaval->x509_crlfile = GAATMP_x509crlfile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509cafile:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_x509cafile.arg1, gaa_getstr,
GAATMP_x509cafile.size1);
- gaa_index++;
-#line 47 "serv.gaa"
-{ gaaval->x509_cafile = GAATMP_x509cafile.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_x509fmtder:
- OK = 0;
-#line 44 "serv.gaa"
-{ gaaval->fmtder = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_dhparams:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_dhparams.arg1, gaa_getstr,
GAATMP_dhparams.size1);
- gaa_index++;
-#line 41 "serv.gaa"
-{ gaaval->dh_params_file = GAATMP_dhparams.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_mtu:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_mtu.arg1, gaa_getint, GAATMP_mtu.size1);
- gaa_index++;
-#line 38 "serv.gaa"
-{ gaaval->mtu = GAATMP_mtu.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_udp:
- OK = 0;
-#line 35 "serv.gaa"
-{ gaaval->udp = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_echo:
- OK = 0;
-#line 32 "serv.gaa"
-{ gaaval->http = 0 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_http:
- OK = 0;
-#line 31 "serv.gaa"
-{ gaaval->http = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_noticket:
- OK = 0;
-#line 28 "serv.gaa"
-{ gaaval->noticket = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_nodb:
- OK = 0;
-#line 25 "serv.gaa"
-{ gaaval->nodb = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_quiet:
- OK = 0;
-#line 22 "serv.gaa"
-{ gaaval->quiet = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_port:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_port.arg1, gaa_getint, GAATMP_port.size1);
- gaa_index++;
-#line 19 "serv.gaa"
-{ gaaval->port = GAATMP_port.arg1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_generate:
- OK = 0;
-#line 16 "serv.gaa"
-{ gaaval->generate = 1 ;};
-
- return GAA_OK;
- break;
- case GAAOPTID_debug:
- OK = 0;
- GAA_TESTMOREARGS;
- GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1);
- gaa_index++;
-#line 13 "serv.gaa"
-{ gaaval->debug = GAATMP_debug.arg1 ;};
-
- return GAA_OK;
- break;
-
-#line 413 "gaa.skel"
- default: break;
- }
- return GAA_ERROR_UNKNOWN;
-}
-
-int gaa(int argc, char **argv, gaainfo *gaaval)
-{
- int tmp1, tmp2;
- int i, j, k;
- char *opt_list;
-
- GAAargv = argv;
- GAAargc = argc;
-
- opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1);
-
- for(i = 0; i < GAA_NB_OPTION + 1; i++)
- opt_list[i] = 0;
- /* initialization */
- if(inited == 0)
- {
-
-#line 110 "serv.gaa"
-{ gaaval->generate=0; gaaval->port=5556; gaaval->http=0; gaaval->nodb = 0;
gaaval->noticket = 0;
- gaaval->x509_cafile = NULL; gaaval->pgp_keyfile=NULL;
gaaval->pgp_certfile=NULL;
- gaaval->x509_keyfile=NULL; gaaval->x509_certfile=NULL;
gaaval->x509_crlfile = NULL;
- gaaval->x509_dsakeyfile=NULL; gaaval->x509_dsacertfile=NULL;
- gaaval->x509_ecckeyfile=NULL; gaaval->x509_ecccertfile=NULL;
- gaaval->srp_passwd=NULL; gaaval->srp_passwd_conf=NULL; gaaval->quiet =
0;
- gaaval->pgp_keyring=NULL; gaaval->fmtder = 0;
- gaaval->disable_client_cert = 0; gaaval->priorities = NULL;
- gaaval->dh_params_file=NULL; gaaval->debug=0; gaaval->require_cert = 0;
gaaval->psk_passwd = 0;
- gaaval->pgp_subkey = NULL; gaaval->udp = 0; gaaval->mtu = 1300; ;};
-
- }
- inited = 1;
-#line 438 "gaa.skel"
- gaa_arg_used = NULL;
-
- if (argc > 0) {
- 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;
- }
- }
- }
-if(gaa_processing_file == 0)
-{
- GAA_INCOMP("ra");
-
-#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");
- }
-#endif
-}
- 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
-{
- 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)
-{
- int pos_ini;
- int a;
- int i = 0, len = 0, newline = 0;
-
- 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;
- }
-
- pos_ini = ftell(file) - 1;
-
- while(a != ' ' && a != 9 && a != '\n')
- {
-
- len++;
- a = fgetc( file);
- if(a==EOF) return 0;
- }
-
- 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;
- }
-
- 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);
-
- tmp_str->str[i - 1] = 0;
-
- fseek(file,- 1, SEEK_CUR);
-/* printf("%d\n", ftell(file)); */
-
- return -1;
-}
-
-int gaa_file(const char *name, gaainfo *gaaval)
-{
- gaa_str_node *first_str, **tmp_str, *tmp_str2;
- int rval, i;
- char **argv;
- int argc = 0;
- 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;
- }
-
- tmp_str = &first_str;
- do
- {
- argc++;
- *tmp_str = gaa_malloc(sizeof(gaa_str_node));
-
- (*tmp_str)->str = NULL;
- (*tmp_str)->next = NULL;
-
- 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*));
-
- tmp_str2 = first_str;
- argv[0] = "cfg";
- for(i = 1; i < argc; i++)
- {
- argv[i] = tmp_str2->str;
- tmp_str2 = tmp_str2->next;
- }
-
- rval = gaa(argc, argv, gaaval);
- gaa_processing_file = 0;
- return rval;
-}
diff --git a/src/serv-gaa.h b/src/serv-gaa.h
deleted file mode 100644
index 7626381..0000000
--- a/src/serv-gaa.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-#line 104 "gaa.skel"
-/* GAA HEADER */
-#ifndef GAA_HEADER_POKY
-#define GAA_HEADER_POKY
-
-typedef struct _gaainfo gaainfo;
-
-struct _gaainfo
-{
-#line 100 "serv.gaa"
- char *priorities;
-#line 97 "serv.gaa"
- char *srp_passwd_conf;
-#line 94 "serv.gaa"
- char *srp_passwd;
-#line 91 "serv.gaa"
- char *psk_hint;
-#line 88 "serv.gaa"
- char *psk_passwd;
-#line 85 "serv.gaa"
- int disable_client_cert;
-#line 82 "serv.gaa"
- int require_cert;
-#line 79 "serv.gaa"
- char *x509_ecccertfile;
-#line 76 "serv.gaa"
- char *x509_ecckeyfile;
-#line 73 "serv.gaa"
- char *x509_dsacertfile;
-#line 70 "serv.gaa"
- char *x509_dsakeyfile;
-#line 67 "serv.gaa"
- char *x509_certfile;
-#line 64 "serv.gaa"
- char *x509_keyfile;
-#line 61 "serv.gaa"
- char *pgp_subkey;
-#line 58 "serv.gaa"
- char *pgp_certfile;
-#line 55 "serv.gaa"
- char *pgp_keyfile;
-#line 52 "serv.gaa"
- char *pgp_keyring;
-#line 49 "serv.gaa"
- char *x509_crlfile;
-#line 46 "serv.gaa"
- char *x509_cafile;
-#line 43 "serv.gaa"
- int fmtder;
-#line 40 "serv.gaa"
- char *dh_params_file;
-#line 37 "serv.gaa"
- int mtu;
-#line 34 "serv.gaa"
- int udp;
-#line 30 "serv.gaa"
- int http;
-#line 27 "serv.gaa"
- int noticket;
-#line 24 "serv.gaa"
- int nodb;
-#line 21 "serv.gaa"
- int quiet;
-#line 18 "serv.gaa"
- int port;
-#line 15 "serv.gaa"
- int generate;
-#line 12 "serv.gaa"
- int debug;
-
-#line 114 "gaa.skel"
-};
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
- int gaa(int argc, char *argv[], gaainfo *gaaval);
-
- void gaa_help(void);
-
- int gaa_file(const char *name, gaainfo *gaaval);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/src/serv.gaa b/src/serv.gaa
deleted file mode 100644
index 97ba2ce..0000000
--- a/src/serv.gaa
+++ /dev/null
@@ -1,119 +0,0 @@
-#{
-
-#include <config.h>
-#include <common.h>
-
-void serv_version(void);
-
-#}
-
-helpnode "GnuTLS test server\nUsage: gnutls-serv [options]\n\n"
-
-#int debug;
-option (d, debug) INT "integer" { $debug = $1 } "Enable debugging"
-
-#int generate;
-option (g, generate) { $generate = 1 } "Generate Diffie-Hellman and RSA-EXPORT
Parameters."
-
-#int port;
-option (p, port) INT "integer" { $port = $1 } "The port to connect to."
-
-#int quiet;
-option (q, quiet) { $quiet = 1 } "Suppress some messages."
-
-#int nodb;
-option (nodb) { $nodb = 1 } "Does not use the resume database."
-
-#int noticket;
-option (noticket) { $noticket = 1 } "Does not issue session tickets."
-
-#int http;
-option (http) { $http = 1 } "Act as an HTTP Server."
-option (echo) { $http = 0 } "Act as an Echo Server."
-
-#int udp;
-option (udp) { $udp = 1 } "Enable UDP server instead of TCP."
-
-#int mtu;
-option (mtu) INT "integer" { $mtu = $1 } "Set MTU for datagram TLS."
-
-#char *dh_params_file;
-option (dhparams) STR "FILE" { $dh_params_file = $1 } "DH params file to use."
-
-#int fmtder;
-option (x509fmtder) { $fmtder = 1 } "Use DER format for certificates"
-
-#char *x509_cafile;
-option (x509cafile) STR "FILE" { $x509_cafile = $1 } "Certificate file or PKCS
#11 URL to use."
-
-#char *x509_crlfile;
-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_keyfile;
-option (pgpkeyfile) STR "FILE" { $pgp_keyfile = $1 } "PGP Key file to use."
-
-#char *pgp_certfile;
-option (pgpcertfile) STR "FILE" { $pgp_certfile = $1 } "PGP Public Key
(certificate) file to use."
-
-#char *pgp_subkey;
-option (pgpsubkey) STR "HEX|auto" { $pgp_subkey = $1 } "PGP subkey to use."
-
-#char *x509_keyfile;
-option (x509keyfile) STR "FILE" { $x509_keyfile = $1 } "X.509 key file or PKCS
#11 URL to use."
-
-#char *x509_certfile;
-option (x509certfile) STR "FILE" { $x509_certfile = $1 } "X.509 Certificate
file or PKCS #11 URL to use."
-
-#char *x509_dsakeyfile;
-option (x509dsakeyfile) STR "FILE" { $x509_dsakeyfile = $1 } "Alternative
X.509 key file to use."
-
-#char *x509_dsacertfile;
-option (x509dsacertfile) STR "FILE" { $x509_dsacertfile = $1 } "Alternative
X.509 certificate file to use."
-
-#char *x509_ecckeyfile;
-option (x509ecckeyfile) STR "FILE" { $x509_ecckeyfile = $1 } "Alternative
X.509 key file to use."
-
-#char *x509_ecccertfile;
-option (x509ecccertfile) STR "FILE" { $x509_ecccertfile = $1 } "Alternative
X.509 certificate file to use."
-
-#int require_cert;
-option (r, require-cert) { $require_cert = 1 } "Require a valid certificate."
-
-#int disable_client_cert;
-option (a, disable-client-cert) { $disable_client_cert = 1 } "Disable request
for a client certificate."
-
-#char *psk_passwd;
-option (pskpasswd) STR "FILE" { $psk_passwd = $1 } "PSK password file to use."
-
-#char *psk_hint;
-option (pskhint) STR "HINT" { $psk_hint = $1 } "PSK identity hint to use."
-
-#char *srp_passwd;
-option (srppasswd) STR "FILE" { $srp_passwd = $1 } "SRP password file to use."
-
-#char *srp_passwd_conf;
-option (srppasswdconf) STR "FILE" { $srp_passwd_conf = $1 } "SRP password conf
file to use."
-
-#char *priorities;
-option (priority) STR "PRIORITY STRING" { $priorities = $1 } "Priorities
string."
-
-option (l, list) { print_list($priorities, 0); exit(0); } "Print a list of the
supported algorithms and modes."
-option (h, help) { gaa_help(); exit(0); } "prints this help"
-
-option (v, version) { serv_version(); exit(0); } "prints the program's version
number"
-
-INCOMP ra
-
-init { $generate=0; $port=5556; $http=0; $nodb = 0; $noticket = 0;
- $x509_cafile = NULL; $pgp_keyfile=NULL; $pgp_certfile=NULL;
- $x509_keyfile=NULL; $x509_certfile=NULL; $x509_crlfile = NULL;
- $x509_dsakeyfile=NULL; $x509_dsacertfile=NULL;
- $x509_ecckeyfile=NULL; $x509_ecccertfile=NULL;
- $srp_passwd=NULL; $srp_passwd_conf=NULL; $quiet = 0;
- $pgp_keyring=NULL; $fmtder = 0;
- $disable_client_cert = 0; $priorities = NULL;
- $dh_params_file=NULL; $debug=0; $require_cert = 0; $psk_passwd = 0;
- $pgp_subkey = NULL; $udp = 0; $mtu = 1300; }
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-18-g9229d4c,
Nikos Mavrogiannopoulos <=