X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fmisc%2Fcrypt.c;h=6885330f0532d4221ca3e2f3b8d25867100a3a62;hp=42918ef0be20bb6e17f85104453b1eabe91d2cf3;hb=9a59faab3c0c46d2e96245e11fc71351caba1a2e;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/src/misc/crypt.c b/src/misc/crypt.c
index 42918ef0..6885330f 100644
--- a/src/misc/crypt.c
+++ b/src/misc/crypt.c
@@ -2391,7 +2391,7 @@ static void des_setkey(struct des_ctx *ctx, const unsigned char *key)
 static void do_des(struct des_ctx *ctx, uint32_t *l_out, uint32_t *r_out, int count)
 {
 	uint32_t l, r, *kl, *kr;
-	uint32_t f = f; /* silence gcc */
+	uint32_t f;
 	uint32_t r48l, r48r;
 	int round;
 
@@ -2488,7 +2488,7 @@ des_crypt(struct des_ctx *ctx, char output[DES_OUT_BUFSIZE],
 			key++;
 		q++;
 	}
-	des_setkey(ctx, (char *)keybuf);
+	des_setkey(ctx, (void *)keybuf);
 
 	/*
 	 * setting - 2 bytes of salt
@@ -2566,7 +2566,7 @@ char *__crypt_r(const char *clear, const char *salt, struct crypt_data *data)
 #endif
 
 	des_init(&des_ctx);
-	return des_crypt(&des_ctx, (char *)data, clear, salt);
+	return des_crypt(&des_ctx, (char *)data, (void *)clear, (void *)salt);
 }
 
 weak_alias(__crypt_r, crypt_r);