aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2017-06-02 08:06:45 +0200
committerMarcus Meissner <marcus@jet.franken.de>2017-06-02 08:06:45 +0200
commitbcb8018d6208fde121eb73da2437481b9c63335d (patch)
tree3b4915e2559e24af56eb6203dff735535e271c55
parentdc771fac207f6c91a699de740ff32324024d61d6 (diff)
downloadlibmtp-bcb8018d6208fde121eb73da2437481b9c63335d.tar.gz
added a missing return for unknown keysizes (GCC7)
-rw-r--r--src/mtpz.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/mtpz.c b/src/mtpz.c
index a07fd9e..aeff17c 100644
--- a/src/mtpz.c
+++ b/src/mtpz.c
@@ -690,21 +690,22 @@ void mtpz_encryption_expand_key_inner(unsigned char *constant, int key_len, unsi
switch (key_len)
{
- case 16:
- ks = 16 * (10 + 1);
- break;
+ case 16:
+ ks = 16 * (10 + 1);
+ break;
- case 24:
- ks = 16 * (12 + 1);
- break;
+ case 24:
+ ks = 16 * (12 + 1);
+ break;
- case 32:
- ks = 16 * (14 + 1);
- break;
+ case 32:
+ ks = 16 * (14 + 1);
+ break;
- default:
- *out = NULL;
- *out_len = 0;
+ default:
+ *out = NULL;
+ *out_len = 0;
+ return;
}
unsigned char *key = (unsigned char *)malloc(ks);