Temporarily revert to old crypto code

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 795141123e7abda5fa7274cb39925f4a824c83b5..524a6ce03254d5d4651c465fdf971dbabeb66cd8 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -110,19 +110,17 @@ 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);
+                       evbuffer_expand(c->buffer->input, c->buffer->input->off + inlen);
+                       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));
+                                          c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
                                return false;
                        }
                        c->buffer->input->off += inlen;