From: Andre Noll <maan@systemlinux.org>
Date: Mon, 16 Dec 2013 21:58:39 +0000 (+0100)
Subject: crypt: Simplify base64_decode().
X-Git-Tag: v0.5.3~19
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=612be8a0856eb3c58fef8784f77c7f999d4c9e08;ds=sidebyside

crypt: Simplify base64_decode().

We never call this function with target == NULL.
---

diff --git a/crypt_common.c b/crypt_common.c
index 71aabf53..fb6e1ef4 100644
--- a/crypt_common.c
+++ b/crypt_common.c
@@ -90,41 +90,31 @@ int base64_decode(char const *src, unsigned char *target, size_t targsize)
 
 		switch (state) {
 		case 0:
-			if (target) {
-				if (tarindex >= targsize)
-					return -E_BASE64;
-				target[tarindex] = (pos - Base64) << 2;
-			}
+			if (tarindex >= targsize)
+				return -E_BASE64;
+			target[tarindex] = (pos - Base64) << 2;
 			state = 1;
 			break;
 		case 1:
-			if (target) {
-				if (tarindex + 1 >= targsize)
-					return -E_BASE64;
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
-			}
+			if (tarindex + 1 >= targsize)
+				return -E_BASE64;
+			target[tarindex] |= (pos - Base64) >> 4;
+			target[tarindex + 1] = ((pos - Base64) & 0x0f) << 4;
 			tarindex++;
 			state = 2;
 			break;
 		case 2:
-			if (target) {
-				if (tarindex + 1 >= targsize)
-					return -E_BASE64;
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
-			}
+			if (tarindex + 1 >= targsize)
+				return -E_BASE64;
+			target[tarindex] |= (pos - Base64) >> 2;
+			target[tarindex + 1] = ((pos - Base64) & 0x03) << 6;
 			tarindex++;
 			state = 3;
 			break;
 		case 3:
-			if (target) {
-				if (tarindex >= targsize)
-					return -E_BASE64;
-				target[tarindex] |= (pos - Base64);
-			}
+			if (tarindex >= targsize)
+				return -E_BASE64;
+			target[tarindex] |= pos - Base64;
 			tarindex++;
 			state = 0;
 			break;
@@ -170,7 +160,7 @@ int base64_decode(char const *src, unsigned char *target, size_t targsize)
 			 * zeros.  If we don't check them, they become a
 			 * subliminal channel.
 			 */
-			if (target && target[tarindex] != 0)
+			if (target[tarindex] != 0)
 				return -E_BASE64;
 		}
 	} else {