Commit 73b67bef authored by berge's avatar berge
Browse files

Fixed TC_8106_01

parent 2834e1dc
Loading
Loading
Loading
Loading
+53 −67
Changes for ttcn3/EtsiAts/AtsIpv6/AtsSecurity/AtsIpv6_Security_Testcases.ttcn: 53 added lines, 67 removed lines.
Original line number Diff line number Diff line
@@ -2278,7 +2278,7 @@ group ikeProtocol {
				activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

				//Preamble
				f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
				f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

				// test body
				action("Test operator: Configure IUT so that it accepts Echo Request messages only in plaintext mode and sends Echo reply messages only in encrypted mode!");
@@ -2370,7 +2370,7 @@ group ikeProtocol {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		v_ret := f_sndSaInitReqAndWaitForRsp(
@@ -2474,7 +2474,7 @@ group ikeProtocol {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		f_createSaInitReq(
@@ -2487,8 +2487,8 @@ group ikeProtocol {
					
		//"badly formatted"
		//is achieved by setting the keyExchange.nextPayload from c_noncePL to c_noNextPL
		v_index := sizeof(v_ikeSaInitReq.ipv6Payload.ikeMsg.payloadList[0].encrypted.payloadList);
		v_ikeSaInitReq.ipv6Payload.ikeMsg.payloadList[0].encrypted.payloadList[v_index-1].keyExchange.nextPayload := c_noNextPL;
		v_index := sizeof(v_ikeSaInitReq.ipv6Payload.ikeMsg.payloadList);
		v_ikeSaInitReq.ipv6Payload.ikeMsg.payloadList[v_index-2].keyExchange.nextPayload := c_noNextPL;
		v_ret := f_sendIkeSaInitReq (v_ikeSaInitReq);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

@@ -2509,12 +2509,24 @@ group ikeProtocol {
												vc_ikeSad[0].udpTnPort,
												vc_ikeSad[0].spiInitiator,
												vc_ikeSad[0].messageIdTn,
												superset(mw_notifyAnyPL)))
												{mw_notifyAnyPL}))
				{
					tc_wait.stop;
					v_ret := e_success;

				}
			[]	ipPort.receive(mw_ikeSaInitRsp(	v_ikeSrc,
															v_ikeDst,
															vc_ikeSad[0].udpIutPort,
															vc_ikeSad[0].udpTnPort,
															vc_ikeSad[0].spiInitiator,
															vc_ikeSad[0].messageIdTn,
															?))
							{
								tc_wait.stop;
								v_ret := e_error;
								log("**** TC_SEC_6186_01: ERROR: IkeSaInitRsp without Notify payload received **** ");
							}

			[]	tc_wait.timeout
				{
@@ -2524,7 +2536,7 @@ group ikeProtocol {
		} // end alt

		//Postamble
		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -2549,7 +2561,7 @@ group ikeProtocol {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		v_ret := f_sndSaInitReqAndWaitForRsp(
@@ -2607,9 +2619,7 @@ group ikeProtocol {
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -2636,7 +2646,7 @@ group ikeProtocol {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		action("Test operator: Configure IUT so that it accepts Echo Request messages only in plaintext mode and sends Echo reply messages only in encrypted mode!");
@@ -2702,7 +2712,7 @@ group ikeProtocol {
		} // end alt

		//Postamble
		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -2730,7 +2740,7 @@ group ikeProtocol {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		action("Test operator: Configure IUT so that it accepts Echo Request messages only in plaintext mode and sends Echo reply messages only in encrypted mode!");
@@ -2806,7 +2816,7 @@ group ikeProtocol {
		} // end alt

		//Postamble
		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -2830,7 +2840,7 @@ group ikeProtocol {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		//set UDP ports to 500 and send
@@ -2857,7 +2867,7 @@ group ikeProtocol {
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		//Postamble
		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -2881,7 +2891,7 @@ group ikeProtocol {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		//set UDP ports to 4500 and send
@@ -2909,7 +2919,7 @@ group ikeProtocol {
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		//Postamble
		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -3474,7 +3484,7 @@ group generalProtocolHandling{
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		v_ret := f_sndSaInitReqAndWaitForRsp(
@@ -3555,9 +3565,7 @@ group generalProtocolHandling{
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -3582,7 +3590,7 @@ group generalProtocolHandling{
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		v_ret := f_sndSaInitReqAndWaitForRsp(
@@ -3664,9 +3672,7 @@ group generalProtocolHandling{
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -5575,7 +5581,7 @@ group generalProtocolHandling{
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -5621,9 +5627,7 @@ group generalProtocolHandling{
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -5648,7 +5652,7 @@ group generalProtocolHandling{
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -5692,9 +5696,7 @@ group generalProtocolHandling{
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -5718,7 +5720,7 @@ group generalProtocolHandling{
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -5767,9 +5769,7 @@ group generalProtocolHandling{
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -5793,7 +5793,7 @@ group generalProtocolHandling{
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -5841,9 +5841,7 @@ group generalProtocolHandling{
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -5984,7 +5982,7 @@ group securityParameterNegotiation {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -6023,9 +6021,7 @@ group securityParameterNegotiation {
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -6211,7 +6207,7 @@ group securityParameterNegotiation {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -6251,9 +6247,7 @@ group securityParameterNegotiation {
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -6280,7 +6274,7 @@ group securityParameterNegotiation {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		// test body
		f_createSaInitReq(
@@ -6334,9 +6328,7 @@ group securityParameterNegotiation {
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -6367,7 +6359,7 @@ group securityParameterNegotiation {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		//Test body
		action("Test operator: Configure IUT so that it accepts Echo Request messages only in plaintext mode and sends Echo reply messages only in encrypted mode!");
@@ -6427,9 +6419,7 @@ group securityParameterNegotiation {
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagResponder);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -6722,7 +6712,7 @@ group securityParameterNegotiation {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -6820,9 +6810,7 @@ group securityParameterNegotiation {
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;

@@ -6846,7 +6834,7 @@ group securityParameterNegotiation {
		activate(a_tn_nut(v_cfMsg, v_cfMsg.paramsRt01, v_cfMsg.paramsIut));

		//Preamble
		f_PR_tn_nut(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_PR_tn_nut_noEchoProc(v_cfMsg, e_cleanGla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);

		v_ret := f_createIkeSaAndFirstChildSa(
		v_cfMsg.paramsHs02.gla,
@@ -6935,9 +6923,7 @@ group securityParameterNegotiation {
			v_cfMsg.paramsRt01.gla,
			v_cfMsg.paramsIut.gla,
			c_iFlagInitiator);
		if(v_ret != e_success) {f_selfOrClientSyncAndVerdict(c_tbDone, v_ret);}

		f_PO_tn_nut(v_cfMsg, c_cleanOnlyLla, v_cfMsg.paramsRt01, v_cfMsg.paramsIut);
		f_setVerdictPostamble(v_ret);

		deactivate;