From: Gerald Vogt <gvde@users.noreply.github.com>
Date: Fri, 23 May 2025 14:13:47 +0000 (+0200)
Subject: change spelling of pbkdf2 test files from pbkfd2 (#5594)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4067ad7b886dac74fefe59b86a070010ac4e7ac4;p=thirdparty%2Ffreeradius-server.git

change spelling of pbkdf2 test files from pbkfd2 (#5594)
---

diff --git a/src/tests/modules/pap/pbkfd2_dig_big.attrs b/src/tests/modules/pap/pbkdf2_dig_big.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_dig_big.attrs
rename to src/tests/modules/pap/pbkdf2_dig_big.attrs
diff --git a/src/tests/modules/pap/pbkfd2_dig_big.unlang b/src/tests/modules/pap/pbkdf2_dig_big.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_dig_big.unlang
rename to src/tests/modules/pap/pbkdf2_dig_big.unlang
diff --git a/src/tests/modules/pap/pbkfd2_dig_small.attrs b/src/tests/modules/pap/pbkdf2_dig_small.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_dig_small.attrs
rename to src/tests/modules/pap/pbkdf2_dig_small.attrs
diff --git a/src/tests/modules/pap/pbkfd2_dig_small.unlang b/src/tests/modules/pap/pbkdf2_dig_small.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_dig_small.unlang
rename to src/tests/modules/pap/pbkdf2_dig_small.unlang
diff --git a/src/tests/modules/pap/pbkfd2_iter0.attrs b/src/tests/modules/pap/pbkdf2_iter0.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter0.attrs
rename to src/tests/modules/pap/pbkdf2_iter0.attrs
diff --git a/src/tests/modules/pap/pbkfd2_iter0.unlang b/src/tests/modules/pap/pbkdf2_iter0.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter0.unlang
rename to src/tests/modules/pap/pbkdf2_iter0.unlang
diff --git a/src/tests/modules/pap/pbkfd2_iter1.attrs b/src/tests/modules/pap/pbkdf2_iter1.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter1.attrs
rename to src/tests/modules/pap/pbkdf2_iter1.attrs
diff --git a/src/tests/modules/pap/pbkfd2_iter1.unlang b/src/tests/modules/pap/pbkdf2_iter1.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter1.unlang
rename to src/tests/modules/pap/pbkdf2_iter1.unlang
diff --git a/src/tests/modules/pap/pbkfd2_iter1000.attrs b/src/tests/modules/pap/pbkdf2_iter1000.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter1000.attrs
rename to src/tests/modules/pap/pbkdf2_iter1000.attrs
diff --git a/src/tests/modules/pap/pbkfd2_iter1000.unlang b/src/tests/modules/pap/pbkdf2_iter1000.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter1000.unlang
rename to src/tests/modules/pap/pbkdf2_iter1000.unlang
diff --git a/src/tests/modules/pap/pbkfd2_iter100000.attrs b/src/tests/modules/pap/pbkdf2_iter100000.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter100000.attrs
rename to src/tests/modules/pap/pbkdf2_iter100000.attrs
diff --git a/src/tests/modules/pap/pbkfd2_iter100000.unlang b/src/tests/modules/pap/pbkdf2_iter100000.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter100000.unlang
rename to src/tests/modules/pap/pbkdf2_iter100000.unlang
diff --git a/src/tests/modules/pap/pbkfd2_iter_big.attrs b/src/tests/modules/pap/pbkdf2_iter_big.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter_big.attrs
rename to src/tests/modules/pap/pbkdf2_iter_big.attrs
diff --git a/src/tests/modules/pap/pbkfd2_iter_big.unlang b/src/tests/modules/pap/pbkdf2_iter_big.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter_big.unlang
rename to src/tests/modules/pap/pbkdf2_iter_big.unlang
diff --git a/src/tests/modules/pap/pbkfd2_iter_miss.attrs b/src/tests/modules/pap/pbkdf2_iter_miss.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter_miss.attrs
rename to src/tests/modules/pap/pbkdf2_iter_miss.attrs
diff --git a/src/tests/modules/pap/pbkfd2_iter_miss.unlang b/src/tests/modules/pap/pbkdf2_iter_miss.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter_miss.unlang
rename to src/tests/modules/pap/pbkdf2_iter_miss.unlang
diff --git a/src/tests/modules/pap/pbkfd2_iter_small.attrs b/src/tests/modules/pap/pbkdf2_iter_small.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter_small.attrs
rename to src/tests/modules/pap/pbkdf2_iter_small.attrs
diff --git a/src/tests/modules/pap/pbkfd2_iter_small.unlang b/src/tests/modules/pap/pbkdf2_iter_small.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_iter_small.unlang
rename to src/tests/modules/pap/pbkdf2_iter_small.unlang
diff --git a/src/tests/modules/pap/pbkfd2_passlib.attrs b/src/tests/modules/pap/pbkdf2_passlib.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_passlib.attrs
rename to src/tests/modules/pap/pbkdf2_passlib.attrs
diff --git a/src/tests/modules/pap/pbkfd2_passlib.unlang b/src/tests/modules/pap/pbkdf2_passlib.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_passlib.unlang
rename to src/tests/modules/pap/pbkdf2_passlib.unlang
diff --git a/src/tests/modules/pap/pbkfd2_salt0.attrs b/src/tests/modules/pap/pbkdf2_salt0.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt0.attrs
rename to src/tests/modules/pap/pbkdf2_salt0.attrs
diff --git a/src/tests/modules/pap/pbkfd2_salt0.unlang b/src/tests/modules/pap/pbkdf2_salt0.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt0.unlang
rename to src/tests/modules/pap/pbkdf2_salt0.unlang
diff --git a/src/tests/modules/pap/pbkfd2_salt1.attrs b/src/tests/modules/pap/pbkdf2_salt1.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt1.attrs
rename to src/tests/modules/pap/pbkdf2_salt1.attrs
diff --git a/src/tests/modules/pap/pbkfd2_salt1.unlang b/src/tests/modules/pap/pbkdf2_salt1.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt1.unlang
rename to src/tests/modules/pap/pbkdf2_salt1.unlang
diff --git a/src/tests/modules/pap/pbkfd2_salt1024.attrs b/src/tests/modules/pap/pbkdf2_salt1024.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt1024.attrs
rename to src/tests/modules/pap/pbkdf2_salt1024.attrs
diff --git a/src/tests/modules/pap/pbkfd2_salt1024.unlang b/src/tests/modules/pap/pbkdf2_salt1024.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt1024.unlang
rename to src/tests/modules/pap/pbkdf2_salt1024.unlang
diff --git a/src/tests/modules/pap/pbkfd2_salt64.attrs b/src/tests/modules/pap/pbkdf2_salt64.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt64.attrs
rename to src/tests/modules/pap/pbkdf2_salt64.attrs
diff --git a/src/tests/modules/pap/pbkfd2_salt64.unlang b/src/tests/modules/pap/pbkdf2_salt64.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt64.unlang
rename to src/tests/modules/pap/pbkdf2_salt64.unlang
diff --git a/src/tests/modules/pap/pbkfd2_salt_big.attrs b/src/tests/modules/pap/pbkdf2_salt_big.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt_big.attrs
rename to src/tests/modules/pap/pbkdf2_salt_big.attrs
diff --git a/src/tests/modules/pap/pbkfd2_salt_big.unlang b/src/tests/modules/pap/pbkdf2_salt_big.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt_big.unlang
rename to src/tests/modules/pap/pbkdf2_salt_big.unlang
diff --git a/src/tests/modules/pap/pbkfd2_salt_small.attrs b/src/tests/modules/pap/pbkdf2_salt_small.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt_small.attrs
rename to src/tests/modules/pap/pbkdf2_salt_small.attrs
diff --git a/src/tests/modules/pap/pbkfd2_salt_small.unlang b/src/tests/modules/pap/pbkdf2_salt_small.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_salt_small.unlang
rename to src/tests/modules/pap/pbkdf2_salt_small.unlang
diff --git a/src/tests/modules/pap/pbkfd2_sha1.attrs b/src/tests/modules/pap/pbkdf2_sha1.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha1.attrs
rename to src/tests/modules/pap/pbkdf2_sha1.attrs
diff --git a/src/tests/modules/pap/pbkfd2_sha1.unlang b/src/tests/modules/pap/pbkdf2_sha1.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha1.unlang
rename to src/tests/modules/pap/pbkdf2_sha1.unlang
diff --git a/src/tests/modules/pap/pbkfd2_sha1_389ds.attrs b/src/tests/modules/pap/pbkdf2_sha1_389ds.attrs
similarity index 77%
rename from src/tests/modules/pap/pbkfd2_sha1_389ds.attrs
rename to src/tests/modules/pap/pbkdf2_sha1_389ds.attrs
index bea77bdbc3..a4fe12029f 100644
--- a/src/tests/modules/pap/pbkfd2_sha1_389ds.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha1_389ds.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'pbkfd2_sha1_389ds'
+User-Name = 'pbkdf2_sha1_389ds'
 User-Password = 'password'
 
 #
diff --git a/src/tests/modules/pap/pbkfd2_sha1_389ds.unlang b/src/tests/modules/pap/pbkdf2_sha1_389ds.unlang
similarity index 86%
rename from src/tests/modules/pap/pbkfd2_sha1_389ds.unlang
rename to src/tests/modules/pap/pbkdf2_sha1_389ds.unlang
index 6c11f3581e..a148243915 100644
--- a/src/tests/modules/pap/pbkfd2_sha1_389ds.unlang
+++ b/src/tests/modules/pap/pbkdf2_sha1_389ds.unlang
@@ -3,7 +3,7 @@ if ("${feature.tls}" == no) {
 	return
 }
 
-if (User-Name == 'pbkfd2_sha1_389ds') {
+if (User-Name == 'pbkdf2_sha1_389ds') {
 	update control {
 		&PBKDF2-Password := '{PBKDF2-SHA1}10000$13QEHaJHNKHjlJEXX3ddjG2PpUjx1a83$dzrOWMeLso6J/K+evi4eZbOMcOk='
 	}
diff --git a/src/tests/modules/pap/pbkfd2_sha1_389ds_with_header.attrs b/src/tests/modules/pap/pbkdf2_sha1_389ds_with_header.attrs
similarity index 71%
rename from src/tests/modules/pap/pbkfd2_sha1_389ds_with_header.attrs
rename to src/tests/modules/pap/pbkdf2_sha1_389ds_with_header.attrs
index b4b42d7f04..ddbc4d3d67 100644
--- a/src/tests/modules/pap/pbkfd2_sha1_389ds_with_header.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha1_389ds_with_header.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'pbkfd2_sha1_389ds_with_header'
+User-Name = 'pbkdf2_sha1_389ds_with_header'
 User-Password = 'password'
 
 #
diff --git a/src/tests/modules/pap/pbkfd2_sha1_389ds_with_header.unlang b/src/tests/modules/pap/pbkdf2_sha1_389ds_with_header.unlang
similarity index 83%
rename from src/tests/modules/pap/pbkfd2_sha1_389ds_with_header.unlang
rename to src/tests/modules/pap/pbkdf2_sha1_389ds_with_header.unlang
index ec14af9bea..a1f5fe952a 100644
--- a/src/tests/modules/pap/pbkfd2_sha1_389ds_with_header.unlang
+++ b/src/tests/modules/pap/pbkdf2_sha1_389ds_with_header.unlang
@@ -3,7 +3,7 @@ if ("${feature.tls}" == no) {
 	return
 }
 
-if (User-Name == 'pbkfd2_sha1_389ds_with_header') {
+if (User-Name == 'pbkdf2_sha1_389ds_with_header') {
 	update control {
 		Password-With-Header := '{PBKDF2-SHA1}10000$ooYqHQ0zx2JcxgadlJAVebeCOVYGxwz9$zh5v1+QTaJcRv3yqAuLn7ONN8VE='
 	}
diff --git a/src/tests/modules/pap/pbkfd2_sha256_389ds.attrs b/src/tests/modules/pap/pbkdf2_sha256_389ds.attrs
similarity index 76%
rename from src/tests/modules/pap/pbkfd2_sha256_389ds.attrs
rename to src/tests/modules/pap/pbkdf2_sha256_389ds.attrs
index 5cb8ef3531..87ba299c7b 100644
--- a/src/tests/modules/pap/pbkfd2_sha256_389ds.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha256_389ds.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'pbkfd2_sha256_389ds'
+User-Name = 'pbkdf2_sha256_389ds'
 User-Password = 'password'
 
 #
diff --git a/src/tests/modules/pap/pbkfd2_sha256_389ds.unlang b/src/tests/modules/pap/pbkdf2_sha256_389ds.unlang
similarity index 86%
rename from src/tests/modules/pap/pbkfd2_sha256_389ds.unlang
rename to src/tests/modules/pap/pbkdf2_sha256_389ds.unlang
index c8f31ecbf9..97e7a98cd9 100644
--- a/src/tests/modules/pap/pbkfd2_sha256_389ds.unlang
+++ b/src/tests/modules/pap/pbkdf2_sha256_389ds.unlang
@@ -3,7 +3,7 @@ if ("${feature.tls}" == no) {
 	return
 }
 
-if (User-Name == 'pbkfd2_sha256_389ds') {
+if (User-Name == 'pbkdf2_sha256_389ds') {
 	update control {
 		&PBKDF2-Password := '{PBKDF2-SHA256}10000$9JjBuTTp9OCwANVzqUrq0QUvXnmDUJrm$f8Jrky2bX3z5eQ2SghxA38QSJ2PQwNenecmV4e4Ejyw='
 	}
diff --git a/src/tests/modules/pap/pbkfd2_sha256_389ds_with_header.attrs b/src/tests/modules/pap/pbkdf2_sha256_389ds_with_header.attrs
similarity index 70%
rename from src/tests/modules/pap/pbkfd2_sha256_389ds_with_header.attrs
rename to src/tests/modules/pap/pbkdf2_sha256_389ds_with_header.attrs
index b5b3267301..01adacfe13 100644
--- a/src/tests/modules/pap/pbkfd2_sha256_389ds_with_header.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha256_389ds_with_header.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'pbkfd2_sha256_389ds_with_header'
+User-Name = 'pbkdf2_sha256_389ds_with_header'
 User-Password = 'password'
 
 #
diff --git a/src/tests/modules/pap/pbkfd2_sha256_389ds_with_header.unlang b/src/tests/modules/pap/pbkdf2_sha256_389ds_with_header.unlang
similarity index 84%
rename from src/tests/modules/pap/pbkfd2_sha256_389ds_with_header.unlang
rename to src/tests/modules/pap/pbkdf2_sha256_389ds_with_header.unlang
index 10270988cb..ee4e8e0a1b 100644
--- a/src/tests/modules/pap/pbkfd2_sha256_389ds_with_header.unlang
+++ b/src/tests/modules/pap/pbkdf2_sha256_389ds_with_header.unlang
@@ -3,7 +3,7 @@ if ("${feature.tls}" == no) {
 	return
 }
 
-if (User-Name == 'pbkfd2_sha256_389ds_with_header') {
+if (User-Name == 'pbkdf2_sha256_389ds_with_header') {
 	update control {
 		Password-With-Header := '{PBKDF2-SHA256}10000$Y79u61tRN/dthaamikuxU/1PkOSprfbN$stej1qVq0CjglfdkLmwW2C94Hr5WQ20Nj6bIRumMy+E='
 	}
diff --git a/src/tests/modules/pap/pbkdf2_sha256_legacy_389ds_with_header.attrs b/src/tests/modules/pap/pbkdf2_sha256_legacy_389ds_with_header.attrs
new file mode 100644
index 0000000000..3ac8df3d91
--- /dev/null
+++ b/src/tests/modules/pap/pbkdf2_sha256_legacy_389ds_with_header.attrs
@@ -0,0 +1,10 @@
+#
+#  Input packet
+#
+User-Name = 'pbkdf2_sha256_legacy_389ds_with_header'
+User-Password = 'password'
+
+#
+#  Expected answer
+#
+Response-Packet-Type == Access-Accept
diff --git a/src/tests/modules/pap/pbkfd2_sha256_legacy_389ds_with_header.unlang b/src/tests/modules/pap/pbkdf2_sha256_legacy_389ds_with_header.unlang
similarity index 91%
rename from src/tests/modules/pap/pbkfd2_sha256_legacy_389ds_with_header.unlang
rename to src/tests/modules/pap/pbkdf2_sha256_legacy_389ds_with_header.unlang
index bc7b561211..56d29bf4fa 100644
--- a/src/tests/modules/pap/pbkfd2_sha256_legacy_389ds_with_header.unlang
+++ b/src/tests/modules/pap/pbkdf2_sha256_legacy_389ds_with_header.unlang
@@ -3,7 +3,7 @@ if ("${feature.tls}" == no) {
 	return
 }
 
-if (User-Name == 'pbkfd2_sha256_legacy_389ds_with_header') {
+if (User-Name == 'pbkdf2_sha256_legacy_389ds_with_header') {
 	update control {
 		Password-With-Header := '{PBKDF2_SHA256}AAAgAC8OScrYDwaJYr29/qoQ/bcEf+WsQmkZjIFLSIKm1lxzNOSGPQEkueb1J5mWQy8a17m+UAM5jFKKuktMWSTDag9LNVfHTwHocrIsi4GGLf+PSn/eA3+lu5JHVXQo49gbZ+SALQ90cOvor+v+/xa4Q1VPUr42PuvmsdQln6i9jm/j9tVkO06W+CJXvTiCpR+oHiog9v/3s6bHUrWvwNksUe2r2d+MV5IaNdnil7P39qr1BxiKtDiG4d6HyI5aq1VEhJBg6S5ITYQ9iPlDbpoy2MHDLZHNqQduAVnwJuKuHVU3dU+VkynHWm3nGa2hfeV/bD8F8+WYehgL7bJndEzECx1QKuAZO+lK92vIMbZArdMvU6WRjncVlgoJbZtko6tFp1Ew+0VMVX+b6dGED0L391crdsudrTO+/fvU66xH515L'
 	}
diff --git a/src/tests/modules/pap/pbkfd2_sha2_224.attrs b/src/tests/modules/pap/pbkdf2_sha2_224.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_224.attrs
rename to src/tests/modules/pap/pbkdf2_sha2_224.attrs
diff --git a/src/tests/modules/pap/pbkfd2_sha2_224.unlang b/src/tests/modules/pap/pbkdf2_sha2_224.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_224.unlang
rename to src/tests/modules/pap/pbkdf2_sha2_224.unlang
diff --git a/src/tests/modules/pap/pbkfd2_sha2_256.attrs b/src/tests/modules/pap/pbkdf2_sha2_256.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_256.attrs
rename to src/tests/modules/pap/pbkdf2_sha2_256.attrs
diff --git a/src/tests/modules/pap/pbkfd2_sha2_256.unlang b/src/tests/modules/pap/pbkdf2_sha2_256.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_256.unlang
rename to src/tests/modules/pap/pbkdf2_sha2_256.unlang
diff --git a/src/tests/modules/pap/pbkfd2_sha2_384.attrs b/src/tests/modules/pap/pbkdf2_sha2_384.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_384.attrs
rename to src/tests/modules/pap/pbkdf2_sha2_384.attrs
diff --git a/src/tests/modules/pap/pbkfd2_sha2_384.unlang b/src/tests/modules/pap/pbkdf2_sha2_384.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_384.unlang
rename to src/tests/modules/pap/pbkdf2_sha2_384.unlang
diff --git a/src/tests/modules/pap/pbkfd2_sha2_512.attrs b/src/tests/modules/pap/pbkdf2_sha2_512.attrs
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_512.attrs
rename to src/tests/modules/pap/pbkdf2_sha2_512.attrs
diff --git a/src/tests/modules/pap/pbkfd2_sha2_512.unlang b/src/tests/modules/pap/pbkdf2_sha2_512.unlang
similarity index 100%
rename from src/tests/modules/pap/pbkfd2_sha2_512.unlang
rename to src/tests/modules/pap/pbkdf2_sha2_512.unlang
diff --git a/src/tests/modules/pap/pbkfd2_sha512_389ds.attrs b/src/tests/modules/pap/pbkdf2_sha512_389ds.attrs
similarity index 76%
rename from src/tests/modules/pap/pbkfd2_sha512_389ds.attrs
rename to src/tests/modules/pap/pbkdf2_sha512_389ds.attrs
index f51bd331fd..3772db954c 100644
--- a/src/tests/modules/pap/pbkfd2_sha512_389ds.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha512_389ds.attrs
@@ -1,7 +1,7 @@
 #
 #  Input packet
 #
-User-Name = 'pbkfd2_sha512_389ds'
+User-Name = 'pbkdf2_sha512_389ds'
 User-Password = 'password'
 
 #
diff --git a/src/tests/modules/pap/pbkfd2_sha512_389ds.unlang b/src/tests/modules/pap/pbkdf2_sha512_389ds.unlang
similarity index 88%
rename from src/tests/modules/pap/pbkfd2_sha512_389ds.unlang
rename to src/tests/modules/pap/pbkdf2_sha512_389ds.unlang
index 6791096f9a..e843687f63 100644
--- a/src/tests/modules/pap/pbkfd2_sha512_389ds.unlang
+++ b/src/tests/modules/pap/pbkdf2_sha512_389ds.unlang
@@ -3,7 +3,7 @@ if ("${feature.tls}" == no) {
 	return
 }
 
-if (User-Name == 'pbkfd2_sha512_389ds') {
+if (User-Name == 'pbkdf2_sha512_389ds') {
 	update control {
 		&PBKDF2-Password := '{PBKDF2-SHA512}10000$N3A054iTXUWq4pN2r/2WuCdRFn6ZJ1G+$5MlwC7KpKbXvjIuCaMaDKYmXSVwbUsgzmovEx73cmuuuA1Vet3IOnV5Mj7nZhb9Y4VlDfT6XLJt0xJlBGWESjw=='
 	}
diff --git a/src/tests/modules/pap/pbkdf2_sha512_389ds_with_header.attrs b/src/tests/modules/pap/pbkdf2_sha512_389ds_with_header.attrs
new file mode 100644
index 0000000000..65f648dc70
--- /dev/null
+++ b/src/tests/modules/pap/pbkdf2_sha512_389ds_with_header.attrs
@@ -0,0 +1,10 @@
+#
+#  Input packet
+#
+User-Name = 'pbkdf2_sha512_389ds_with_header'
+User-Password = 'password'
+
+#
+#  Expected answer
+#
+Response-Packet-Type == Access-Accept
diff --git a/src/tests/modules/pap/pbkfd2_sha512_389ds_with_header.unlang b/src/tests/modules/pap/pbkdf2_sha512_389ds_with_header.unlang
similarity index 85%
rename from src/tests/modules/pap/pbkfd2_sha512_389ds_with_header.unlang
rename to src/tests/modules/pap/pbkdf2_sha512_389ds_with_header.unlang
index 5cddb47a4b..0785961f6f 100644
--- a/src/tests/modules/pap/pbkfd2_sha512_389ds_with_header.unlang
+++ b/src/tests/modules/pap/pbkdf2_sha512_389ds_with_header.unlang
@@ -3,7 +3,7 @@ if ("${feature.tls}" == no) {
 	return
 }
 
-if (User-Name == 'pbkfd2_sha512_389ds_with_header') {
+if (User-Name == 'pbkdf2_sha512_389ds_with_header') {
 	update control {
 		Password-With-Header := '{PBKDF2-SHA512}10000$N3A054iTXUWq4pN2r/2WuCdRFn6ZJ1G+$5MlwC7KpKbXvjIuCaMaDKYmXSVwbUsgzmovEx73cmuuuA1Vet3IOnV5Mj7nZhb9Y4VlDfT6XLJt0xJlBGWESjw=='
 	}
diff --git a/src/tests/modules/pap/pbkfd2_sha256_legacy_389ds_with_header.attrs b/src/tests/modules/pap/pbkfd2_sha256_legacy_389ds_with_header.attrs
deleted file mode 100644
index f31ce1f934..0000000000
--- a/src/tests/modules/pap/pbkfd2_sha256_legacy_389ds_with_header.attrs
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'pbkfd2_sha256_legacy_389ds_with_header'
-User-Password = 'password'
-
-#
-#  Expected answer
-#
-Response-Packet-Type == Access-Accept
diff --git a/src/tests/modules/pap/pbkfd2_sha512_389ds_with_header.attrs b/src/tests/modules/pap/pbkfd2_sha512_389ds_with_header.attrs
deleted file mode 100644
index 9163b50650..0000000000
--- a/src/tests/modules/pap/pbkfd2_sha512_389ds_with_header.attrs
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#  Input packet
-#
-User-Name = 'pbkfd2_sha512_389ds_with_header'
-User-Password = 'password'
-
-#
-#  Expected answer
-#
-Response-Packet-Type == Access-Accept