summaryrefslogtreecommitdiff
path: root/test-crypt-des.c
diff options
context:
space:
mode:
authorBjörn Esser <besser82@fedoraproject.org>2018-10-29 00:23:10 +0100
committerBjörn Esser <besser82@fedoraproject.org>2018-10-29 15:43:42 +0100
commit37f7f5afaba4c0ae8a4ef7d7e3f8e880e5b315bd (patch)
tree5fea8b85ed4bba7e815314fd07bdfb0004cb10c9 /test-crypt-des.c
parentf67d6080c1d178c3cfe8ec2fb10fa4aad8133a8c (diff)
downloadlibxcrypt-37f7f5afaba4c0ae8a4ef7d7e3f8e880e5b315bd.tar.gz
libxcrypt-37f7f5afaba4c0ae8a4ef7d7e3f8e880e5b315bd.tar.bz2
libxcrypt-37f7f5afaba4c0ae8a4ef7d7e3f8e880e5b315bd.zip
Rename all hash methods to match naming in John the Ripper.
Diffstat (limited to 'test-crypt-des.c')
-rw-r--r--test-crypt-des.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/test-crypt-des.c b/test-crypt-des.c
index f01fee7..fe7c54c 100644
--- a/test-crypt-des.c
+++ b/test-crypt-des.c
@@ -2,7 +2,7 @@
#include <stdio.h>
-#if INCLUDE_des || INCLUDE_des_xbsd || INCLUDE_des_big
+#if INCLUDE_descrypt || INCLUDE_bsdicrypt || INCLUDE_bigcrypt
static const struct
{
@@ -11,7 +11,7 @@ static const struct
const char *input;
} tests[] =
{
-#if INCLUDE_des
+#if INCLUDE_descrypt
/* traditional-DES test vectors from John the Ripper */
{ "CC", "CCNf8Sbh3HDfQ", "U*U*U*U*" },
{ "CC", "CCNf8Sbh3HDfQ", "U*U*U*U*ignored" },
@@ -23,7 +23,7 @@ static const struct
{ "SD", "SDbsugeBiC58A", "" },
#endif
-#if INCLUDE_des_xbsd
+#if INCLUDE_bsdicrypt
/* BSDI-extended-DES, ditto */
{ "_J9..CCCC", "_J9..CCCCXBrJUJV154M", "U*U*U*U*" },
{ "_J9..CCCC", "_J9..CCCCXUhOBTXzaiE", "U*U***U" },
@@ -43,7 +43,7 @@ static const struct
{ "_J9..SDSD", "_J9..SDSD5YGyRCr4W4c", "" },
#endif
-#if INCLUDE_des_big
+#if INCLUDE_bigcrypt
/* 10 bigcrypt test vectors from pw-fake-unix.gz from the openwall
wiki. All have two blocks. The salt is padded with dots because
crypt_r will only use bigcrypt if the setting string begins with