Adding upstream version 3.2.3+dfsg.upstream/3.2.3+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 604 insertions, 0 deletions

diff --git a/src/tests/eapsim-06/check.gdb b/src/tests/eapsim-06/check.gdb
new file mode 100644
index 0000000..a3bb6be
--- /dev/null
+++ b/src/tests/eapsim-06/check.gdb
@@ -0,0 +1,2 @@
+file ../../modules/rlm_eap/radeapclient
+set args -x localhost auth testing123 <eapsim-in.txt
\ No newline at end of file
diff --git a/src/tests/eapsim-06/client.sh b/src/tests/eapsim-06/client.sh
new file mode 100644
index 0000000..2ae1747
--- /dev/null
+++ b/src/tests/eapsim-06/client.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+../../main/radeapclient -x localhost auth testing123 <eapsim-in.txt
+
+
+
diff --git a/src/tests/eapsim-06/description.txt b/src/tests/eapsim-06/description.txt
new file mode 100644
index 0000000..dacee1a
--- /dev/null
+++ b/src/tests/eapsim-06/description.txt
@@ -0,0 +1,24 @@
+This test is identical to eapsim-05, but uses triplets that come from
+the file simtriplets.dat.
+
+To configure this test, add the following to radiusd.conf:
+
+In modules {},
+
+   sim_files {
+	     simtriplets = "/some/file"
+   }
+
+   (The default is to use ${raddbdir}/simtriplets.dat )
+
+In authorized {}, add:
+
+   sim_files 
+
+before eap.
+
+Of course, you'll already have "sim" listed in the eap{} section of
+modules.
+
+
+   
diff --git a/src/tests/eapsim-06/eapsim-cooked.txt b/src/tests/eapsim-06/eapsim-cooked.txt
new file mode 100644
index 0000000..6597b00
--- /dev/null
+++ b/src/tests/eapsim-06/eapsim-cooked.txt
@@ -0,0 +1,184 @@
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	EAP-Type-Identity = "232420100000015"
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+Sending Access-Request of id 999 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Message = 0x02XX
+rad_recv: Access-Challenge packet from host 127.0.0.1:1812, id=999, length=78
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+<+++ EAP decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0a00000f0200020001000011010100
+<+++ EAP-sim decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0a00000f0200020001000011010100
+	EAP-Sim-Subtype = Start
+	EAP-Sim-VERSION_LIST = 0x000200010000
+	EAP-Sim-FULLAUTH_ID_REQ = 0x0100
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+	EAP-Sim-State = 1
+	EAP-Sim-Subtype = Start
+	EAP-Sim-SELECTED_VERSION = 0x0001
+	EAP-Sim-NONCE_MT = 0x00001b764ea5668faa4b0e7dd876d25753f8
+	EAP-Sim-IDENTITY = 0x000f323332343230313030303030303135
+	EAP-Id = YY
+	EAP-Message = 0x02XX
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+Sending Access-Request of id 999 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Message = 0x02XX
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+rad_recv: Access-Challenge packet from host 127.0.0.1:1812, id=999, length=138
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+<+++ EAP decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+<+++ EAP-sim decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+	EAP-Sim-Subtype = Challenge
+	EAP-Sim-RAND = 0x0000300000000000000000000000000000003100000000000000000000000000000032000000000000000000000000000000
+	EAP-Sim-MAC = 0xYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY
+Input was: 
+   identity: (len=15)323332343230313030303030303135
+   nonce_mt: 1b764ea5668faa4b0e7dd876d25753f8
+   rand0: 00000000000000000000000000000000
+   rand1: 00000000000000000000000000000000
+   rand2: 00000000000000000000000000000000
+   sres0: 30112233
+   sres1: 31112233
+   sres2: 32112233
+   Kc0: 445566778899aabb
+   Kc1: 445566778899aabb
+   Kc2: 445566778899aabb
+   versionlist[2]: 0001
+   select 00 01
+
+
+Output
+mk:         a444d7cc_dd514568_da171dd4_229ed4d1_a088c470
+K_aut:      a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+K_encr:     f544a796_43c4d95f_90aaa5b7_74267742
+msk:        8000f5e4_ed05a9bf_17b9ec6a_27f92d9d_f104966b
+	    03689665_de45db49_82ecdcc4_85c26910_e886de4f
+	    bdfa4218_b4ef2f64_319c9b41_b77b3c90_69d616f9
+	    0781438a
+emsk:       3c87c92f_44193e35_dd18e906_3d7cff8f_cb6d6002
+	    bf233300_5df66776_70086929_f0d27970_3e59c480
+	    675d6b45_0dc6a79a_51dc34b0_7091a5ff_8ca145ce
+	    98accef2
+
+hmac-sha1 key(16): a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+DATA: (96)    01YY0050_120b0000_010d0000_30000000_00000000
+	    00000000_00000000_31000000_00000000_00000000
+	    00000000_32000000_00000000_00000000_00000000
+	    0b050000_00000000_00000000_00000000_00000000
+	    1b764ea5_668faa4b_0e7dd876_d25753f8
+
+hmac-sha1 mac(20): XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX
+MAC check succeed
+
+hmac-sha1 key(16): a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+DATA: (40)    02YY001c_120b0000_0b050000_00000000_00000000
+	    00000000_00000000_30112233_31112233_32112233
+
+hmac-sha1 mac(20): XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+	EAP-Sim-State = 1
+	EAP-Sim-Subtype = Challenge
+	EAP-Id = YY
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Sim-MAC = 0x301122333111223332112233
+	EAP-Sim-KEY = 0xa4c96a3c1b4e1932acc3878decb5d9c6
+	EAP-Message = 0x02XX
+Sending Access-Request of id 999 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Message = 0x02XX
+rad_recv: Access-Accept packet from host 127.0.0.1:1812, id=999, length=177
+	MS-MPPE-Recv-Key = 0x8000f5e4ed05a9bf17b9ec6a27f92d9df104966b03689665de45db4982ecdcc4
+	MS-MPPE-Send-Key = 0x85c26910e886de4fbdfa4218b4ef2f64319c9b41b77b3c9069d616f90781438a
+	EAP-Message = 0x03XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	User-Name = "232420100000015"
+<+++ EAP decoded packet:
+	MS-MPPE-Recv-Key = 0x8000f5e4ed05a9bf17b9ec6a27f92d9df104966b03689665de45db4982ecdcc4
+	MS-MPPE-Send-Key = 0x85c26910e886de4fbdfa4218b4ef2f64319c9b41b77b3c9069d616f90781438a
+	EAP-Message = 0x03XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	User-Name = "232420100000015"
+	EAP-Id = YY
+	EAP-Code = Success
diff --git a/src/tests/eapsim-06/eapsim-in.txt b/src/tests/eapsim-06/eapsim-in.txt
new file mode 100644
index 0000000..5f875cc
--- /dev/null
+++ b/src/tests/eapsim-06/eapsim-in.txt
@@ -0,0 +1,15 @@
+User-Name = "232420100000015"
+NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+EAP-Code = Response
+EAP-Type-Identity = "232420100000015"
+Message-Authenticator = 0
+NAS-Port = 0
+EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+EAP-Sim-Sres1 = 0x30112233
+EAP-Sim-Sres2 = 0x31112233
+EAP-Sim-Sres3 = 0x32112233
+EAP-Sim-KC1 = 0x445566778899AABB
+EAP-Sim-KC2 = 0x445566778899AABB
+EAP-Sim-KC3 = 0x445566778899AABB
diff --git a/src/tests/eapsim-06/eapsim-out.txt b/src/tests/eapsim-06/eapsim-out.txt
new file mode 100644
index 0000000..6597b00
--- /dev/null
+++ b/src/tests/eapsim-06/eapsim-out.txt
@@ -0,0 +1,184 @@
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	EAP-Type-Identity = "232420100000015"
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+Sending Access-Request of id 999 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Message = 0x02XX
+rad_recv: Access-Challenge packet from host 127.0.0.1:1812, id=999, length=78
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+<+++ EAP decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0a00000f0200020001000011010100
+<+++ EAP-sim decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0a00000f0200020001000011010100
+	EAP-Sim-Subtype = Start
+	EAP-Sim-VERSION_LIST = 0x000200010000
+	EAP-Sim-FULLAUTH_ID_REQ = 0x0100
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+	EAP-Sim-State = 1
+	EAP-Sim-Subtype = Start
+	EAP-Sim-SELECTED_VERSION = 0x0001
+	EAP-Sim-NONCE_MT = 0x00001b764ea5668faa4b0e7dd876d25753f8
+	EAP-Sim-IDENTITY = 0x000f323332343230313030303030303135
+	EAP-Id = YY
+	EAP-Message = 0x02XX
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+Sending Access-Request of id 999 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Message = 0x02XX
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+rad_recv: Access-Challenge packet from host 127.0.0.1:1812, id=999, length=138
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+<+++ EAP decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+<+++ EAP-sim decoded packet:
+	EAP-Message = 0x01XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Id = YY
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+	EAP-Sim-Subtype = Challenge
+	EAP-Sim-RAND = 0x0000300000000000000000000000000000003100000000000000000000000000000032000000000000000000000000000000
+	EAP-Sim-MAC = 0xYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY
+Input was: 
+   identity: (len=15)323332343230313030303030303135
+   nonce_mt: 1b764ea5668faa4b0e7dd876d25753f8
+   rand0: 00000000000000000000000000000000
+   rand1: 00000000000000000000000000000000
+   rand2: 00000000000000000000000000000000
+   sres0: 30112233
+   sres1: 31112233
+   sres2: 32112233
+   Kc0: 445566778899aabb
+   Kc1: 445566778899aabb
+   Kc2: 445566778899aabb
+   versionlist[2]: 0001
+   select 00 01
+
+
+Output
+mk:         a444d7cc_dd514568_da171dd4_229ed4d1_a088c470
+K_aut:      a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+K_encr:     f544a796_43c4d95f_90aaa5b7_74267742
+msk:        8000f5e4_ed05a9bf_17b9ec6a_27f92d9d_f104966b
+	    03689665_de45db49_82ecdcc4_85c26910_e886de4f
+	    bdfa4218_b4ef2f64_319c9b41_b77b3c90_69d616f9
+	    0781438a
+emsk:       3c87c92f_44193e35_dd18e906_3d7cff8f_cb6d6002
+	    bf233300_5df66776_70086929_f0d27970_3e59c480
+	    675d6b45_0dc6a79a_51dc34b0_7091a5ff_8ca145ce
+	    98accef2
+
+hmac-sha1 key(16): a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+DATA: (96)    01YY0050_120b0000_010d0000_30000000_00000000
+	    00000000_00000000_31000000_00000000_00000000
+	    00000000_32000000_00000000_00000000_00000000
+	    0b050000_00000000_00000000_00000000_00000000
+	    1b764ea5_668faa4b_0e7dd876_d25753f8
+
+hmac-sha1 mac(20): XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX
+MAC check succeed
+
+hmac-sha1 key(16): a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+DATA: (40)    02YY001c_120b0000_0b050000_00000000_00000000
+	    00000000_00000000_30112233_31112233_32112233
+
+hmac-sha1 mac(20): XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX_XXXXXXXX
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+	EAP-Sim-State = 1
+	EAP-Sim-Subtype = Challenge
+	EAP-Id = YY
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Sim-MAC = 0x301122333111223332112233
+	EAP-Sim-KEY = 0xa4c96a3c1b4e1932acc3878decb5d9c6
+	EAP-Message = 0x02XX
+Sending Access-Request of id 999 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	NAS-Port = 0
+	State = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	EAP-Message = 0x02XX
+rad_recv: Access-Accept packet from host 127.0.0.1:1812, id=999, length=177
+	MS-MPPE-Recv-Key = 0x8000f5e4ed05a9bf17b9ec6a27f92d9df104966b03689665de45db4982ecdcc4
+	MS-MPPE-Send-Key = 0x85c26910e886de4fbdfa4218b4ef2f64319c9b41b77b3c9069d616f90781438a
+	EAP-Message = 0x03XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	User-Name = "232420100000015"
+<+++ EAP decoded packet:
+	MS-MPPE-Recv-Key = 0x8000f5e4ed05a9bf17b9ec6a27f92d9df104966b03689665de45db4982ecdcc4
+	MS-MPPE-Send-Key = 0x85c26910e886de4fbdfa4218b4ef2f64319c9b41b77b3c9069d616f90781438a
+	EAP-Message = 0x03XX
+	Message-Authenticator = 0xABCDABCDABCDABCDABCDABCDABCDABCD
+	User-Name = "232420100000015"
+	EAP-Id = YY
+	EAP-Code = Success
diff --git a/src/tests/eapsim-06/eapsim-raw.txt b/src/tests/eapsim-06/eapsim-raw.txt
new file mode 100644
index 0000000..a2b0836
--- /dev/null
+++ b/src/tests/eapsim-06/eapsim-raw.txt
@@ -0,0 +1,184 @@
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	EAP-Type-Identity = "232420100000015"
+	Message-Authenticator = 0x30
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+Sending Access-Request of id 22 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0x00000000000000000000000000000000
+	NAS-Port = 0
+	EAP-Message = 0x0215001401323332343230313030303030303135
+rad_recv: Access-Challenge packet from host 127.0.0.1:1812, id=22, length=78
+	EAP-Message = 0x01270014120a00000f0200020001000011010100
+	Message-Authenticator = 0x77ea02a9c89f5e87f5ce65c10877232f
+	State = 0xf0524fef7731860cc1d28b0dc573017c
+<+++ EAP decoded packet:
+	EAP-Message = 0x01270014120a00000f0200020001000011010100
+	Message-Authenticator = 0x77ea02a9c89f5e87f5ce65c10877232f
+	State = 0xf0524fef7731860cc1d28b0dc573017c
+	EAP-Id = 39
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0a00000f0200020001000011010100
+<+++ EAP-sim decoded packet:
+	EAP-Message = 0x01270014120a00000f0200020001000011010100
+	Message-Authenticator = 0x77ea02a9c89f5e87f5ce65c10877232f
+	State = 0xf0524fef7731860cc1d28b0dc573017c
+	EAP-Id = 39
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0a00000f0200020001000011010100
+	EAP-Sim-Subtype = Start
+	EAP-Sim-VERSION_LIST = 0x000200010000
+	EAP-Sim-FULLAUTH_ID_REQ = 0x0100
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	Message-Authenticator = 0x00000000000000000000000000000000
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+	EAP-Sim-State = 1
+	EAP-Sim-Subtype = Start
+	EAP-Sim-SELECTED_VERSION = 0x0001
+	EAP-Sim-NONCE_MT = 0x00001b764ea5668faa4b0e7dd876d25753f8
+	EAP-Sim-IDENTITY = 0x000f323332343230313030303030303135
+	EAP-Id = 39
+	EAP-Message = 0x02270034120a000010010001070500001b764ea5668faa4b0e7dd876d25753f80e05000f32333234323031303030303030313500
+	State = 0xf0524fef7731860cc1d28b0dc573017c
+Sending Access-Request of id 23 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0x00000000000000000000000000000000
+	NAS-Port = 0
+	EAP-Message = 0x02270034120a000010010001070500001b764ea5668faa4b0e7dd876d25753f80e05000f32333234323031303030303030313500
+	State = 0xf0524fef7731860cc1d28b0dc573017c
+rad_recv: Access-Challenge packet from host 127.0.0.1:1812, id=23, length=138
+	EAP-Message = 0x01280050120b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000a91362adf370809ac998c123ebcb32bd
+	Message-Authenticator = 0x2a36d73274543865af44e142fcce7723
+	State = 0x73765e7615012c333beac9182696279c
+<+++ EAP decoded packet:
+	EAP-Message = 0x01280050120b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000a91362adf370809ac998c123ebcb32bd
+	Message-Authenticator = 0x2a36d73274543865af44e142fcce7723
+	State = 0x73765e7615012c333beac9182696279c
+	EAP-Id = 40
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000a91362adf370809ac998c123ebcb32bd
+<+++ EAP-sim decoded packet:
+	EAP-Message = 0x01280050120b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000a91362adf370809ac998c123ebcb32bd
+	Message-Authenticator = 0x2a36d73274543865af44e142fcce7723
+	State = 0x73765e7615012c333beac9182696279c
+	EAP-Id = 40
+	EAP-Code = Request
+	EAP-Type-SIM = 0x0b0000010d00003000000000000000000000000000000031000000000000000000000000000000320000000000000000000000000000000b050000a91362adf370809ac998c123ebcb32bd
+	EAP-Sim-Subtype = Challenge
+	EAP-Sim-RAND = 0x0000300000000000000000000000000000003100000000000000000000000000000032000000000000000000000000000000
+	EAP-Sim-MAC = 0x0000a91362adf370809ac998c123ebcb32bd
+Input was: 
+   identity: (len=15)323332343230313030303030303135
+   nonce_mt: 1b764ea5668faa4b0e7dd876d25753f8
+   rand0: 00000000000000000000000000000000
+   rand1: 00000000000000000000000000000000
+   rand2: 00000000000000000000000000000000
+   sres0: 30112233
+   sres1: 31112233
+   sres2: 32112233
+   Kc0: 445566778899aabb
+   Kc1: 445566778899aabb
+   Kc2: 445566778899aabb
+   versionlist[2]: 0001
+   select 00 01
+
+
+Output
+mk:         a444d7cc_dd514568_da171dd4_229ed4d1_a088c470
+K_aut:      a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+K_encr:     f544a796_43c4d95f_90aaa5b7_74267742
+msk:        8000f5e4_ed05a9bf_17b9ec6a_27f92d9d_f104966b
+	    03689665_de45db49_82ecdcc4_85c26910_e886de4f
+	    bdfa4218_b4ef2f64_319c9b41_b77b3c90_69d616f9
+	    0781438a
+emsk:       3c87c92f_44193e35_dd18e906_3d7cff8f_cb6d6002
+	    bf233300_5df66776_70086929_f0d27970_3e59c480
+	    675d6b45_0dc6a79a_51dc34b0_7091a5ff_8ca145ce
+	    98accef2
+
+hmac-sha1 key(16): a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+DATA: (96)    01280050_120b0000_010d0000_30000000_00000000
+	    00000000_00000000_31000000_00000000_00000000
+	    00000000_32000000_00000000_00000000_00000000
+	    0b050000_00000000_00000000_00000000_00000000
+	    1b764ea5_668faa4b_0e7dd876_d25753f8
+
+hmac-sha1 mac(20): a91362ad_f370809a_c998c123_ebcb32bd_6a2915c2
+MAC check succeed
+
+hmac-sha1 key(16): a4c96a3c_1b4e1932_acc3878d_ecb5d9c6
+DATA: (40)    0228001c_120b0000_0b050000_00000000_00000000
+	    00000000_00000000_30112233_31112233_32112233
+
+hmac-sha1 mac(20): 7a3818ad_17959b80_99cd84eb_64e45346_d63098e9
+
++++> About to send encoded packet:
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	EAP-Code = Response
+	Message-Authenticator = 0x00000000000000000000000000000000
+	NAS-Port = 0
+	EAP-Sim-Rand1 = 0x30000000000000000000000000000000
+	EAP-Sim-Rand2 = 0x31000000000000000000000000000000
+	EAP-Sim-Rand3 = 0x32000000000000000000000000000000
+	EAP-Sim-SRES1 = 0x30112233
+	EAP-Sim-SRES2 = 0x31112233
+	EAP-Sim-SRES3 = 0x32112233
+	EAP-Sim-KC1 = 0x445566778899aabb
+	EAP-Sim-KC2 = 0x445566778899aabb
+	EAP-Sim-KC3 = 0x445566778899aabb
+	EAP-Sim-State = 1
+	EAP-Sim-Subtype = Challenge
+	EAP-Id = 40
+	State = 0x73765e7615012c333beac9182696279c
+	EAP-Sim-MAC = 0x301122333111223332112233
+	EAP-Sim-KEY = 0xa4c96a3c1b4e1932acc3878decb5d9c6
+	EAP-Message = 0x0228001c120b00000b0500007a3818ad17959b8099cd84eb64e45346
+Sending Access-Request of id 24 to 127.0.0.1:1812
+	User-Name = "232420100000015"
+	NAS-IP-Address = marajade.sandelman.ottawa.on.ca
+	Message-Authenticator = 0x00000000000000000000000000000000
+	NAS-Port = 0
+	State = 0x73765e7615012c333beac9182696279c
+	EAP-Message = 0x0228001c120b00000b0500007a3818ad17959b8099cd84eb64e45346
+rad_recv: Access-Accept packet from host 127.0.0.1:1812, id=24, length=177
+	MS-MPPE-Recv-Key = 0x8000f5e4ed05a9bf17b9ec6a27f92d9df104966b03689665de45db4982ecdcc4
+	MS-MPPE-Send-Key = 0x85c26910e886de4fbdfa4218b4ef2f64319c9b41b77b3c9069d616f90781438a
+	EAP-Message = 0x03000004
+	Message-Authenticator = 0xc34c14d1a9c794cbc3f7c5c274831277
+	User-Name = "232420100000015"
+<+++ EAP decoded packet:
+	MS-MPPE-Recv-Key = 0x8000f5e4ed05a9bf17b9ec6a27f92d9df104966b03689665de45db4982ecdcc4
+	MS-MPPE-Send-Key = 0x85c26910e886de4fbdfa4218b4ef2f64319c9b41b77b3c9069d616f90781438a
+	EAP-Message = 0x03000004
+	Message-Authenticator = 0xc34c14d1a9c794cbc3f7c5c274831277
+	User-Name = "232420100000015"
+	EAP-Id = 0
+	EAP-Code = Success
diff --git a/src/tests/eapsim-06/simtriplets.dat b/src/tests/eapsim-06/simtriplets.dat
new file mode 100644
index 0000000..3a64447
--- /dev/null
+++ b/src/tests/eapsim-06/simtriplets.dat
@@ -0,0 +1,5 @@
+232420100000015,30000000000000000000000000000000,30112233,445566778899AABB
+232420100000015,31000000000000000000000000000000,31112233,445566778899AABB
+232420100000015,32000000000000000000000000000000,32112233,445566778899AABB
+232420100000015,33000000000000000000000000000000,33112233,445566778899AABB
+232420100000015,34000000000000000000000000000000,34112233,445566778899AABB