From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 23 Mar 2017 13:12:45 +0000 (+0200)
Subject: var-expand-crypt: Fix base64 encoding
X-Git-Tag: 2.3.0.rc1~1878
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e38412ec12ae8dc4f67ade5b18c8b976de59bcb;p=thirdparty%2Fdovecot%2Fcore.git

var-expand-crypt: Fix base64 encoding

the break was missing, also removed confusing block.
---

diff --git a/src/plugins/var-expand-crypt/var-expand-crypt-plugin.c b/src/plugins/var-expand-crypt/var-expand-crypt-plugin.c
index a00d5ae32a..72793a39e2 100644
--- a/src/plugins/var-expand-crypt/var-expand-crypt-plugin.c
+++ b/src/plugins/var-expand-crypt/var-expand-crypt-plugin.c
@@ -148,6 +148,7 @@ var_expand_encrypt(struct var_expand_context *_ctx,
 	const char *const *args = NULL;
 	const char *value;
 	struct var_expand_crypt_context ctx;
+	string_t *dest;
 	int ret = 0;
 
 	memset(&ctx, 0, sizeof(ctx));
@@ -197,14 +198,14 @@ var_expand_encrypt(struct var_expand_context *_ctx,
 			enciv = binary_to_hex(ctx.iv->data, ctx.iv->used);
 			res = binary_to_hex(tmp->data, tmp->used);
 			break;
-		case FORMAT_BASE64: {
-			string_t *dest = t_str_new(32);
+		case FORMAT_BASE64:
+			dest = t_str_new(32);
 			base64_encode(ctx.iv->data, ctx.iv->used, dest);
 			enciv = str_c(dest);
 			dest = t_str_new(32);
 			base64_encode(tmp->data, tmp->used, dest);
 			res = str_c(dest);
-			}
+			break;
 		default:
 			i_unreached();
 		}