X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=07f578e52e2c9aded212a8f0b10aba4630231bcf;hp=eaa2cf183406b7010d7bc4ef977f7796eac2a132;hb=7d21a8d1c7fd8909fe02385dbb4717c074db4648;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8

diff --git a/src/net_packet.c b/src/net_packet.c
index eaa2cf18..07f578e5 100644
--- a/src/net_packet.c
+++ b/src/net_packet.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.
 
-    $Id: net_packet.c,v 1.1.2.23 2002/09/09 22:32:44 guus Exp $
+    $Id: net_packet.c,v 1.1.2.26 2003/03/28 13:41:49 guus Exp $
 */
 
 #include "config.h"
@@ -26,15 +26,6 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,6 +40,15 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
 
 #include <openssl/rand.h>
 #include <openssl/evp.h>
@@ -80,6 +80,7 @@
 
 int keylifetime = 0;
 int keyexpires = 0;
+EVP_CIPHER_CTX packet_ctx;
 
 #define MAX_SEQNO 1073741824
 
@@ -93,7 +94,6 @@ void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 	vpn_packet_t *outpkt = pkt[0];
 	int outlen, outpad;
 	long int complen = MTU + 12;
-	EVP_CIPHER_CTX ctx;
 	char hmac[EVP_MAX_MD_SIZE];
 
 	cp();
@@ -118,12 +118,12 @@ void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 	if(myself->cipher) {
 		outpkt = pkt[nextpkt++];
 
-		EVP_DecryptInit(&ctx, myself->cipher, myself->key,
+		EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key,
 						myself->key + myself->cipher->key_len);
-		EVP_DecryptUpdate(&ctx, (char *) &outpkt->seqno, &outlen,
+		EVP_DecryptUpdate(&packet_ctx, (char *) &outpkt->seqno, &outlen,
 						  (char *) &inpkt->seqno, inpkt->len);
-		EVP_DecryptFinal(&ctx, (char *) &outpkt->seqno + outlen, &outpad);
-
+		EVP_DecryptFinal_ex(&packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
+		
 		outpkt->len = outlen + outpad;
 		inpkt = outpkt;
 	}
@@ -196,7 +196,6 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 	int origlen;
 	int outlen, outpad;
 	long int complen = MTU + 12;
-	EVP_CIPHER_CTX ctx;
 	vpn_packet_t *copy;
 	static int priority = 0;
 	int origpriority;
@@ -260,10 +259,10 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 	if(n->cipher) {
 		outpkt = pkt[nextpkt++];
 
-		EVP_EncryptInit(&ctx, n->cipher, n->key, n->key + n->cipher->key_len);
-		EVP_EncryptUpdate(&ctx, (char *) &outpkt->seqno, &outlen,
+		EVP_EncryptInit_ex(&packet_ctx, n->cipher, NULL, n->key, n->key + n->cipher->key_len);
+		EVP_EncryptUpdate(&packet_ctx, (char *) &outpkt->seqno, &outlen,
 						  (char *) &inpkt->seqno, inpkt->len);
-		EVP_EncryptFinal(&ctx, (char *) &outpkt->seqno + outlen, &outpad);
+		EVP_EncryptFinal_ex(&packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
 
 		outpkt->len = outlen + outpad;
 		inpkt = outpkt;
@@ -295,7 +294,7 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 		if(debug_lvl >= DEBUG_TRAFFIC)
 			syslog(LOG_DEBUG, _("Setting outgoing packet priority to %d"),
 				   priority);
-		if(setsockopt(sock, SOL_IP, IP_TOS, &priority, sizeof(priority)))	/* SO_PRIORITY doesn't seem to work */
+		if(setsockopt(listen_socket[sock].udp, SOL_IP, IP_TOS, &priority, sizeof(priority)))	/* SO_PRIORITY doesn't seem to work */
 			syslog(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt",
 				   strerror(errno));
 	}