From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 4 Dec 2017 16:38:36 +0000 (+0200)
Subject: auth: Rename CRYPT scheme to DES-CRYPT
X-Git-Tag: 2.3.0.rc1~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfb22f2f9b28d5888ba00ad910e47c9a490ca673;p=thirdparty%2Fdovecot%2Fcore.git

auth: Rename CRYPT scheme to DES-CRYPT
---

diff --git a/src/auth/password-scheme-crypt.c b/src/auth/password-scheme-crypt.c
index fa83511413..2bf4a7aa1d 100644
--- a/src/auth/password-scheme-crypt.c
+++ b/src/auth/password-scheme-crypt.c
@@ -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);
 }
diff --git a/src/auth/test-libpassword.c b/src/auth/test-libpassword.c
index 2ac56ab005..ead7ef0c7e 100644
--- a/src/auth/test-libpassword.c
+++ b/src/auth/test-libpassword.c
@@ -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" },
 };