]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
var-expand-crypt: Fix base64 encoding
authorAki Tuomi <aki.tuomi@dovecot.fi>
Thu, 23 Mar 2017 13:12:45 +0000 (15:12 +0200)
committerGitLab <gitlab@git.dovecot.net>
Thu, 23 Mar 2017 14:16:43 +0000 (16:16 +0200)
the break was missing, also removed confusing block.

src/plugins/var-expand-crypt/var-expand-crypt-plugin.c

index a00d5ae32a9e0c9de3a6b7861a9f5ee44d796ad9..72793a39e234549b16eae2d03d192d7aae5187ab 100644 (file)
@@ -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();
                }