test/pwhash_argon2i -> test/pwhash

.gitignore

@@ -96,7 +96,7 @@ test/default/hash3
 test/default/onetimeauth
 test/default/onetimeauth2
 test/default/onetimeauth7
-test/default/pwhash_argon2i
+test/default/pwhash
 test/default/pwhash_scrypt
 test/default/pwhash_scrypt_ll
 test/default/randombytes

test/default/Makefile.am

@@ -36,7 +36,7 @@ EXTRA_DIST = \
 	onetimeauth.exp \
 	onetimeauth2.exp \
 	onetimeauth7.exp \
-	pwhash_argon2i.exp \
+	pwhash.exp \
 	pwhash_scrypt.exp \
 	pwhash_scrypt_ll.exp \
 	randombytes.exp \
@@ -98,7 +98,7 @@ DISTCLEANFILES = \
 	onetimeauth.res \
 	onetimeauth2.res \
 	onetimeauth7.res \
-	pwhash_argon2i.res \
+	pwhash.res \
 	pwhash_scrypt.res \
 	pwhash_scrypt_ll.res \
 	randombytes.res \
@@ -161,7 +161,7 @@ CLEANFILES = \
 	onetimeauth.final \
 	onetimeauth2.final \
 	onetimeauth7.final \
-	pwhash_argon2i.final \
+	pwhash.final \
 	pwhash_scrypt.final \
 	pwhash_scrypt_ll.final \
 	randombytes.final \
@@ -219,7 +219,7 @@ CLEANFILES = \
 	onetimeauth.nexe \
 	onetimeauth2.nexe \
 	onetimeauth7.nexe \
-	pwhash_argon2i.nexe \
+	pwhash.nexe \
 	pwhash_scrypt.nexe \
 	pwhash_scrypt_ll.nexe \
 	randombytes.nexe \
@@ -289,7 +289,7 @@ TESTS_TARGETS = \
 	onetimeauth \
 	onetimeauth2 \
 	onetimeauth7 \
-	pwhash_argon2i \
+	pwhash \
 	pwhash_scrypt \
 	pwhash_scrypt_ll \
 	randombytes \
@@ -426,8 +426,8 @@ onetimeauth2_LDADD        = $(TESTS_LDADD)
 onetimeauth7_SOURCE       = cmptest.h onetimeauth7.c
 onetimeauth7_LDADD        = $(TESTS_LDADD)
 
-pwhash_argon2i_SOURCE     = cmptest.h pwhash_argon2i.c
-pwhash_argon2i_LDADD      = $(TESTS_LDADD)
+pwhash_SOURCE             = cmptest.h pwhash.c
+pwhash_LDADD              = $(TESTS_LDADD)
 
 pwhash_scrypt_SOURCE      = cmptest.h pwhash_scrypt.c
 pwhash_scrypt_LDADD       = $(TESTS_LDADD)

test/default/pwhash.c

@@ -1,5 +1,5 @@
 
-#define TEST_NAME "pwhash_argon2i"
+#define TEST_NAME "pwhash"
 #include "cmptest.h"
 
 #define OUT_LEN 128