change spelling of pbkdf2 files from pbkfd2 (#5593)

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_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 80%
rename from src/tests/modules/pap/pbkfd2_sha1_389ds.attrs
rename to src/tests/modules/pap/pbkdf2_sha1_389ds.attrs
index 3efa4ace0bbbdf2989e285e1342c076895d57ec9..fa487f3ab19d920925b29206a4f79449df536a1b 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha1_389ds.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha1_389ds.attrs
@@ -2,7 +2,7 @@
 #  Input packet
 #
 Packet-Type = Access-Request
-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 be898b42422ed20066f07a5f63310ed33bfaf10c..4527bf84503c867c5fadddbed52267f4a4cba20c 100644 (file)
--- 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') {
        control.Password.PBKDF2 := '{PBKDF2-SHA1}10000$13QEHaJHNKHjlJEXX3ddjG2PpUjx1a83$dzrOWMeLso6J/K+evi4eZbOMcOk='
 
        pap.authorize

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 74%
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 c0423f87668da56d4db88bc57854c502770b8dca..427600c5f2c98bda57003c720818d0a99e00532f 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha1_389ds_with_header.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha1_389ds_with_header.attrs
@@ -2,7 +2,7 @@
 #  Input packet
 #
 Packet-Type = Access-Request
-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 82%
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 a5215cd0b3d3bbf4dcc37b1f924de64111132f4d..f02506929eb352ffbfdb06e17f187104ef3227a3 100644 (file)
--- 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') {
        control.Password.With-Header := '{PBKDF2-SHA1}10000$ooYqHQ0zx2JcxgadlJAVebeCOVYGxwz9$zh5v1+QTaJcRv3yqAuLn7ONN8VE='
 
        pap.authorize

diff --git a/src/tests/modules/pap/pbkfd2_sha512_389ds.attrs b/src/tests/modules/pap/pbkdf2_sha256_389ds.attrs
similarity index 79%
rename from src/tests/modules/pap/pbkfd2_sha512_389ds.attrs
rename to src/tests/modules/pap/pbkdf2_sha256_389ds.attrs
index c82486b5ef755f3ac10da6b1e9953e79f7bafa38..027f1a08b758cb42cf3cb20e54f815dd546b9ea1 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha512_389ds.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha256_389ds.attrs
@@ -2,7 +2,7 @@
 #  Input packet
 #
 Packet-Type = Access-Request
-User-Name = 'pbkfd2_sha512_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 0464b4a59c1d4663eb05769c45ea04af8f14537a..6b91e498813d1121ab5bfb194e2ce032574fb0df 100644 (file)
--- 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') {
        control.Password.PBKDF2 := '{PBKDF2-SHA256}10000$9JjBuTTp9OCwANVzqUrq0QUvXnmDUJrm$f8Jrky2bX3z5eQ2SghxA38QSJ2PQwNenecmV4e4Ejyw='
 
        pap.authorize

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 73%
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 edba410480cde5f650dac9e9b2e84e4d8f3a4745..02754572b06735a6a3512c069fac0cd2a0ce9abf 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha256_389ds_with_header.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha256_389ds_with_header.attrs
@@ -2,7 +2,7 @@
 #  Input packet
 #
 Packet-Type = Access-Request
-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 83%
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 ae898cb62a797af4e1e3a160a3dd8cba37a9ebc6..f497e7ef2a40c7deeb92de2ef28241baba617c36 100644 (file)
--- 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') {
        control.Password.With-Header := '{PBKDF2-SHA256}10000$Y79u61tRN/dthaamikuxU/1PkOSprfbN$stej1qVq0CjglfdkLmwW2C94Hr5WQ20Nj6bIRumMy+E='
 
        pap.authorize

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 (file)
index 0000000..d095f1e
--- /dev/null
+++ b/src/tests/modules/pap/pbkdf2_sha256_legacy_389ds_with_header.attrs
@@ -0,0 +1,11 @@
+#
+#  Input packet
+#
+Packet-Type = Access-Request
+User-Name = 'pbkdf2_sha256_legacy_389ds_with_header'
+User-Password = 'password'
+
+#
+#  Expected answer
+#
+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 26c12e3394566ea66cd51b95c0cc237882c162d3..63161b834785a050a3d32a97622806b8155d5ff8 100644 (file)
--- 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') {
        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'
 
        pap.authorize

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_sha256_389ds.attrs b/src/tests/modules/pap/pbkdf2_sha512_389ds.attrs
similarity index 79%
rename from src/tests/modules/pap/pbkfd2_sha256_389ds.attrs
rename to src/tests/modules/pap/pbkdf2_sha512_389ds.attrs
index a38709286c027256214ea1eb0121dda1f932ed7c..dc0742023f531dcd05cdfeda54c335b4d7cecbb4 100644 (file)
--- a/src/tests/modules/pap/pbkfd2_sha256_389ds.attrs
+++ b/src/tests/modules/pap/pbkdf2_sha512_389ds.attrs
@@ -2,7 +2,7 @@
 #  Input packet
 #
 Packet-Type = Access-Request
-User-Name = 'pbkfd2_sha256_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 77b06655c6ee00bc6c289ff9f3664a524a8f5271..0778c9929d3a6219532a84f1756e633a70da6bbc 100644 (file)
--- 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') {
        control.Password.PBKDF2 := '{PBKDF2-SHA512}10000$N3A054iTXUWq4pN2r/2WuCdRFn6ZJ1G+$5MlwC7KpKbXvjIuCaMaDKYmXSVwbUsgzmovEx73cmuuuA1Vet3IOnV5Mj7nZhb9Y4VlDfT6XLJt0xJlBGWESjw=='
 
        pap.authorize

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 (file)
index 0000000..a1cd254
--- /dev/null
+++ b/src/tests/modules/pap/pbkdf2_sha512_389ds_with_header.attrs
@@ -0,0 +1,11 @@
+#
+#  Input packet
+#
+Packet-Type = Access-Request
+User-Name = 'pbkdf2_sha512_389ds_with_header'
+User-Password = 'password'
+
+#
+#  Expected answer
+#
+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 78da03f1e6fcaa8530cd3642cca34cfe6c5dfd80..8918d88817f4e866c66a692b27a9082023094b59 100644 (file)
--- 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') {
        control.Password.With-Header := '{PBKDF2-SHA512}10000$N3A054iTXUWq4pN2r/2WuCdRFn6ZJ1G+$5MlwC7KpKbXvjIuCaMaDKYmXSVwbUsgzmovEx73cmuuuA1Vet3IOnV5Mj7nZhb9Y4VlDfT6XLJt0xJlBGWESjw=='
 
        pap.authorize

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 (file)
index 28f9ffe..0000000
--- a/src/tests/modules/pap/pbkfd2_sha256_legacy_389ds_with_header.attrs
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#  Input packet
-#
-Packet-Type = Access-Request
-User-Name = 'pbkfd2_sha256_legacy_389ds_with_header'
-User-Password = 'password'
-
-#
-#  Expected answer
-#
-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 (file)
index 5d94080..0000000
--- a/src/tests/modules/pap/pbkfd2_sha512_389ds_with_header.attrs
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#  Input packet
-#
-Packet-Type = Access-Request
-User-Name = 'pbkfd2_sha512_389ds_with_header'
-User-Password = 'password'
-
-#
-#  Expected answer
-#
-Packet-Type == Access-Accept