projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent possible buffer overflows when using very large (>= 8192 bit) RSA keys.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
a6d2bb7
..
77e2c0d
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-1,7
+1,7
@@
/*
net.c -- most of the network code
/*
net.c -- most of the network code
- Copyright (C) 1998-200
3 Ivo Timmermans <ivo@o2w.nl
>,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1998-200
5 Ivo Timmermans <ivo@tinc-vpn.org
>,
+ 2000-200
5 Guus Sliepen <guus@tinc-vpn
.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: net.c,v 1.35.4.203 2003/12/20 19:47:52 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-248,7
+248,13
@@
static void check_dead_connections(void)
}
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
}
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
- terminate_connection(c, false);
+ if(c->status.connecting) {
+ c->status.connecting = false;
+ closesocket(c->socket);
+ do_outgoing_connection(c);
+ } else {
+ terminate_connection(c, false);
+ }
}
}
}
}
}
}