X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeta.c;h=6054427ce62b0d64b8a283f109afc7dfe7a3c3c7;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=795141123e7abda5fa7274cb39925f4a824c83b5;hpb=fbf305c09d91bf34b1504b58d50392df2e6bcfba;p=meshlink

diff --git a/src/meta.c b/src/meta.c
index 79514112..6054427c 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -22,10 +22,8 @@
 
 #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"
@@ -35,31 +33,34 @@
 #include "xalloc.h"
 
 bool send_meta(connection_t *c, const char *buffer, int length) {
-	int outlen;
-	int result;
 	cp();
 
+	if(!c) {
+		logger(LOG_ERR, _("send_meta() called with NULL pointer!"));
+		abort();
+	}
+
 	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;
 
-		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));
+		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);
 			return false;
 		}
 		
-		logger(LOG_DEBUG, _("Encrypted write %p %p %p %d"), c, c->buffer, outbuf, length);
+		ifdebug(META) 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."));
+		ifdebug(META) logger(LOG_DEBUG, _("Done."));
 	} else {
-		logger(LOG_DEBUG, _("Unencrypted write %p %p %p %d"), c, c->buffer, buffer, length);
+		ifdebug(META) 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."));
+		ifdebug(META) logger(LOG_DEBUG, _("Done."));
 	}
 
 	return true;
@@ -80,7 +81,7 @@ void broadcast_meta(connection_t *from, const char *buffer, int length) {
 }
 
 bool receive_meta(connection_t *c) {
-	int result, inlen, outlen;
+	size_t inlen;
 	char inbuf[MAXBUFSIZE];
 	char *bufp = inbuf, *endp;
 
@@ -110,19 +111,18 @@ bool receive_meta(connection_t *c) {
 			else
 				endp = bufp + inlen;
 
-			logger(LOG_DEBUG, _("Received unencrypted %ld of %d bytes"), endp - bufp, inlen);
-
 			evbuffer_add(c->buffer->input, bufp, endp - bufp);
 
 			inlen -= endp - bufp;
 			bufp = endp;
 		} else {
-			logger(LOG_DEBUG, _("Received encrypted %d bytes"), inlen);
-			evbuffer_expand(c->buffer->input, inlen);
-			result = EVP_DecryptUpdate(c->inctx, (unsigned char *)c->buffer->input->buffer, &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));
+			size_t outlen = inlen;
+			ifdebug(META) logger(LOG_DEBUG, _("Received encrypted %zu 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);
 				return false;
 			}
 			c->buffer->input->off += inlen;
@@ -148,8 +148,10 @@ bool receive_meta(connection_t *c) {
 
 			char *request = evbuffer_readline(c->buffer->input);
 			if(request) {
-				receive_request(c, request);
+				bool result = receive_request(c, request);
 				free(request);
+				if(!result)
+					return false;
 				continue;
 			} else {
 				break;