projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove pidfile when exitting.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
3b5cd46
..
cb652c1
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-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: protocol_key.c,v 1.1.4.2
0 2003/07/22 20:55:20
guus Exp $
+ $Id: protocol_key.c,v 1.1.4.2
2 2003/07/24 12:08:16
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-34,7
+34,7
@@
bool mykeyused = false;
bool mykeyused = false;
-bool send_key_changed(connection_t *c, node_t *n)
+bool send_key_changed(connection_t *c,
const
node_t *n)
{
cp();
{
cp();
@@
-82,7
+82,7
@@
bool key_changed_h(connection_t *c)
return true;
}
return true;
}
-bool send_req_key(connection_t *c,
node_t *from,
node_t *to)
+bool send_req_key(connection_t *c,
const node_t *from, const
node_t *to)
{
cp();
{
cp();
@@
-133,7
+133,7
@@
bool req_key_h(connection_t *c)
return true;
}
return true;
}
-bool send_ans_key(connection_t *c,
node_t *from,
node_t *to)
+bool send_ans_key(connection_t *c,
const node_t *from, const
node_t *to)
{
char key[MAX_STRING_SIZE];
{
char key[MAX_STRING_SIZE];
@@
-250,7
+250,8
@@
bool ans_key_h(connection_t *c)
from->compression = compression;
from->compression = compression;
- EVP_EncryptInit_ex(&from->packet_ctx, from->cipher, NULL, from->key, from->key + from->cipher->key_len);
+ if(from->cipher)
+ EVP_EncryptInit_ex(&from->packet_ctx, from->cipher, NULL, from->key, from->key + from->cipher->key_len);
flush_queue(from);
flush_queue(from);