From 60f61d2de58f847e8916ded089cdf9da244ddf04 Mon Sep 17 00:00:00 2001 From: icex2 Date: Sat, 23 Jan 2021 23:45:31 +0100 Subject: [PATCH] prinet-proxy: Bugfix handling of decryption data length --- src/main/pumpnet/prinet-proxy/main.c | 2 +- src/main/sec/prinet/prinet.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/pumpnet/prinet-proxy/main.c b/src/main/pumpnet/prinet-proxy/main.c index d5989d8..c37beb2 100644 --- a/src/main/pumpnet/prinet-proxy/main.c +++ b/src/main/pumpnet/prinet-proxy/main.c @@ -34,7 +34,7 @@ static bool _transform_data_request(const struct pumpnet_prinet_proxy_packet* pa enc_data_len, dec_data->bytes); - if (dec_data_len != enc_data_len) { + if (dec_data_len < 0) { log_error("Decrypting data failed"); return false; } diff --git a/src/main/sec/prinet/prinet.c b/src/main/sec/prinet/prinet.c index e28ae22..b4c6909 100644 --- a/src/main/sec/prinet/prinet.c +++ b/src/main/sec/prinet/prinet.c @@ -83,7 +83,8 @@ size_t sec_prinet_decrypt( return -1; } - return enc_data_len; + // cut off the macbytes at the end of the message + return enc_data_len - crypto_box_MACBYTES; } size_t sec_prinet_encrypt(