projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all header guards.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
ccd79dc
..
e338850
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-1,7
+1,7
@@
/*
tincd.c -- the main file for tincd
Copyright (C) 1998-2005 Ivo Timmermans
/*
tincd.c -- the main file for tincd
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-201
6
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
7
Guus Sliepen <guus@tinc-vpn.org>
2008 Max Rijevski <maksuf@gmail.com>
2009 Michael Tokarev <mjt@tls.msk.ru>
2010 Julien Muchembled <jm@jmuchemb.eu>
2008 Max Rijevski <maksuf@gmail.com>
2009 Michael Tokarev <mjt@tls.msk.ru>
2010 Julien Muchembled <jm@jmuchemb.eu>
@@
-390,7
+390,7
@@
static bool keygen(int bits) {
BIGNUM *e = NULL;
RSA *rsa_key;
FILE *f;
BIGNUM *e = NULL;
RSA *rsa_key;
FILE *f;
- char
*pubname, *privname
;
+ char
filename[PATH_MAX]
;
BN_GENCB *cb;
int result;
BN_GENCB *cb;
int result;
@@
-411,18
+411,20
@@
static bool keygen(int bits) {
BN_free(e);
BN_GENCB_free(cb);
BN_free(e);
BN_GENCB_free(cb);
- if(!r
sa_key
) {
+ if(!r
esult
) {
fprintf(stderr, "Error during key generation!\n");
fprintf(stderr, "Error during key generation!\n");
+ RSA_free(rsa_key);
return false;
} else
fprintf(stderr, "Done.\n");
return false;
} else
fprintf(stderr, "Done.\n");
- xasprintf(&privname, "%s/rsa_key.priv", confbase);
- f = ask_and_open(privname, "private RSA key");
- free(privname);
+ snprintf(filename, sizeof filename, "%s/rsa_key.priv", confbase);
+ f = ask_and_open(filename, "private RSA key");
- if(!f)
+ if(!f) {
+ RSA_free(rsa_key);
return false;
return false;
+ }
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
@@
-436,22
+438,25
@@
static bool keygen(int bits) {
char *name = get_name();
if(name) {
char *name = get_name();
if(name) {
-
xasprintf(&pub
name, "%s/hosts/%s", confbase, name);
+
snprintf(filename, sizeof file
name, "%s/hosts/%s", confbase, name);
free(name);
} else {
free(name);
} else {
-
xasprintf(&pub
name, "%s/rsa_key.pub", confbase);
+
snprintf(filename, sizeof file
name, "%s/rsa_key.pub", confbase);
}
}
- f = ask_and_open(pubname, "public RSA key");
- free(pubname);
+ f = ask_and_open(filename, "public RSA key");
- if(!f)
+ if(!f) {
+ RSA_free(rsa_key);
return false;
return false;
+ }
fputc('\n', f);
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
fputc('\n', f);
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
+ RSA_free(rsa_key);
+
return true;
}
return true;
}
@@
-538,7
+543,7
@@
static bool drop_privs() {
"initgroups", strerror(errno));
return false;
}
"initgroups", strerror(errno));
return false;
}
-#ifndef
__ANDROID__
+#ifndef
ANDROID
// Not supported in android NDK
endgrent();
endpwent();
// Not supported in android NDK
endgrent();
endpwent();
@@
-583,7
+588,7
@@
int main(int argc, char **argv) {
if(show_version) {
printf("%s version %s\n", PACKAGE, VERSION);
if(show_version) {
printf("%s version %s\n", PACKAGE, VERSION);
- printf("Copyright (C) 1998-201
6
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf("Copyright (C) 1998-201
7
Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
"and you are welcome to redistribute it under certain conditions;\n"
"See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
"and you are welcome to redistribute it under certain conditions;\n"
@@
-739,7
+744,7
@@
end:
ERR_free_strings();
exit_configuration(&config_tree);
ERR_free_strings();
exit_configuration(&config_tree);
- list_
free
(cmdline_conf);
+ list_
delete_list
(cmdline_conf);
free_names();
return status;
free_names();
return status;