From 66d1c537b872559ffa32ca3907c40fadf3c0d1c0 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Fri, 10 Apr 2009 23:00:50 +0000 Subject: [PATCH] Fix the tests for SHA256 and SHA512 passwords. They were testing DES. --- tests/crypt/login.defs_SHA256/01_chpasswd/shadow | 2 +- tests/crypt/login.defs_SHA256/config/etc/login.defs | 2 +- tests/crypt/login.defs_SHA512/01_chpasswd/shadow | 2 +- tests/crypt/login.defs_SHA512/config/etc/login.defs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/crypt/login.defs_SHA256/01_chpasswd/shadow b/tests/crypt/login.defs_SHA256/01_chpasswd/shadow index 7607cc6e..e16a7b0c 100644 --- a/tests/crypt/login.defs_SHA256/01_chpasswd/shadow +++ b/tests/crypt/login.defs_SHA256/01_chpasswd/shadow @@ -15,5 +15,5 @@ backup:*:12977:0:99999:7::: list:*:12977:0:99999:7::: irc:*:12977:0:99999:7::: gnats:*:12977:0:99999:7::: -nobody:@PASS_DES test@:@TODAY@:0:99999:7::: +nobody:@PASS_SHA256 test@:@TODAY@:0:99999:7::: Debian-exim:!:12977:0:99999:7::: diff --git a/tests/crypt/login.defs_SHA256/config/etc/login.defs b/tests/crypt/login.defs_SHA256/config/etc/login.defs index dff071c6..80010010 100644 --- a/tests/crypt/login.defs_SHA256/config/etc/login.defs +++ b/tests/crypt/login.defs_SHA256/config/etc/login.defs @@ -267,7 +267,7 @@ USERGROUPS_ENAB yes # This variable is used by chpasswd, gpasswd and newusers. # #MD5_CRYPT_ENAB no -ENCRYPT_METHOD DES +ENCRYPT_METHOD SHA256 #SHA_CRYPT_MIN_ROUNDS 5000 #SHA_CRYPT_MAX_ROUNDS 5000 diff --git a/tests/crypt/login.defs_SHA512/01_chpasswd/shadow b/tests/crypt/login.defs_SHA512/01_chpasswd/shadow index 7607cc6e..58222032 100644 --- a/tests/crypt/login.defs_SHA512/01_chpasswd/shadow +++ b/tests/crypt/login.defs_SHA512/01_chpasswd/shadow @@ -15,5 +15,5 @@ backup:*:12977:0:99999:7::: list:*:12977:0:99999:7::: irc:*:12977:0:99999:7::: gnats:*:12977:0:99999:7::: -nobody:@PASS_DES test@:@TODAY@:0:99999:7::: +nobody:@PASS_SHA512 test@:@TODAY@:0:99999:7::: Debian-exim:!:12977:0:99999:7::: diff --git a/tests/crypt/login.defs_SHA512/config/etc/login.defs b/tests/crypt/login.defs_SHA512/config/etc/login.defs index dff071c6..76369b61 100644 --- a/tests/crypt/login.defs_SHA512/config/etc/login.defs +++ b/tests/crypt/login.defs_SHA512/config/etc/login.defs @@ -267,7 +267,7 @@ USERGROUPS_ENAB yes # This variable is used by chpasswd, gpasswd and newusers. # #MD5_CRYPT_ENAB no -ENCRYPT_METHOD DES +ENCRYPT_METHOD SHA512 #SHA_CRYPT_MIN_ROUNDS 5000 #SHA_CRYPT_MAX_ROUNDS 5000