]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: Rename CRYPT scheme to DES-CRYPT
authorAki Tuomi <aki.tuomi@dovecot.fi>
Mon, 4 Dec 2017 16:38:36 +0000 (18:38 +0200)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Tue, 5 Dec 2017 13:46:22 +0000 (15:46 +0200)
src/auth/password-scheme-crypt.c
src/auth/test-libpassword.c

index fa8351141394307df4c0022dfa177cf0923d8026..2bf4a7aa1d13aac0b33c3fb37b7a70d3347bcb78 100644 (file)
@@ -162,7 +162,7 @@ static const struct {
 
 /* keep in sync with the sample struct above */
 static const struct password_scheme crypt_schemes[] = {
-       { "CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
+       { "DES-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
          crypt_generate_des },
        { "SHA256-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
          crypt_generate_sha256 },
@@ -175,6 +175,11 @@ static const struct password_scheme blf_crypt_scheme = {
                crypt_generate_blowfish
 };
 
+static const struct password_scheme default_crypt_scheme = {
+       "CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
+               crypt_generate_des
+};
+
 void password_scheme_register_crypt(void)
 {
        unsigned int i;
@@ -187,4 +192,5 @@ void password_scheme_register_crypt(void)
                        password_scheme_register(&crypt_schemes[i]);
        }
        password_scheme_register(&blf_crypt_scheme);
+       password_scheme_register(&default_crypt_scheme);
 }
index 2ac56ab0057f7caf993ac820d276b87bb4365e4a..ead7ef0c7e9277f206ce50cff7f9eba3559e4309 100644 (file)
@@ -9,8 +9,8 @@ static struct {
        const char *scheme_generated;
        const char *scheme_detected;
 } known_non_aliases[] = {
-       { "MD5", "CRYPT" },
-       { "MD5-CRYPT", "CRYPT" },
+       { "MD5", "DES-CRYPT" },
+       { "MD5-CRYPT", "DES-CRYPT" },
        { "SKEY", "OTP" },
        { "ARGON2ID", "ARGON2I" },
 };