From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 11 Aug 2020 05:48:09 +0000 (+0300)
Subject: auth: password-scheme - Use generate_salt in md5crypt
X-Git-Tag: 2.3.13~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c21966242312bd5cadf2ba6bcfaadfce6b311ea;p=thirdparty%2Fdovecot%2Fcore.git

auth: password-scheme - Use generate_salt in md5crypt

Deduplicates code
---

diff --git a/src/auth/password-scheme.c b/src/auth/password-scheme.c
index 790813cf53..f0c789e3f7 100644
--- a/src/auth/password-scheme.c
+++ b/src/auth/password-scheme.c
@@ -373,13 +373,9 @@ md5_crypt_generate(const char *plaintext, const struct password_generate_params
 		   const unsigned char **raw_password_r, size_t *size_r)
 {
 	const char *password;
-	char salt[9];
-	unsigned int i;
+	const char *salt;
 
-	random_fill(salt, sizeof(salt)-1);
-	for (i = 0; i < sizeof(salt)-1; i++)
-		salt[i] = salt_chars[salt[i] % (sizeof(salt_chars)-1)];
-	salt[sizeof(salt)-1] = '\0';
+	salt = password_generate_salt(8);
 
 	password = password_generate_md5_crypt(plaintext, salt);
 	*raw_password_r = (const unsigned char *)password;