X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeta.c;h=524a6ce03254d5d4651c465fdf971dbabeb66cd8;hb=40731d030fef793c6b6405efd9b3e64c26c00045;hp=141a1a1d61200bf265673b95c64441c58b072589;hpb=269892f70bf357de6ad66ca89daa34b225ee9e37;p=tinc

diff --git a/src/meta.c b/src/meta.c
index 141a1a1d..524a6ce0 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -22,8 +22,10 @@
 
 #include "system.h"
 
+#include <openssl/err.h>
+#include <openssl/evp.h>
+
 #include "splay_tree.h"
-#include "cipher.h"
 #include "connection.h"
 #include "logger.h"
 #include "meta.h"
@@ -33,23 +35,31 @@
 #include "xalloc.h"
 
 bool send_meta(connection_t *c, const char *buffer, int length) {
+	int outlen;
+	int result;
 	cp();
 
-	ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length, c->name, c->hostname);
+	ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+			   c->name, c->hostname);
 
 	/* Add our data to buffer */
 	if(c->status.encryptout) {
 		char outbuf[length];
-		size_t outlen = length;
 
-		if(!cipher_encrypt(&c->outcipher, buffer, length, outbuf, &outlen, false) || outlen != length) {
-			logger(LOG_ERR, _("Error while encrypting metadata to %s (%s)"), c->name, c->hostname);
+		result = EVP_EncryptUpdate(c->outctx, (unsigned char *)outbuf, &outlen, (unsigned char *)buffer, length);
+		if(!result || outlen != length) {
+			logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"),
+					c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
 			return false;
 		}
 		
+		logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length);
 		bufferevent_write(c->buffer, (void *)outbuf, length);
+		logger(LOG_DEBUG, _("Done."));
 	} else {
+		logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length);
 		bufferevent_write(c->buffer, (void *)buffer, length);
+		logger(LOG_DEBUG, _("Done."));
 	}
 
 	return true;
@@ -70,7 +80,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
 }
 
 bool receive_meta(connection_t *c) {
-	size_t inlen;
+	int result, inlen, outlen;
 	char inbuf[MAXBUFSIZE];
 	char *bufp = inbuf, *endp;
 
@@ -105,15 +115,16 @@ bool receive_meta(connection_t *c) {
 			inlen -= endp - bufp;
 			bufp = endp;
 		} else {
-			size_t outlen = inlen;
+			logger(LOG_DEBUG, _("Received encrypted %d bytes"), inlen);
 			evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
-
-			if(!cipher_decrypt(&c->incipher, bufp, inlen, c->buffer->input->buffer + c->buffer->input->off, &outlen, false) || inlen != outlen) {
-				logger(LOG_ERR, _("Error while decrypting metadata from %s (%s)"), c->name, c->hostname);
+			result = EVP_DecryptUpdate(c->inctx, (unsigned char *)c->buffer->input->buffer + c->buffer->input->off, &outlen, (unsigned char *)bufp, inlen);
+			if(!result || outlen != inlen) {
+				logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
+					   c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
 				return false;
 			}
-
 			c->buffer->input->off += inlen;
+
 			inlen = 0;
 		}
 
@@ -135,10 +146,8 @@ bool receive_meta(connection_t *c) {
 
 			char *request = evbuffer_readline(c->buffer->input);
 			if(request) {
-				bool result = receive_request(c, request);
+				receive_request(c, request);
 				free(request);
-				if(!result)
-					return false;
 				continue;
 			} else {
 				break;