projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14 from luckyhacky/master
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
0ef5468
..
a7a6fe0
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-1,7
+1,7
@@
/*
protocol_auth.c -- handle the meta-protocol, authentication
Copyright (C) 1999-2005 Ivo Timmermans,
/*
protocol_auth.c -- handle the meta-protocol, authentication
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-201
2
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
3
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
@@
-126,7
+126,7
@@
static bool send_proxyrequest(connection_t *c) {
}
bool send_id(connection_t *c) {
}
bool send_id(connection_t *c) {
- if(proxytype)
+ if(proxytype
&& c->outgoing
)
if(!send_proxyrequest(c))
return false;
if(!send_proxyrequest(c))
return false;
@@
-308,7
+308,10
@@
bool metakey_h(connection_t *c) {
/* Convert the challenge from hexadecimal back to binary */
/* Convert the challenge from hexadecimal back to binary */
- hex2bin(buffer, buffer, len);
+ if(!hex2bin(buffer, buffer, len)) {
+ logger(LOG_ERR, "Got bad %s from %s(%s): %s", "METAKEY", c->name, c->hostname, "invalid key");
+ return false;
+ }
/* Decrypt the meta key */
/* Decrypt the meta key */
@@
-426,7
+429,10
@@
bool challenge_h(connection_t *c) {
/* Convert the challenge from hexadecimal back to binary */
/* Convert the challenge from hexadecimal back to binary */
- hex2bin(buffer, c->mychallenge, len);
+ if(!hex2bin(buffer, c->mychallenge, len)) {
+ logger(LOG_ERR, "Got bad %s from %s(%s): %s", "CHALLENGE", c->name, c->hostname, "invalid challenge");
+ return false;
+ }
c->allow_request = CHAL_REPLY;
c->allow_request = CHAL_REPLY;
@@
-480,7
+486,10
@@
bool chal_reply_h(connection_t *c) {
/* Convert the hash to binary format */
/* Convert the hash to binary format */
- hex2bin(hishash, hishash, c->outdigest->md_size);
+ if(!hex2bin(hishash, hishash, c->outdigest->md_size)) {
+ logger(LOG_ERR, "Got bad %s from %s(%s): %s", "CHAL_REPLY", c->name, c->hostname, "invalid hash");
+ return false;
+ }
/* Calculate the hash from the challenge we sent */
/* Calculate the hash from the challenge we sent */