Commit d2887466 authored by mullers's avatar mullers
Browse files

TC_SEC_6186_01 corrected

parent 76c21ec2
Loading
Loading
Loading
Loading
+29 −2
Original line number Diff line number Diff line
@@ -971,6 +971,12 @@
		template IkePayloadList mw_ikeSaInitRspPLL :=
		superset ( mw_securityAssociationIkePL, mw_noncePL, mw_keyExchangePL);

		template IkePayloadList mw_ikeSaInitRspPLL_additionalNotify :=
		superset ( mw_securityAssociationIkePL, mw_noncePL, mw_keyExchangePL, mw_notifyAnyPL);

		template IkePayloadList mw_ikeSaInitRspPLL_additional2Notify :=
		superset ( mw_securityAssociationIkePL, mw_noncePL, mw_keyExchangePL, mw_notifyAnyPL, mw_notifyAnyPL);

		template IkePayloadList mw_ikeSaInitRsp_Notify :=
		superset ( mw_notifyAnyPL);

@@ -1389,6 +1395,20 @@ group payloadTemplates {
			}
		}

		template IkePayload m_notifyPL_IpComp(UInt8 p_nextPL, octetstring p_data) := {
			notify := {
				nextPayload       := p_nextPL,
				criticalFlag      := 0,
				reserved          := c_uInt7Zero,
				payloadLength     := 12,
				protocolId        := c_protocolIke,
				spiSize           := 0,
				notifyMessageType := c_notifyIpcompSupported,
				spi               := omit,
				data              := p_data
			}
		}

		template IkePayload m_notifyPL_cookie(octetstring p_data) := {
			notify := {
				nextPayload       := c_noNextPL,
@@ -1808,6 +1828,13 @@ group cfgPLTmplts {
		attributeValue 	:= omit
	}

	template ConfigAttribute m_internalIpv6AddrCfgAttr := {
		reserved 		:= 0,
		attributeType 	:= c_configInternalIpv6Address,
		attributeLength := 16,
		attributeValue 	:= c_16ZeroBytes
	} 

//	template ConfigAttribute m_reservedCfgAttr (
//		UInt15					p_attributeType,
//		template octetstring	p_attributeValue
+14 −1
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@
		const boolean c_responder := false;
		const octetstring c_authString := '4B65792050616420666F7220494B457632'O // ASCII coding for string 'Key Pad for IKEv2'
		
		/*octetstring represenatation of
		m_saTransform (
											c_moreTransform,
											c_transformTypeInteg,
											m_transformId_integ(vc_ikeSad[0].ikeIntegrityAlgo),
											omit//Attribute
										)
		);*/
		const octetstring c_saTransform_integ :=
		int2oct(8,4)//Last or more + reserved + Transform Length
		& int2oct(3,1)//Transform Type
		& c_1ZeroByte//reserved
		& int2oct(1,2);//transformId		

	} // end group IkeRfc4306CommonConstants