From: Alan T. DeKok Date: Thu, 26 Oct 2023 15:31:51 +0000 (-0400) Subject: don't use := for tests, it's not needed X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f629ba870918ca8f45be6d53e7f2cf2d242d4ff9;p=thirdparty%2Ffreeradius-server.git don't use := for tests, it's not needed --- diff --git a/src/tests/unit/protocols/radius/rfc2868.txt b/src/tests/unit/protocols/radius/rfc2868.txt index 740528227fe..689c20d015c 100644 --- a/src/tests/unit/protocols/radius/rfc2868.txt +++ b/src/tests/unit/protocols/radius/rfc2868.txt @@ -9,7 +9,7 @@ fuzzer-out radius # # In normal operation, the seed is taken from fr_rand() # -encode-pair Tunnel-Password := "foo" +encode-pair Tunnel-Password = "foo" match 45 15 00 89 73 c6 80 f6 15 54 ac 5a 0f 6d 5b c0 ad 41 f8 0f 1a decode-pair - @@ -20,7 +20,7 @@ match Tunnel-Password = "foo" # # The second one has it's own salt, which includes a counter to guarantee uniqueness. # -encode-pair Tunnel-Password := "foo", Tunnel-Password := "bar" +encode-pair Tunnel-Password = "foo", Tunnel-Password = "bar" match 45 15 00 89 73 c6 80 f6 15 54 ac 5a 0f 6d 5b c0 ad 41 f8 0f 1a 45 15 00 9d c5 c4 69 23 3a 16 57 b3 5c 97 82 3c 97 ec 6b 7e f1 decode-pair - @@ -31,7 +31,7 @@ match Tunnel-Password = "foo", Tunnel-Password = "bar" # different encoded password. Note that the entire encoded string # is different. # -encode-pair Tunnel-Password := "barbar" +encode-pair Tunnel-Password = "barbar" match 45 15 00 80 6f 90 5f e5 ef e3 6f 0e a5 54 4d 7d 75 4d ea 04 c2 decode-pair - diff --git a/src/tests/unit/protocols/radius/tunnel.txt b/src/tests/unit/protocols/radius/tunnel.txt index 40373621cf6..850893e37b8 100644 --- a/src/tests/unit/protocols/radius/tunnel.txt +++ b/src/tests/unit/protocols/radius/tunnel.txt @@ -78,7 +78,7 @@ match Tunnel-Password = "0123456789abcdef" # We can't look at the data here, because the encode-paird Tunnel-Password has a 2 byte # random salt # -encode-pair Tunnel-Password := "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +encode-pair Tunnel-Password = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" decode-pair - match Tunnel-Password = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/src/tests/unit/protocols/radius/unit.txt b/src/tests/unit/protocols/radius/unit.txt index e7463ab30a3..2182f4f84d0 100644 --- a/src/tests/unit/protocols/radius/unit.txt +++ b/src/tests/unit/protocols/radius/unit.txt @@ -60,7 +60,7 @@ match f6 0d 1a 00 00 00 2c 50 01 00 00 00 01 f6 0d 1a 00 00 00 2c 50 01 00 00 00 decode-pair - match Extended-Attribute-6 = { Extended-Vendor-Specific-6 = { FreeRADIUS = { Unit-EVS-6-Integer = 1, Unit-EVS-6-Integer = 2 } } } -encode-pair Event-Timestamp := 864000 +encode-pair Event-Timestamp = 864000 match 37 06 00 0d 2f 00 # Same as from "data_types.txt" diff --git a/src/tests/unit/protocols/radius/wimax.txt b/src/tests/unit/protocols/radius/wimax.txt index 25edadb0802..073d9a5f9c8 100644 --- a/src/tests/unit/protocols/radius/wimax.txt +++ b/src/tests/unit/protocols/radius/wimax.txt @@ -206,22 +206,22 @@ match Vendor-Specific = { WiMAX = { } }, Vendor-Specific.WiMAX.Capability = { Re # # See if encoding multiple attributes works # -encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 33 +encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 33 match 1a 17 00 00 60 b5 1c 11 00 01 04 00 21 02 04 00 21 03 06 00 00 00 21 -encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 33 +encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 33 match 1a 25 00 00 60 b5 1c 1f 00 01 04 00 20 02 04 00 20 03 06 00 00 00 20 01 04 00 21 02 04 00 21 03 06 00 00 00 21 -encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 33, Session-Timeout := 7200 +encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 33, Session-Timeout = 7200 match 1a 25 00 00 60 b5 1c 1f 00 01 04 00 20 02 04 00 20 03 06 00 00 00 20 01 04 00 21 02 04 00 21 03 06 00 00 00 21 1b 06 00 00 1c 20 -encode-pair Acct-Interim-Interval := 3600, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 33, Session-Timeout := 7200 +encode-pair Acct-Interim-Interval = 3600, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 33, Session-Timeout = 7200 match 55 06 00 00 0e 10 1a 25 00 00 60 b5 1c 1f 00 01 04 00 20 02 04 00 20 03 06 00 00 00 20 01 04 00 21 02 04 00 21 03 06 00 00 00 21 1b 06 00 00 1c 20 -pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 32, Session-Timeout := 7200, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 33 -match Vendor-Specific = { WiMAX = { Packet-Flow-Descriptor = { Packet-Data-Flow-Id := 32, Service-Data-Flow-Id := 32, Service-Profile-Id := 32, Packet-Data-Flow-Id := 33, Service-Data-Flow-Id := 33, Service-Profile-Id := 33 } } }, Session-Timeout := 7200 +pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 32, Session-Timeout = 7200, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 33 +match Vendor-Specific = { WiMAX = { Packet-Flow-Descriptor = { Packet-Data-Flow-Id = 32, Service-Data-Flow-Id = 32, Service-Profile-Id = 32, Packet-Data-Flow-Id = 33, Service-Data-Flow-Id = 33, Service-Profile-Id = 33 } } }, Session-Timeout = 7200 -encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 32, Session-Timeout := 7200, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID := 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID := 33 +encode-pair Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 32, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 32, Session-Timeout = 7200, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Packet-Data-Flow-Id = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Data-Flow-ID = 33, Vendor-Specific.WiMAX.Packet-Flow-Descriptor.Service-Profile-ID = 33 match 1a 25 00 00 60 b5 1c 1f 00 01 04 00 20 02 04 00 20 03 06 00 00 00 20 01 04 00 21 02 04 00 21 03 06 00 00 00 21 1b 06 00 00 1c 20 decode-pair -