projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encrypt network packets in CBC mode instead of CFB mode.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
5a45683
..
7ebe37b
100644
(file)
--- a/
src/net.c
+++ b/
src/net.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: net.c,v 1.35.4.9
4 2001/01/13 16:36:21
guus Exp $
+ $Id: net.c,v 1.35.4.9
6 2001/02/25 16:34:17
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-112,7
+112,7
@@
int xsend(connection_t *cl, vpn_packet_t *inpkt)
cp
outpkt.len = inpkt->len;
cp
outpkt.len = inpkt->len;
- /* Encrypt the packet.
FIXME: we should use CBC, not CFB.
*/
+ /* Encrypt the packet. */
EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len);
EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
@@
-202,6
+202,7
@@
int send_packet(ip_t to, vpn_packet_t *packet)
{
connection_t *cl;
subnet_t *subnet;
{
connection_t *cl;
subnet_t *subnet;
+ vpn_packet_t *copy;
cp
if((subnet = lookup_subnet_ipv4(&to)) == NULL)
{
cp
if((subnet = lookup_subnet_ipv4(&to)) == NULL)
{
@@
-242,7
+243,13
@@
cp
syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
cl->name, cl->hostname);
syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
cl->name, cl->hostname);
- list_insert_tail(cl->queue, packet);
+ /* Since packet is on the stack of handle_tap_input(),
+ we have to make a copy of it first. */
+
+ copy = xmalloc(sizeof(vpn_packet_t));
+ memcpy(copy, packet, sizeof(vpn_packet_t));
+
+ list_insert_tail(cl->queue, copy);
if(!cl->status.waitingforkey)
send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */
if(!cl->status.waitingforkey)
send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */
@@
-260,7
+267,7
@@
cp
void flush_queue(connection_t *cl)
{
list_node_t *node, *next;
void flush_queue(connection_t *cl)
{
list_node_t *node, *next;
-
+cp
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname);
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname);
@@
-270,6
+277,7
@@
void flush_queue(connection_t *cl)
xsend(cl, (vpn_packet_t *)node->data);
list_delete_node(cl->queue, node);
}
xsend(cl, (vpn_packet_t *)node->data);
list_delete_node(cl->queue, node);
}
+cp
}
/*
}
/*
@@
-808,7
+816,7
@@
cp
cp
/* Generate packet encryption key */
cp
/* Generate packet encryption key */
- myself->cipher_pkttype = EVP_bf_c
fb
();
+ myself->cipher_pkttype = EVP_bf_c
bc
();
myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len;
myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len;