From 5c8b8ea01ce717b2f55db8a7a42a00a5c1d698ff Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 31 Aug 2017 20:14:16 +0200
Subject: [PATCH] Simplify

---
 src/libsodium/sodium/codecs.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libsodium/sodium/codecs.c b/src/libsodium/sodium/codecs.c
index 247c9c0d..9ba04a5b 100644
--- a/src/libsodium/sodium/codecs.c
+++ b/src/libsodium/sodium/codecs.c
@@ -177,10 +177,7 @@ sodium_bin2base64(char * const b64, const size_t b64_maxlen,
         if ((((unsigned int) variant) & VARIANT_NO_PADDING_MASK) == 0U) {
             b64_len += 4;
         } else {
-            b64_len += 2;
-            if (remainder == 2) {
-                b64_len++;
-            }
+            b64_len += 2 + (remainder >> 1);
         }
     }
     if (b64_maxlen <= b64_len) {