From 3e2e0242c3268cf321392700b465e78baea836b7 Mon Sep 17 00:00:00 2001
From: Anthony Alba <ascanio.alba7@gmail.com>
Date: Thu, 2 Mar 2017 05:29:50 +0800
Subject: [PATCH] Determine base64 padding from enc_salt_key_len

---
 daemon/sdp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/daemon/sdp.c b/daemon/sdp.c
index b608f3703..22616775a 100644
--- a/daemon/sdp.c
+++ b/daemon/sdp.c
@@ -446,10 +446,9 @@ static int parse_attribute_crypto(struct sdp_attribute *output) {
 			(guchar *) c->key_salt_buf, &b64_state, &b64_save);
         // flush b64_state needed for AES-192: 36+2; AES-256: 45+1;
         if (enc_salt_key_len % 4) {
-                ret += g_base64_decode_step("==", 4 - b64_state,
+                ret += g_base64_decode_step("==", 4 - (enc_salt_key_len % 4),
                         (guchar *) c->key_salt_buf + ret, &b64_state, &b64_save);
         }
-        assert( !b64_state );
 	err = "invalid base64 encoding";
 	if (ret != salt_key_len)
 		goto error;