j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fixed all sprintf() spl01ts.

Browse source
This commit is contained in:
Guus Sliepen 2000-08-17 16:51:08 +00:00
parent 9acd4379f7
commit 3831f51a53
3 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/encr.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: encr.c,v 1.12.4.2 2000/06/30 21:03:50 guus Exp $ $Id: encr.c,v 1.12.4.3 2000/08/17 16:51:07 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -98,13 +98,11 @@ int read_passphrase(char *which, char **out)
cp cp
if((cfg = get_config_val(passphrasesdir)) == NULL) if((cfg = get_config_val(passphrasesdir)) == NULL)
{ {
filename = xmalloc(strlen(confbase)+13+strlen(which)); asprintf(&filename, "%spassphrases/%s", confbase, which);
sprintf(filename, "%spassphrases/%s", confbase, which);
} }
else else
{ {
filename = xmalloc(strlen(cfg->data.ptr)+2+strlen(which)); asprintf(&filename, "%s/%s", (char*)cfg->data.ptr, which);
sprintf(filename, "%s/%s", (char*)cfg->data.ptr, which);
} }
if((f = fopen(filename, "rb")) == NULL) if((f = fopen(filename, "rb")) == NULL)
@ -268,7 +266,7 @@ int verify_passphrase(conn_list_t *cl, unsigned char *his_pubkey)
mpz_t pk; mpz_t pk;
unsigned char *out; unsigned char *out;
BF_KEY bf_key; BF_KEY bf_key;
char which[sizeof("123.123.123.123")+1]; char *which;
char *meuk; char *meuk;
cp cp
mpz_init_set_str(pk, his_pubkey, 36); mpz_init_set_str(pk, his_pubkey, 36);
@ -282,7 +280,7 @@ cp
if(key_inited) if(key_inited)
cipher_set_key(&encryption_key, encryption_keylen, text_key); cipher_set_key(&encryption_key, encryption_keylen, text_key);
sprintf(which, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip)); asprintf(&which, IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
if((pplen = read_passphrase(which, &meuk)) < 0) if((pplen = read_passphrase(which, &meuk)) < 0)
return -1; return -1;

8
src/netutl.c
View file

@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: netutl.c,v 1.12.4.6 2000/06/29 17:09:06 guus Exp $ $Id: netutl.c,v 1.12.4.7 2000/08/17 16:51:07 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -187,13 +187,11 @@ cp
if(!lookup_hostname || !host) if(!lookup_hostname || !host)
{ {
name = xmalloc(20); asprintf(&name, "%s", inet_ntoa(in));
sprintf(name, "%s", inet_ntoa(in));
} }
else else
{ {
name = xmalloc(strlen(host->h_name)+1); asprintf(&name, "%s", host->h_name);
sprintf(name, "%s", host->h_name);
} }
cp cp
return name; return name;

20
src/tincd.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c,v 1.10.4.7 2000/08/08 14:54:57 guus Exp $ $Id: tincd.c,v 1.10.4.8 2000/08/17 16:51:08 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -296,30 +296,24 @@ void make_names(void)
{ {
if(netname) if(netname)
{ {
configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR)); asprintf(&configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
} }
else else
{ {
configfilename = xmalloc(17+strlen(CONFDIR)); asprintf(&configfilename, "%s/tinc/tinc.conf", CONFDIR);
sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR);
} }
} }
if(netname) if(netname)
{ {
pidfilename = xmalloc(strlen(netname)+20); asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
sprintf(pidfilename, "/var/run/tinc.%s.pid", netname); asprintf(&confbase, "%s/tinc/%s/", CONFDIR, netname);
confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR)); asprintf(&identname, "tinc.%s", netname);
sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname);
identname = xmalloc(strlen(netname)+7);
sprintf(identname, "tinc.%s", netname);
} }
else else
{ {
pidfilename = "/var/run/tinc.pid"; pidfilename = "/var/run/tinc.pid";
confbase = xmalloc(7+strlen(CONFDIR)); asprintf(&confbase, "%s/tinc/", CONFDIR);
sprintf(confbase, "%s/tinc/", CONFDIR);
identname = "tinc"; identname = "tinc";
} }
} }