diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-03 10:56:36 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-03 10:56:36 +0200 |
commit | 4adc232cdc3f5aad1a2be38d8875494561f813cb (patch) | |
tree | 825558e586fcc5a1abc4a362119d5f437a063066 | |
parent | 463f925edd6e6b7196a31c4176d4af67d01d0c59 (diff) | |
download | gnutls-4adc232cdc3f5aad1a2be38d8875494561f813cb.tar.gz |
crypt.* renamed to srptool.*.
-rw-r--r-- | src/Makefile.am | 8 | ||||
-rw-r--r-- | src/srptool-gaa.c (renamed from src/crypt-gaa.c) | 40 | ||||
-rw-r--r-- | src/srptool-gaa.h (renamed from src/crypt-gaa.h) | 16 | ||||
-rw-r--r-- | src/srptool.c (renamed from src/crypt.c) | 0 | ||||
-rw-r--r-- | src/srptool.gaa (renamed from src/crypt.gaa) | 0 |
5 files changed, 32 insertions, 32 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9460985dd0..e1d9b4cae1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,11 +53,11 @@ libcmd_serv_la_CFLAGS = libcmd_serv_la_SOURCES = serv.gaa serv-gaa.h serv-gaa.c if ENABLE_SRP -srptool_SOURCES = crypt.c +srptool_SOURCES = srptool.c srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la noinst_LTLIBRARIES += libcmd-srp.la libcmd_srp_la_CFLAGS = -libcmd_srp_la_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c +libcmd_srp_la_SOURCES = srptool.gaa srptool-gaa.h srptool-gaa.c endif psktool_SOURCES = psk.c @@ -133,8 +133,8 @@ libcmd_p11tool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB) psk-gaa.c: $(srcdir)/psk.gaa -$(GAA) $< -o psk-gaa.c -i psk-gaa.h -crypt-gaa.c: $(srcdir)/crypt.gaa - -$(GAA) $< -o crypt-gaa.c -i crypt-gaa.h +srptool-gaa.c: $(srcdir)/srptool.gaa + -$(GAA) $< -o srptool-gaa.c -i srptool-gaa.h p11tool-gaa.c: $(srcdir)/p11tool.gaa -$(GAA) $< -o p11tool-gaa.c -i p11tool-gaa.h certtool-gaa.c: $(srcdir)/certtool.gaa diff --git a/src/crypt-gaa.c b/src/srptool-gaa.c index f83cf9d274..f396335b5a 100644 --- a/src/crypt-gaa.c +++ b/src/srptool-gaa.c @@ -1,7 +1,7 @@ /* File generated by GAA 1.6.6 */ #define GAA_NO_WIN32 -#line 1 "crypt.gaa" +#line 1 "srptool.gaa" /* C declarations */ @@ -153,21 +153,21 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 37 "crypt.gaa" +#line 37 "srptool.gaa" char *create_conf; -#line 34 "crypt.gaa" +#line 34 "srptool.gaa" char *passwd_conf; -#line 31 "crypt.gaa" +#line 31 "srptool.gaa" int verify; -#line 28 "crypt.gaa" +#line 28 "srptool.gaa" int salt; -#line 25 "crypt.gaa" +#line 25 "srptool.gaa" int index; -#line 22 "crypt.gaa" +#line 22 "srptool.gaa" char *passwd; -#line 19 "crypt.gaa" +#line 19 "srptool.gaa" char *username; -#line 16 "crypt.gaa" +#line 16 "srptool.gaa" int debug; #line 114 "gaa.skel" @@ -558,14 +558,14 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) { case GAAOPTID_help: OK = 0; -#line 41 "crypt.gaa" +#line 41 "srptool.gaa" { gaa_help(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_version: OK = 0; -#line 40 "crypt.gaa" +#line 40 "srptool.gaa" { srptool_version(); exit(0); ;}; return GAA_OK; @@ -575,7 +575,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_create_conf.arg1, gaa_getstr, GAATMP_create_conf.size1); gaa_index++; -#line 38 "crypt.gaa" +#line 38 "srptool.gaa" { gaaval->create_conf = GAATMP_create_conf.arg1 ;}; return GAA_OK; @@ -585,14 +585,14 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_passwd_conf.arg1, gaa_getstr, GAATMP_passwd_conf.size1); gaa_index++; -#line 35 "crypt.gaa" +#line 35 "srptool.gaa" { gaaval->passwd_conf = GAATMP_passwd_conf.arg1 ;}; return GAA_OK; break; case GAAOPTID_verify: OK = 0; -#line 32 "crypt.gaa" +#line 32 "srptool.gaa" { gaaval->verify = 1 ;}; return GAA_OK; @@ -602,7 +602,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_salt.arg1, gaa_getint, GAATMP_salt.size1); gaa_index++; -#line 29 "crypt.gaa" +#line 29 "srptool.gaa" { gaaval->salt = GAATMP_salt.arg1 ;}; return GAA_OK; @@ -612,7 +612,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_index.arg1, gaa_getint, GAATMP_index.size1); gaa_index++; -#line 26 "crypt.gaa" +#line 26 "srptool.gaa" { gaaval->index = GAATMP_index.arg1 ;}; return GAA_OK; @@ -622,7 +622,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_passwd.arg1, gaa_getstr, GAATMP_passwd.size1); gaa_index++; -#line 23 "crypt.gaa" +#line 23 "srptool.gaa" { gaaval->passwd = GAATMP_passwd.arg1 ;}; return GAA_OK; @@ -632,7 +632,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_username.arg1, gaa_getstr, GAATMP_username.size1); gaa_index++; -#line 20 "crypt.gaa" +#line 20 "srptool.gaa" { gaaval->username = GAATMP_username.arg1 ;}; return GAA_OK; @@ -642,7 +642,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1); gaa_index++; -#line 17 "crypt.gaa" +#line 17 "srptool.gaa" { gaaval->debug = GAATMP_debug.arg1 ;}; return GAA_OK; @@ -671,7 +671,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval) if(inited == 0) { -#line 43 "crypt.gaa" +#line 43 "srptool.gaa" { gaaval->username=NULL; gaaval->passwd=NULL; gaaval->salt=0; gaaval->create_conf=NULL; gaaval->passwd_conf=NULL; gaaval->verify = 0; gaaval->index = 1; gaaval->debug = 0; ;}; diff --git a/src/crypt-gaa.h b/src/srptool-gaa.h index 18ea3bb6e9..585238dd06 100644 --- a/src/crypt-gaa.h +++ b/src/srptool-gaa.h @@ -8,21 +8,21 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 37 "crypt.gaa" +#line 37 "srptool.gaa" char *create_conf; -#line 34 "crypt.gaa" +#line 34 "srptool.gaa" char *passwd_conf; -#line 31 "crypt.gaa" +#line 31 "srptool.gaa" int verify; -#line 28 "crypt.gaa" +#line 28 "srptool.gaa" int salt; -#line 25 "crypt.gaa" +#line 25 "srptool.gaa" int index; -#line 22 "crypt.gaa" +#line 22 "srptool.gaa" char *passwd; -#line 19 "crypt.gaa" +#line 19 "srptool.gaa" char *username; -#line 16 "crypt.gaa" +#line 16 "srptool.gaa" int debug; #line 114 "gaa.skel" diff --git a/src/crypt.c b/src/srptool.c index 187842450a..187842450a 100644 --- a/src/crypt.c +++ b/src/srptool.c diff --git a/src/crypt.gaa b/src/srptool.gaa index 0026b0a887..0026b0a887 100644 --- a/src/crypt.gaa +++ b/src/srptool.gaa |