projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent read_rsa_public_key() from returning an uninitialized RSA structure.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
22692bb
..
f34ebaa
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-1,7
+1,7
@@
/*
protocol_key.c -- handle the meta-protocol, key exchange
Copyright (C) 1999-2005 Ivo Timmermans,
/*
protocol_key.c -- handle the meta-protocol, key exchange
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-201
0
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
1
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
@@
-34,9
+34,9
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-bool mykeyused = false;
+
static
bool mykeyused = false;
-void send_key_changed() {
+void send_key_changed(
void
) {
avl_node_t *node;
connection_t *c;
avl_node_t *node;
connection_t *c;
@@
-145,8
+145,6
@@
bool req_key_h(connection_t *c) {
}
bool send_ans_key(node_t *to) {
}
bool send_ans_key(node_t *to) {
- char *key;
-
// Set key parameters
to->incipher = myself->incipher;
to->inkeylength = myself->inkeylength;
// Set key parameters
to->incipher = myself->incipher;
to->inkeylength = myself->inkeylength;
@@
-165,10
+163,10
@@
bool send_ans_key(node_t *to) {
// Reset sequence number and late packet window
mykeyused = true;
to->received_seqno = 0;
// Reset sequence number and late packet window
mykeyused = true;
to->received_seqno = 0;
-
memset(to->late, 0, sizeof(to->late)
);
+
if(replaywin) memset(to->late, 0, replaywin
);
// Convert to hexadecimal and send
// Convert to hexadecimal and send
-
key = alloca(2 * to->inkeylength + 1)
;
+
char key[2 * to->inkeylength + 1]
;
bin2hex(to->inkey, key, to->inkeylength);
key[to->inkeylength * 2] = '\0';
bin2hex(to->inkey, key, to->inkeylength);
key[to->inkeylength * 2] = '\0';
@@
-312,7
+310,7
@@
bool ans_key_h(connection_t *c) {
update_node_udp(from, &sa);
}
update_node_udp(from, &sa);
}
- if(from->options & OPTION_PMTU_DISCOVERY && !from->mtu
probes
)
+ if(from->options & OPTION_PMTU_DISCOVERY && !from->mtu
event
)
send_mtu_probe(from);
return true;
send_mtu_probe(from);
return true;