From: Thorsten Kukuk Date: Fri, 8 Nov 2013 14:35:41 +0000 (+0100) Subject: Allow DES as compatibility option for /etc/login.defs X-Git-Tag: Linux-PAM-1_2_0~72 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cfee1810d7756fdae56b5757b6bf8e8bec92495;p=linux-pam Allow DES as compatibility option for /etc/login.defs * modules/pam_unix/support.h: Add UNIX_DES --- diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h index 65759384..6f5b2eb6 100644 --- a/modules/pam_unix/support.h +++ b/modules/pam_unix/support.h @@ -97,8 +97,9 @@ typedef struct { password hash algorithms */ #define UNIX_BLOWFISH_PASS 26 /* new password hashes will use blowfish */ #define UNIX_MIN_PASS_LEN 27 /* min length for password */ +#define UNIX_DES 28 /* DES, default */ /* -------------- */ -#define UNIX_CTRLS_ 28 /* number of ctrl arguments defined */ +#define UNIX_CTRLS_ 29 /* number of ctrl arguments defined */ #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)) @@ -135,6 +136,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = /* UNIX_ALGO_ROUNDS */ {"rounds=", _ALL_ON_, 0100000000, 0}, /* UNIX_BLOWFISH_PASS */ {"blowfish", _ALL_ON_^(0260420000), 0200000000, 1}, /* UNIX_MIN_PASS_LEN */ {"minlen=", _ALL_ON_, 0400000000, 0}, +/* UNIX_DES */ {"des", _ALL_ON_^(0260420000), 0, 1}, }; #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag)