diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2018-11-27 11:54:23 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2018-11-27 11:54:23 +0100 |
| commit | 396ef3a1c93457fe66391627eb996b920be94fb2 (patch) | |
| tree | 77183b6e21b2d96e9b845dc415f6f9c0b9a5ec3d /modules/pam_unix/passverify.c | |
| parent | ad435b386b22b456724dc5c5b8d9f2d1beffc558 (diff) | |
| download | pam-396ef3a1c93457fe66391627eb996b920be94fb2.tar.gz pam-396ef3a1c93457fe66391627eb996b920be94fb2.tar.bz2 pam-396ef3a1c93457fe66391627eb996b920be94fb2.zip | |
Revert "pam_unix: Add crypt_default method, if supported."
This reverts commit ad435b386b22b456724dc5c5b8d9f2d1beffc558.
Diffstat (limited to 'modules/pam_unix/passverify.c')
| -rw-r--r-- | modules/pam_unix/passverify.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c index 0a4c67b4..eb2444bb 100644 --- a/modules/pam_unix/passverify.c +++ b/modules/pam_unix/passverify.c @@ -395,14 +395,6 @@ PAMH_ARG_DECL(char * create_password_hash, if (on(UNIX_MD5_PASS, ctrl)) { /* algoid = "$1" */ return crypt_md5_wrapper(password); -#if (defined(CRYPT_PREFERRED_METHOD_AVAILABLE) && CRYPT_PREFERRED_METHOD_AVAILABLE) - } else if (on(UNIX_CRYPT_DEFAULT_PASS, ctrl) - && crypt_preferred_method() != NULL) { - algoid = crypt_preferred_method(); - rounds = 0; /* always use the system preset */ -#endif - } else if (on(UNIX_CRYPT_DEFAULT_PASS, ctrl)) { - algoid = "*0"; /* never ever a valid method */ } else if (on(UNIX_YESCRYPT_PASS, ctrl)) { algoid = "$y$"; } else if (on(UNIX_GOST_YESCRYPT_PASS, ctrl)) { @@ -469,7 +461,6 @@ PAMH_ARG_DECL(char * create_password_hash, pam_syslog(pamh, LOG_ERR, "Algo %s not supported by the crypto backend, " "falling back to MD5\n", - on(UNIX_CRYPT_DEFAULT_PASS, ctrl) ? "crypt_default \"" algoid "\"" : on(UNIX_YESCRYPT_PASS, ctrl) ? "yescrypt" : on(UNIX_GOST_YESCRYPT_PASS, ctrl) ? "gost_yescrypt" : on(UNIX_BLOWFISH_PASS, ctrl) ? "blowfish" : |