From 4ce2856a5d1ec6ffff9f1e4578348745e82f0bf2 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 21 Sep 2017 11:23:37 +0200
Subject: [PATCH] Avoid negations on unsigned values

---
 src/libsodium/sodium/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c
index f13938c4..6666ef95 100644
--- a/src/libsodium/sodium/utils.c
+++ b/src/libsodium/sodium/utils.c
@@ -682,7 +682,7 @@ sodium_unpad(size_t *unpadded_buflen_p, const unsigned char *buf,
         is_barrier =
             (( (acc - 1U) & (pad_len - 1U) & ((c ^ 0x80) - 1U) ) >> 8) & 1U;
         acc |= c;
-        pad_len |= (i & - is_barrier);
+        pad_len |= i & (1U + ~is_barrier);
         valid |= (unsigned char) is_barrier;
     }
     *unpadded_buflen_p = padded_buflen - 1U - pad_len;