]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: password-scheme - Use generate_salt in md5crypt
authorAki Tuomi <aki.tuomi@open-xchange.com>
Tue, 11 Aug 2020 05:48:09 +0000 (08:48 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Fri, 11 Sep 2020 07:07:19 +0000 (07:07 +0000)
Deduplicates code

src/auth/password-scheme.c

index 790813cf53d7e1a7a736c70ef97d0c1a5d9cc4ed..f0c789e3f7cd7c281375d0928e72a16c2b8bd3a7 100644 (file)
@@ -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;