diff --git a/modeling/proverif.xml b/modeling/proverif.xml
index ed70cb2bad46a94db2a39bbffe8f1e686a23dc35..b981ad6b520c152f85cc4e7f813b1bd5322263d6 100644
--- a/modeling/proverif.xml
+++ b/modeling/proverif.xml
@@ -2,314 +2,172 @@
<TURTLEGMODELING version="0.93-beta1">
-<Modeling type="AVATAR Design" nameTab="KeyMasterProtocol" >
+<Modeling type="AVATAR Design" nameTab="Example" >
<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5002" id="1545" >
-<cdparam x="1029" y="448" />
+<CONNECTOR type="5002" id="1574" >
+<cdparam x="693" y="307" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Block0 to Block0" value="" />
-<P1 x="986" y="454" id="1523" />
-<P2 x="986" y="590" id="1532" />
-<Point x="1014" y="454" />
-<Point x="1014" y="589" />
+<P1 x="584" y="286" id="1559" />
+<P2 x="584" y="341" id="1552" />
+<Point x="615" y="286" />
+<Point x="615" y="341" />
<AutomaticDrawing data="true" />
<extraparam>
<iso value="in chin(Message msg)" />
-<iso value="in chinprivate(Message msg)" />
<osd value="out chout(Message msg)" />
-<osd value="out choutprivate(Message msg)" />
-<isd value="in chin(Message msg)" />
-<isd value="in chinprivate(Message msg)" />
-<oso value="out chout(Message msg)" />
-<oso value="out choutprivate(Message msg)" />
-<FIFOType asynchronous="false" size="1" blocking="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="1546" >
-<father id="1545" num="0" />
-<cdparam x="1014" y="454" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1575" >
+<father id="1574" num="0" />
+<cdparam x="615" y="286" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1547" >
-<father id="1545" num="1" />
-<cdparam x="1014" y="589" />
+<SUBCOMPONENT type="-1" id="1576" >
+<father id="1574" num="1" />
+<cdparam x="615" y="341" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<COMPONENT type="301" id="109" >
-<cdparam x="203" y="10" />
-<sizeparam width="416" height="164" minWidth="50" minHeight="20" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1208" >
+<cdparam x="165" y="151" />
+<sizeparam width="394" height="68" minWidth="50" minHeight="20" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="#Confidentiality ECU1.SesK
-#Confidentiality ECU1.confData
-
-#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth
-
-#InitialCommonKnowledge ECU1.PSK1 KM.PSK1
-#InitialCommonKnowledge ECUN.PSKN KM.PSKN
-#InitialCommonKnowledge ECUN.ACK ECU1.ACK KM.ACK
-#InitialCommonKnowledge KM.timerexpire TimerKM.timerexpire
+<infoparam name="UML Note" value="#InitialCommonKnowledge Alice.sk Bob.sk
+#Confidentiality Alice.secretData
+#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2
" />
-<TGConnectingPoint num="0" id="101" />
-<TGConnectingPoint num="1" id="102" />
-<TGConnectingPoint num="2" id="103" />
-<TGConnectingPoint num="3" id="104" />
-<TGConnectingPoint num="4" id="105" />
-<TGConnectingPoint num="5" id="106" />
-<TGConnectingPoint num="6" id="107" />
-<TGConnectingPoint num="7" id="108" />
+<TGConnectingPoint num="0" id="1200" />
+<TGConnectingPoint num="1" id="1201" />
+<TGConnectingPoint num="2" id="1202" />
+<TGConnectingPoint num="3" id="1203" />
+<TGConnectingPoint num="4" id="1204" />
+<TGConnectingPoint num="5" id="1205" />
+<TGConnectingPoint num="6" id="1206" />
+<TGConnectingPoint num="7" id="1207" />
<extraparam>
-<Line value="#Confidentiality ECU1.SesK" />
-<Line value="#Confidentiality ECU1.confData" />
-<Line value="" />
-<Line value="#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth" />
-<Line value="" />
-<Line value="#InitialCommonKnowledge ECU1.PSK1 KM.PSK1" />
-<Line value="#InitialCommonKnowledge ECUN.PSKN KM.PSKN" />
-<Line value="#InitialCommonKnowledge ECUN.ACK ECU1.ACK KM.ACK" />
-<Line value="#InitialCommonKnowledge KM.timerexpire TimerKM.timerexpire" />
+<Line value="#InitialCommonKnowledge Alice.sk Bob.sk" />
+<Line value="#Confidentiality Alice.secretData" />
+<Line value="#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="118" >
-<cdparam x="644" y="83" />
-<sizeparam width="102" height="54" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="1267" >
+<cdparam x="385" y="460" />
+<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="110" />
-<TGConnectingPoint num="1" id="111" />
-<TGConnectingPoint num="2" id="112" />
-<TGConnectingPoint num="3" id="113" />
-<TGConnectingPoint num="4" id="114" />
-<TGConnectingPoint num="5" id="115" />
-<TGConnectingPoint num="6" id="116" />
-<TGConnectingPoint num="7" id="117" />
+<TGConnectingPoint num="0" id="1259" />
+<TGConnectingPoint num="1" id="1260" />
+<TGConnectingPoint num="2" id="1261" />
+<TGConnectingPoint num="3" id="1262" />
+<TGConnectingPoint num="4" id="1263" />
+<TGConnectingPoint num="5" id="1264" />
+<TGConnectingPoint num="6" id="1265" />
+<TGConnectingPoint num="7" id="1266" />
<extraparam>
<Attribute access="0" id="data" value="" type="0" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="127" >
-<cdparam x="767" y="82" />
-<sizeparam width="110" height="56" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="1276" >
+<cdparam x="193" y="459" />
+<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="119" />
-<TGConnectingPoint num="1" id="120" />
-<TGConnectingPoint num="2" id="121" />
-<TGConnectingPoint num="3" id="122" />
-<TGConnectingPoint num="4" id="123" />
-<TGConnectingPoint num="5" id="124" />
-<TGConnectingPoint num="6" id="125" />
-<TGConnectingPoint num="7" id="126" />
+<TGConnectingPoint num="0" id="1268" />
+<TGConnectingPoint num="1" id="1269" />
+<TGConnectingPoint num="2" id="1270" />
+<TGConnectingPoint num="3" id="1271" />
+<TGConnectingPoint num="4" id="1272" />
+<TGConnectingPoint num="5" id="1273" />
+<TGConnectingPoint num="6" id="1274" />
+<TGConnectingPoint num="7" id="1275" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="1518" >
-<cdparam x="44" y="181" />
-<sizeparam width="942" height="546" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="SecuredSystem" />
-<TGConnectingPoint num="0" id="1519" />
-<TGConnectingPoint num="1" id="1520" />
-<TGConnectingPoint num="2" id="1521" />
-<TGConnectingPoint num="3" id="1522" />
-<TGConnectingPoint num="4" id="1523" />
-<TGConnectingPoint num="5" id="1524" />
-<TGConnectingPoint num="6" id="1525" />
-<TGConnectingPoint num="7" id="1526" />
-<TGConnectingPoint num="8" id="1527" />
-<TGConnectingPoint num="9" id="1528" />
-<TGConnectingPoint num="10" id="1529" />
-<TGConnectingPoint num="11" id="1530" />
-<TGConnectingPoint num="12" id="1531" />
-<TGConnectingPoint num="13" id="1532" />
-<TGConnectingPoint num="14" id="1533" />
-<TGConnectingPoint num="15" id="1534" />
-<TGConnectingPoint num="16" id="1535" />
-<TGConnectingPoint num="17" id="1536" />
-<TGConnectingPoint num="18" id="1537" />
-<TGConnectingPoint num="19" id="1538" />
-<TGConnectingPoint num="20" id="1539" />
-<TGConnectingPoint num="21" id="1540" />
-<TGConnectingPoint num="22" id="1541" />
-<TGConnectingPoint num="23" id="1542" />
+<COMPONENT type="5000" id="1547" >
+<cdparam x="146" y="232" />
+<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="System" />
+<TGConnectingPoint num="0" id="1548" />
+<TGConnectingPoint num="1" id="1549" />
+<TGConnectingPoint num="2" id="1550" />
+<TGConnectingPoint num="3" id="1551" />
+<TGConnectingPoint num="4" id="1552" />
+<TGConnectingPoint num="5" id="1553" />
+<TGConnectingPoint num="6" id="1554" />
+<TGConnectingPoint num="7" id="1555" />
+<TGConnectingPoint num="8" id="1556" />
+<TGConnectingPoint num="9" id="1557" />
+<TGConnectingPoint num="10" id="1558" />
+<TGConnectingPoint num="11" id="1559" />
+<TGConnectingPoint num="12" id="1560" />
+<TGConnectingPoint num="13" id="1561" />
+<TGConnectingPoint num="14" id="1562" />
+<TGConnectingPoint num="15" id="1563" />
+<TGConnectingPoint num="16" id="1564" />
+<TGConnectingPoint num="17" id="1565" />
+<TGConnectingPoint num="18" id="1566" />
+<TGConnectingPoint num="19" id="1567" />
+<TGConnectingPoint num="20" id="1568" />
+<TGConnectingPoint num="21" id="1569" />
+<TGConnectingPoint num="22" id="1570" />
+<TGConnectingPoint num="23" id="1571" />
<extraparam>
<Signal value="in chin(Message msg)" />
<Signal value="out chout(Message msg)" />
-<Signal value="in chinprivate(Message msg)" />
-<Signal value="out choutprivate(Message msg)" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="75" >
-<father id="1518" num="0" />
-<cdparam x="567" y="266" />
-<sizeparam width="324" height="434" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="618" minY="0" maxY="112" />
-<infoparam name="Block0" value="KM" />
-<TGConnectingPoint num="0" id="51" />
-<TGConnectingPoint num="1" id="52" />
-<TGConnectingPoint num="2" id="53" />
-<TGConnectingPoint num="3" id="54" />
-<TGConnectingPoint num="4" id="55" />
-<TGConnectingPoint num="5" id="56" />
-<TGConnectingPoint num="6" id="57" />
-<TGConnectingPoint num="7" id="58" />
-<TGConnectingPoint num="8" id="59" />
-<TGConnectingPoint num="9" id="60" />
-<TGConnectingPoint num="10" id="61" />
-<TGConnectingPoint num="11" id="62" />
-<TGConnectingPoint num="12" id="63" />
-<TGConnectingPoint num="13" id="64" />
-<TGConnectingPoint num="14" id="65" />
-<TGConnectingPoint num="15" id="66" />
-<TGConnectingPoint num="16" id="67" />
-<TGConnectingPoint num="17" id="68" />
-<TGConnectingPoint num="18" id="69" />
-<TGConnectingPoint num="19" id="70" />
-<TGConnectingPoint num="20" id="71" />
-<TGConnectingPoint num="21" id="72" />
-<TGConnectingPoint num="22" id="73" />
-<TGConnectingPoint num="23" id="74" />
-<extraparam>
-<Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg7" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="timestamp1" value="" type="8" typeOther="" />
-<Attribute access="0" id="timestamp2" value="" type="8" typeOther="" />
-<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
-<Attribute access="0" id="b" value="" type="4" typeOther="" />
-<Attribute access="0" id="timerexpire" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="settimer" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg8" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msgauth" value="" type="5" typeOther="Message" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="50" >
-<father id="75" num="0" />
-<cdparam x="677" y="329" />
-<sizeparam width="212" height="134" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="112" minY="0" maxY="300" />
-<infoparam name="Block0" value="TimerKM" />
-<TGConnectingPoint num="0" id="26" />
-<TGConnectingPoint num="1" id="27" />
-<TGConnectingPoint num="2" id="28" />
-<TGConnectingPoint num="3" id="29" />
-<TGConnectingPoint num="4" id="30" />
-<TGConnectingPoint num="5" id="31" />
-<TGConnectingPoint num="6" id="32" />
-<TGConnectingPoint num="7" id="33" />
-<TGConnectingPoint num="8" id="34" />
-<TGConnectingPoint num="9" id="35" />
-<TGConnectingPoint num="10" id="36" />
-<TGConnectingPoint num="11" id="37" />
-<TGConnectingPoint num="12" id="38" />
-<TGConnectingPoint num="13" id="39" />
-<TGConnectingPoint num="14" id="40" />
-<TGConnectingPoint num="15" id="41" />
-<TGConnectingPoint num="16" id="42" />
-<TGConnectingPoint num="17" id="43" />
-<TGConnectingPoint num="18" id="44" />
-<TGConnectingPoint num="19" id="45" />
-<TGConnectingPoint num="20" id="46" />
-<TGConnectingPoint num="21" id="47" />
-<TGConnectingPoint num="22" id="48" />
-<TGConnectingPoint num="23" id="49" />
-<extraparam>
-<Attribute access="0" id="settimer" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="timerexpire" value="" type="5" typeOther="Message" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="100" >
-<father id="1518" num="1" />
-<cdparam x="322" y="281" />
-<sizeparam width="223" height="405" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="1258" >
+<father id="1547" num="0" />
+<cdparam x="155" y="300" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="719" minY="0" maxY="141" />
-<infoparam name="Block0" value="ECU1" />
-<TGConnectingPoint num="0" id="76" />
-<TGConnectingPoint num="1" id="77" />
-<TGConnectingPoint num="2" id="78" />
-<TGConnectingPoint num="3" id="79" />
-<TGConnectingPoint num="4" id="80" />
-<TGConnectingPoint num="5" id="81" />
-<TGConnectingPoint num="6" id="82" />
-<TGConnectingPoint num="7" id="83" />
-<TGConnectingPoint num="8" id="84" />
-<TGConnectingPoint num="9" id="85" />
-<TGConnectingPoint num="10" id="86" />
-<TGConnectingPoint num="11" id="87" />
-<TGConnectingPoint num="12" id="88" />
-<TGConnectingPoint num="13" id="89" />
-<TGConnectingPoint num="14" id="90" />
-<TGConnectingPoint num="15" id="91" />
-<TGConnectingPoint num="16" id="92" />
-<TGConnectingPoint num="17" id="93" />
-<TGConnectingPoint num="18" id="94" />
-<TGConnectingPoint num="19" id="95" />
-<TGConnectingPoint num="20" id="96" />
-<TGConnectingPoint num="21" id="97" />
-<TGConnectingPoint num="22" id="98" />
-<TGConnectingPoint num="23" id="99" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
+<TGConnectingPoint num="0" id="1234" />
+<TGConnectingPoint num="1" id="1235" />
+<TGConnectingPoint num="2" id="1236" />
+<TGConnectingPoint num="3" id="1237" />
+<TGConnectingPoint num="4" id="1238" />
+<TGConnectingPoint num="5" id="1239" />
+<TGConnectingPoint num="6" id="1240" />
+<TGConnectingPoint num="7" id="1241" />
+<TGConnectingPoint num="8" id="1242" />
+<TGConnectingPoint num="9" id="1243" />
+<TGConnectingPoint num="10" id="1244" />
+<TGConnectingPoint num="11" id="1245" />
+<TGConnectingPoint num="12" id="1246" />
+<TGConnectingPoint num="13" id="1247" />
+<TGConnectingPoint num="14" id="1248" />
+<TGConnectingPoint num="15" id="1249" />
+<TGConnectingPoint num="16" id="1250" />
+<TGConnectingPoint num="17" id="1251" />
+<TGConnectingPoint num="18" id="1252" />
+<TGConnectingPoint num="19" id="1253" />
+<TGConnectingPoint num="20" id="1254" />
+<TGConnectingPoint num="21" id="1255" />
+<TGConnectingPoint num="22" id="1256" />
+<TGConnectingPoint num="23" id="1257" />
<extraparam>
-<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="groupid" value="" type="8" typeOther="" />
-<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
-<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
-<Attribute access="0" id="b" value="" type="4" typeOther="" />
-<Attribute access="0" id="confData" value="" type="8" typeOther="" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -324,51 +182,42 @@
<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="25" >
-<father id="1518" num="2" />
-<cdparam x="79" y="280" />
-<sizeparam width="223" height="427" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="1233" >
+<father id="1547" num="1" />
+<cdparam x="382" y="301" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="719" minY="0" maxY="119" />
-<infoparam name="Block0" value="ECUN" />
-<TGConnectingPoint num="0" id="1" />
-<TGConnectingPoint num="1" id="2" />
-<TGConnectingPoint num="2" id="3" />
-<TGConnectingPoint num="3" id="4" />
-<TGConnectingPoint num="4" id="5" />
-<TGConnectingPoint num="5" id="6" />
-<TGConnectingPoint num="6" id="7" />
-<TGConnectingPoint num="7" id="8" />
-<TGConnectingPoint num="8" id="9" />
-<TGConnectingPoint num="9" id="10" />
-<TGConnectingPoint num="10" id="11" />
-<TGConnectingPoint num="11" id="12" />
-<TGConnectingPoint num="12" id="13" />
-<TGConnectingPoint num="13" id="14" />
-<TGConnectingPoint num="14" id="15" />
-<TGConnectingPoint num="15" id="16" />
-<TGConnectingPoint num="16" id="17" />
-<TGConnectingPoint num="17" id="18" />
-<TGConnectingPoint num="18" id="19" />
-<TGConnectingPoint num="19" id="20" />
-<TGConnectingPoint num="20" id="21" />
-<TGConnectingPoint num="21" id="22" />
-<TGConnectingPoint num="22" id="23" />
-<TGConnectingPoint num="23" id="24" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
+<TGConnectingPoint num="0" id="1209" />
+<TGConnectingPoint num="1" id="1210" />
+<TGConnectingPoint num="2" id="1211" />
+<TGConnectingPoint num="3" id="1212" />
+<TGConnectingPoint num="4" id="1213" />
+<TGConnectingPoint num="5" id="1214" />
+<TGConnectingPoint num="6" id="1215" />
+<TGConnectingPoint num="7" id="1216" />
+<TGConnectingPoint num="8" id="1217" />
+<TGConnectingPoint num="9" id="1218" />
+<TGConnectingPoint num="10" id="1219" />
+<TGConnectingPoint num="11" id="1220" />
+<TGConnectingPoint num="12" id="1221" />
+<TGConnectingPoint num="13" id="1222" />
+<TGConnectingPoint num="14" id="1223" />
+<TGConnectingPoint num="15" id="1224" />
+<TGConnectingPoint num="16" id="1225" />
+<TGConnectingPoint num="17" id="1226" />
+<TGConnectingPoint num="18" id="1227" />
+<TGConnectingPoint num="19" id="1228" />
+<TGConnectingPoint num="20" id="1229" />
+<TGConnectingPoint num="21" id="1230" />
+<TGConnectingPoint num="22" id="1231" />
+<TGConnectingPoint num="23" id="1232" />
<extraparam>
-<Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="keyOfGroup" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
-<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
-<Attribute access="0" id="b" value="" type="4" typeOther="" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
<Method value="Message encrypt(Message msg, Key k)" />
<Method value="Message decrypt(Message msg, Key k)" />
<Method value="Message sencrypt(Message msg, Key k)" />
@@ -387,20 +236,20 @@
</AVATARBlockDiagramPanel>
-<AVATARStateMachineDiagramPanel name="ECUN" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="129" >
-<cdparam x="638" y="1030" />
+<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1278" >
+<cdparam x="416" y="379" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="638" y="1030" id="211" />
-<P2 x="656" y="1133" id="156" />
+<P1 x="416" y="379" id="1293" />
+<P2 x="420" y="424" id="1313" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="128" >
-<father id="129" num="0" />
-<cdparam x="654" y="1057" />
-<sizeparam width="223" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1277" >
+<father id="1278" num="0" />
+<cdparam x="431" y="403" />
+<sizeparam width="143" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
<guard value="[ ]" />
@@ -408,50 +257,50 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="msg3 = sdecrypt(msg1, keyOfGroup)" />
-<actions value="secretData = msg3.data" />
+<actions value="receivedData = m.data" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="131" >
-<cdparam x="514" y="919" />
+<CONNECTOR type="5102" id="1280" >
+<cdparam x="407" y="273" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="514" y="919" id="244" />
-<P2 x="417" y="985" id="181" />
+<P1 x="407" y="273" id="1343" />
+<P2 x="416" y="339" id="1288" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="130" >
-<father id="131" num="0" />
-<cdparam x="413" y="957" />
-<sizeparam width="46" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1279" >
+<father id="1280" num="0" />
+<cdparam x="419" y="312" />
+<sizeparam width="207" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ not(b)]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="m = sdecrypt(m2, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="133" >
-<cdparam x="570" y="919" />
+<CONNECTOR type="5102" id="1282" >
+<cdparam x="406" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="570" y="919" id="245" />
-<P2 x="638" y="990" id="206" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="406" y="201" id="1363" />
+<P2 x="407" y="233" id="1338" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="132" >
-<father id="133" num="0" />
-<cdparam x="570" y="959" />
-<sizeparam width="24" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1281" >
+<father id="1282" num="0" />
+<cdparam x="406" y="241" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -459,16 +308,16 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="135" >
-<cdparam x="342" y="72" />
+<CONNECTOR type="5102" id="1284" >
+<cdparam x="406" y="141" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<P1 x="342" y="72" id="355" />
-<P2 x="342" y="100" id="331" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="406" y="141" id="1379" />
+<P2 x="406" y="171" id="1362" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="134" >
-<father id="135" num="0" />
-<cdparam x="342" y="112" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1283" >
+<father id="1284" num="0" />
+<cdparam x="406" y="181" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -482,17 +331,17 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="137" >
-<cdparam x="548" y="792" />
+<CONNECTOR type="5102" id="1286" >
+<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<P1 x="548" y="792" id="369" />
-<P2 x="542" y="879" id="231" />
+<infoparam name="connector from start state to state0" value="null" />
+<P1 x="407" y="70" id="1398" />
+<P2 x="406" y="101" id="1374" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="136" >
-<father id="137" num="0" />
-<cdparam x="548" y="832" />
-<sizeparam width="240" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1285" >
+<father id="1286" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -502,27 +351,184 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="get2(msg, msg1, msg2)" />
-<actions value="b = verifyMAC(msg1, keyOfGroup, msg2)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="139" >
-<cdparam x="434" y="475" />
+<COMPONENT type="5106" id="1311" >
+<cdparam x="327" y="339" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="messageDecrypted" />
+<TGConnectingPoint num="0" id="1287" />
+<TGConnectingPoint num="1" id="1288" />
+<TGConnectingPoint num="2" id="1289" />
+<TGConnectingPoint num="3" id="1290" />
+<TGConnectingPoint num="4" id="1291" />
+<TGConnectingPoint num="5" id="1292" />
+<TGConnectingPoint num="6" id="1293" />
+<TGConnectingPoint num="7" id="1294" />
+<TGConnectingPoint num="8" id="1295" />
+<TGConnectingPoint num="9" id="1296" />
+<TGConnectingPoint num="10" id="1297" />
+<TGConnectingPoint num="11" id="1298" />
+<TGConnectingPoint num="12" id="1299" />
+<TGConnectingPoint num="13" id="1300" />
+<TGConnectingPoint num="14" id="1301" />
+<TGConnectingPoint num="15" id="1302" />
+<TGConnectingPoint num="16" id="1303" />
+<TGConnectingPoint num="17" id="1304" />
+<TGConnectingPoint num="18" id="1305" />
+<TGConnectingPoint num="19" id="1306" />
+<TGConnectingPoint num="20" id="1307" />
+<TGConnectingPoint num="21" id="1308" />
+<TGConnectingPoint num="22" id="1309" />
+<TGConnectingPoint num="23" id="1310" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1336" >
+<cdparam x="350" y="424" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="1312" />
+<TGConnectingPoint num="1" id="1313" />
+<TGConnectingPoint num="2" id="1314" />
+<TGConnectingPoint num="3" id="1315" />
+<TGConnectingPoint num="4" id="1316" />
+<TGConnectingPoint num="5" id="1317" />
+<TGConnectingPoint num="6" id="1318" />
+<TGConnectingPoint num="7" id="1319" />
+<TGConnectingPoint num="8" id="1320" />
+<TGConnectingPoint num="9" id="1321" />
+<TGConnectingPoint num="10" id="1322" />
+<TGConnectingPoint num="11" id="1323" />
+<TGConnectingPoint num="12" id="1324" />
+<TGConnectingPoint num="13" id="1325" />
+<TGConnectingPoint num="14" id="1326" />
+<TGConnectingPoint num="15" id="1327" />
+<TGConnectingPoint num="16" id="1328" />
+<TGConnectingPoint num="17" id="1329" />
+<TGConnectingPoint num="18" id="1330" />
+<TGConnectingPoint num="19" id="1331" />
+<TGConnectingPoint num="20" id="1332" />
+<TGConnectingPoint num="21" id="1333" />
+<TGConnectingPoint num="22" id="1334" />
+<TGConnectingPoint num="23" id="1335" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1361" >
+<cdparam x="336" y="233" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="1337" />
+<TGConnectingPoint num="1" id="1338" />
+<TGConnectingPoint num="2" id="1339" />
+<TGConnectingPoint num="3" id="1340" />
+<TGConnectingPoint num="4" id="1341" />
+<TGConnectingPoint num="5" id="1342" />
+<TGConnectingPoint num="6" id="1343" />
+<TGConnectingPoint num="7" id="1344" />
+<TGConnectingPoint num="8" id="1345" />
+<TGConnectingPoint num="9" id="1346" />
+<TGConnectingPoint num="10" id="1347" />
+<TGConnectingPoint num="11" id="1348" />
+<TGConnectingPoint num="12" id="1349" />
+<TGConnectingPoint num="13" id="1350" />
+<TGConnectingPoint num="14" id="1351" />
+<TGConnectingPoint num="15" id="1352" />
+<TGConnectingPoint num="16" id="1353" />
+<TGConnectingPoint num="17" id="1354" />
+<TGConnectingPoint num="18" id="1355" />
+<TGConnectingPoint num="19" id="1356" />
+<TGConnectingPoint num="20" id="1357" />
+<TGConnectingPoint num="21" id="1358" />
+<TGConnectingPoint num="22" id="1359" />
+<TGConnectingPoint num="23" id="1360" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1372" >
+<cdparam x="373" y="176" />
+<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="1362" />
+<TGConnectingPoint num="1" id="1363" />
+<TGConnectingPoint num="2" id="1364" />
+<TGConnectingPoint num="3" id="1365" />
+<TGConnectingPoint num="4" id="1366" />
+<TGConnectingPoint num="5" id="1367" />
+<TGConnectingPoint num="6" id="1368" />
+<TGConnectingPoint num="7" id="1369" />
+<TGConnectingPoint num="8" id="1370" />
+<TGConnectingPoint num="9" id="1371" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1397" >
+<cdparam x="340" y="101" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="waitingForMessage" />
+<TGConnectingPoint num="0" id="1373" />
+<TGConnectingPoint num="1" id="1374" />
+<TGConnectingPoint num="2" id="1375" />
+<TGConnectingPoint num="3" id="1376" />
+<TGConnectingPoint num="4" id="1377" />
+<TGConnectingPoint num="5" id="1378" />
+<TGConnectingPoint num="6" id="1379" />
+<TGConnectingPoint num="7" id="1380" />
+<TGConnectingPoint num="8" id="1381" />
+<TGConnectingPoint num="9" id="1382" />
+<TGConnectingPoint num="10" id="1383" />
+<TGConnectingPoint num="11" id="1384" />
+<TGConnectingPoint num="12" id="1385" />
+<TGConnectingPoint num="13" id="1386" />
+<TGConnectingPoint num="14" id="1387" />
+<TGConnectingPoint num="15" id="1388" />
+<TGConnectingPoint num="16" id="1389" />
+<TGConnectingPoint num="17" id="1390" />
+<TGConnectingPoint num="18" id="1391" />
+<TGConnectingPoint num="19" id="1392" />
+<TGConnectingPoint num="20" id="1393" />
+<TGConnectingPoint num="21" id="1394" />
+<TGConnectingPoint num="22" id="1395" />
+<TGConnectingPoint num="23" id="1396" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1399" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1398" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1401" >
+<cdparam x="407" y="310" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<P1 x="479" y="445" id="430" />
-<P2 x="530" y="495" id="306" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<P1 x="407" y="310" id="1409" />
+<P2 x="408" y="341" id="1419" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="138" >
-<father id="139" num="0" />
-<cdparam x="529" y="457" />
-<sizeparam width="291" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1400" >
+<father id="1401" num="0" />
+<cdparam x="407" y="350" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -530,16 +536,16 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="141" >
-<cdparam x="486" y="696" />
+<CONNECTOR type="5102" id="1403" >
+<cdparam x="407" y="251" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="543" y="653" id="405" />
-<P2 x="548" y="688" id="380" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<P1 x="407" y="251" id="1427" />
+<P2 x="407" y="280" id="1408" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="140" >
-<father id="141" num="0" />
-<cdparam x="486" y="736" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1402" >
+<father id="1403" num="0" />
+<cdparam x="407" y="291" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -553,17 +559,17 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="143" >
-<cdparam x="548" y="728" />
+<CONNECTOR type="5102" id="1405" >
+<cdparam x="407" y="132" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="548" y="728" id="385" />
-<P2 x="548" y="762" id="368" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="407" y="132" id="1452" />
+<P2 x="407" y="211" id="1422" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="142" >
-<father id="143" num="0" />
-<cdparam x="548" y="768" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1404" >
+<father id="1405" num="0" />
+<cdparam x="415" y="162" />
+<sizeparam width="185" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -573,20 +579,22 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="m.data = secretData" />
+<actions value="m1 = sencrypt(m, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="145" >
-<cdparam x="304" y="307" />
+<CONNECTOR type="5102" id="1407" >
+<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<P1 x="429" y="362" id="261" />
-<P2 x="454" y="405" id="416" />
+<infoparam name="connector from start state to state0" value="null" />
+<P1 x="407" y="70" id="1471" />
+<P2 x="407" y="92" id="1447" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="144" >
-<father id="145" num="0" />
-<cdparam x="440" y="381" />
-<sizeparam width="201" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1406" >
+<father id="1407" num="0" />
+<cdparam x="407" y="110" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -596,588 +604,540 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="b = verifyMAC(msg5, PSKN, msg6)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="147" >
-<cdparam x="342" y="140" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="342" y="140" id="336" />
-<P2 x="350" y="173" id="357" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="146" >
-<father id="147" num="0" />
-<cdparam x="342" y="180" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1418" >
+<cdparam x="374" y="285" />
+<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
+<infoparam name="Send signal" value="chout(m1)" />
+<TGConnectingPoint num="0" id="1408" />
+<TGConnectingPoint num="1" id="1409" />
+<TGConnectingPoint num="2" id="1410" />
+<TGConnectingPoint num="3" id="1411" />
+<TGConnectingPoint num="4" id="1412" />
+<TGConnectingPoint num="5" id="1413" />
+<TGConnectingPoint num="6" id="1414" />
+<TGConnectingPoint num="7" id="1415" />
+<TGConnectingPoint num="8" id="1416" />
+<TGConnectingPoint num="9" id="1417" />
+</COMPONENT>
+
+<COMPONENT type="5101" id="1420" >
+<cdparam x="398" y="346" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1419" />
+</COMPONENT>
-<CONNECTOR type="5102" id="149" >
-<cdparam x="518" y="526" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="530" y="535" id="311" />
-<P2 x="543" y="623" id="404" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="148" >
-<father id="149" num="0" />
-<cdparam x="565" y="553" />
-<sizeparam width="323" height="96" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1445" >
+<cdparam x="336" y="211" />
+<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="keyOfGroup.data = msg1.data" />
-<actions value="msg1.data = ACK" />
-<actions value="msg2.data = timestamp" />
-<actions value="msg3 = concat2(msg1, msg2)" />
-<actions value="msg4 = MAC(msg3, PSKN)" />
-<actions value="msg = concat2(msg3, msg4)" />
-</extraparam>
-</SUBCOMPONENT>
+<infoparam name="state0" value="sendingMessage" />
+<TGConnectingPoint num="0" id="1421" />
+<TGConnectingPoint num="1" id="1422" />
+<TGConnectingPoint num="2" id="1423" />
+<TGConnectingPoint num="3" id="1424" />
+<TGConnectingPoint num="4" id="1425" />
+<TGConnectingPoint num="5" id="1426" />
+<TGConnectingPoint num="6" id="1427" />
+<TGConnectingPoint num="7" id="1428" />
+<TGConnectingPoint num="8" id="1429" />
+<TGConnectingPoint num="9" id="1430" />
+<TGConnectingPoint num="10" id="1431" />
+<TGConnectingPoint num="11" id="1432" />
+<TGConnectingPoint num="12" id="1433" />
+<TGConnectingPoint num="13" id="1434" />
+<TGConnectingPoint num="14" id="1435" />
+<TGConnectingPoint num="15" id="1436" />
+<TGConnectingPoint num="16" id="1437" />
+<TGConnectingPoint num="17" id="1438" />
+<TGConnectingPoint num="18" id="1439" />
+<TGConnectingPoint num="19" id="1440" />
+<TGConnectingPoint num="20" id="1441" />
+<TGConnectingPoint num="21" id="1442" />
+<TGConnectingPoint num="22" id="1443" />
+<TGConnectingPoint num="23" id="1444" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1470" >
+<cdparam x="340" y="92" />
+<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="makingMessage" />
+<TGConnectingPoint num="0" id="1446" />
+<TGConnectingPoint num="1" id="1447" />
+<TGConnectingPoint num="2" id="1448" />
+<TGConnectingPoint num="3" id="1449" />
+<TGConnectingPoint num="4" id="1450" />
+<TGConnectingPoint num="5" id="1451" />
+<TGConnectingPoint num="6" id="1452" />
+<TGConnectingPoint num="7" id="1453" />
+<TGConnectingPoint num="8" id="1454" />
+<TGConnectingPoint num="9" id="1455" />
+<TGConnectingPoint num="10" id="1456" />
+<TGConnectingPoint num="11" id="1457" />
+<TGConnectingPoint num="12" id="1458" />
+<TGConnectingPoint num="13" id="1459" />
+<TGConnectingPoint num="14" id="1460" />
+<TGConnectingPoint num="15" id="1461" />
+<TGConnectingPoint num="16" id="1462" />
+<TGConnectingPoint num="17" id="1463" />
+<TGConnectingPoint num="18" id="1464" />
+<TGConnectingPoint num="19" id="1465" />
+<TGConnectingPoint num="20" id="1466" />
+<TGConnectingPoint num="21" id="1467" />
+<TGConnectingPoint num="22" id="1468" />
+<TGConnectingPoint num="23" id="1469" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1472" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1471" />
+</COMPONENT>
-<CONNECTOR type="5102" id="151" >
-<cdparam x="350" y="203" />
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5100" id="1572" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1573" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="AVATAR Design" nameTab="KeyMasterProtocol" >
+<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5002" id="3" >
+<cdparam x="1029" y="448" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="350" y="203" id="358" />
-<P2 x="406" y="238" id="281" />
+<infoparam name="connector from Block0 to Block0" value="" />
+<P1 x="827" y="382" id="135" />
+<P2 x="827" y="479" id="144" />
+<Point x="860" y="382" />
+<Point x="860" y="479" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="150" >
-<father id="151" num="0" />
-<cdparam x="350" y="243" />
+<extraparam>
+<iso value="in chin(Message msg)" />
+<iso value="in chinprivate(Message msg)" />
+<osd value="out chout(Message msg)" />
+<osd value="out choutprivate(Message msg)" />
+<isd value="in chin(Message msg)" />
+<isd value="in chinprivate(Message msg)" />
+<oso value="out chout(Message msg)" />
+<oso value="out choutprivate(Message msg)" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" />
+</extraparam>
+</CONNECTOR><SUBCOMPONENT type="-1" id="1" >
+<father id="3" num="0" />
+<cdparam x="860" y="382" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="154" >
-<cdparam x="406" y="268" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="406" y="268" id="286" />
-<P2 x="429" y="322" id="256" />
-<Point x="414" y="282" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="152" >
-<father id="154" num="0" />
-<cdparam x="414" y="282" />
+<SUBCOMPONENT type="-1" id="2" >
+<father id="3" num="1" />
+<cdparam x="860" y="479" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="153" >
-<father id="154" num="1" />
-<cdparam x="446" y="292" />
-<sizeparam width="226" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="301" id="12" >
+<cdparam x="50" y="19" />
+<sizeparam width="416" height="164" minWidth="50" minHeight="20" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<infoparam name="UML Note" value="#Confidentiality ECU1.SesK
+#Confidentiality ECU1.confData
+
+#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth
+
+#InitialCommonKnowledge ECU1.PSK1 KM.PSK1
+#InitialCommonKnowledge ECUN.PSKN KM.PSKN
+#InitialCommonKnowledge ECUN.ACK ECU1.ACK KM.ACK
+#InitialCommonKnowledge KM.timerexpire TimerKM.timerexpire
+" />
+<TGConnectingPoint num="0" id="4" />
+<TGConnectingPoint num="1" id="5" />
+<TGConnectingPoint num="2" id="6" />
+<TGConnectingPoint num="3" id="7" />
+<TGConnectingPoint num="4" id="8" />
+<TGConnectingPoint num="5" id="9" />
+<TGConnectingPoint num="6" id="10" />
+<TGConnectingPoint num="7" id="11" />
<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="get2(msg, msg5, msg6)" />
-<actions value="get4(msg5, msg1, msg2, msg3, msg4)" />
+<Line value="#Confidentiality ECU1.SesK" />
+<Line value="#Confidentiality ECU1.confData" />
+<Line value="" />
+<Line value="#Authenticity ECU1.makingFirstMessage.SesK KM.decipherOK.msgauth" />
+<Line value="" />
+<Line value="#InitialCommonKnowledge ECU1.PSK1 KM.PSK1" />
+<Line value="#InitialCommonKnowledge ECUN.PSKN KM.PSKN" />
+<Line value="#InitialCommonKnowledge ECUN.ACK ECU1.ACK KM.ACK" />
+<Line value="#InitialCommonKnowledge KM.timerexpire TimerKM.timerexpire" />
</extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
-<COMPONENT type="5106" id="179" >
-<cdparam x="595" y="1133" />
-<sizeparam width="122" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="gotData" />
-<TGConnectingPoint num="0" id="155" />
-<TGConnectingPoint num="1" id="156" />
-<TGConnectingPoint num="2" id="157" />
-<TGConnectingPoint num="3" id="158" />
-<TGConnectingPoint num="4" id="159" />
-<TGConnectingPoint num="5" id="160" />
-<TGConnectingPoint num="6" id="161" />
-<TGConnectingPoint num="7" id="162" />
-<TGConnectingPoint num="8" id="163" />
-<TGConnectingPoint num="9" id="164" />
-<TGConnectingPoint num="10" id="165" />
-<TGConnectingPoint num="11" id="166" />
-<TGConnectingPoint num="12" id="167" />
-<TGConnectingPoint num="13" id="168" />
-<TGConnectingPoint num="14" id="169" />
-<TGConnectingPoint num="15" id="170" />
-<TGConnectingPoint num="16" id="171" />
-<TGConnectingPoint num="17" id="172" />
-<TGConnectingPoint num="18" id="173" />
-<TGConnectingPoint num="19" id="174" />
-<TGConnectingPoint num="20" id="175" />
-<TGConnectingPoint num="21" id="176" />
-<TGConnectingPoint num="22" id="177" />
-<TGConnectingPoint num="23" id="178" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="204" >
-<cdparam x="366" y="985" />
-<sizeparam width="102" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="MacDataFailed" />
-<TGConnectingPoint num="0" id="180" />
-<TGConnectingPoint num="1" id="181" />
-<TGConnectingPoint num="2" id="182" />
-<TGConnectingPoint num="3" id="183" />
-<TGConnectingPoint num="4" id="184" />
-<TGConnectingPoint num="5" id="185" />
-<TGConnectingPoint num="6" id="186" />
-<TGConnectingPoint num="7" id="187" />
-<TGConnectingPoint num="8" id="188" />
-<TGConnectingPoint num="9" id="189" />
-<TGConnectingPoint num="10" id="190" />
-<TGConnectingPoint num="11" id="191" />
-<TGConnectingPoint num="12" id="192" />
-<TGConnectingPoint num="13" id="193" />
-<TGConnectingPoint num="14" id="194" />
-<TGConnectingPoint num="15" id="195" />
-<TGConnectingPoint num="16" id="196" />
-<TGConnectingPoint num="17" id="197" />
-<TGConnectingPoint num="18" id="198" />
-<TGConnectingPoint num="19" id="199" />
-<TGConnectingPoint num="20" id="200" />
-<TGConnectingPoint num="21" id="201" />
-<TGConnectingPoint num="22" id="202" />
-<TGConnectingPoint num="23" id="203" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="229" >
-<cdparam x="580" y="990" />
-<sizeparam width="116" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="MACDataOK" />
-<TGConnectingPoint num="0" id="205" />
-<TGConnectingPoint num="1" id="206" />
-<TGConnectingPoint num="2" id="207" />
-<TGConnectingPoint num="3" id="208" />
-<TGConnectingPoint num="4" id="209" />
-<TGConnectingPoint num="5" id="210" />
-<TGConnectingPoint num="6" id="211" />
-<TGConnectingPoint num="7" id="212" />
-<TGConnectingPoint num="8" id="213" />
-<TGConnectingPoint num="9" id="214" />
-<TGConnectingPoint num="10" id="215" />
-<TGConnectingPoint num="11" id="216" />
-<TGConnectingPoint num="12" id="217" />
-<TGConnectingPoint num="13" id="218" />
-<TGConnectingPoint num="14" id="219" />
-<TGConnectingPoint num="15" id="220" />
-<TGConnectingPoint num="16" id="221" />
-<TGConnectingPoint num="17" id="222" />
-<TGConnectingPoint num="18" id="223" />
-<TGConnectingPoint num="19" id="224" />
-<TGConnectingPoint num="20" id="225" />
-<TGConnectingPoint num="21" id="226" />
-<TGConnectingPoint num="22" id="227" />
-<TGConnectingPoint num="23" id="228" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="254" >
-<cdparam x="486" y="879" />
-<sizeparam width="113" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testingMAC" />
-<TGConnectingPoint num="0" id="230" />
-<TGConnectingPoint num="1" id="231" />
-<TGConnectingPoint num="2" id="232" />
-<TGConnectingPoint num="3" id="233" />
-<TGConnectingPoint num="4" id="234" />
-<TGConnectingPoint num="5" id="235" />
-<TGConnectingPoint num="6" id="236" />
-<TGConnectingPoint num="7" id="237" />
-<TGConnectingPoint num="8" id="238" />
-<TGConnectingPoint num="9" id="239" />
-<TGConnectingPoint num="10" id="240" />
-<TGConnectingPoint num="11" id="241" />
-<TGConnectingPoint num="12" id="242" />
-<TGConnectingPoint num="13" id="243" />
-<TGConnectingPoint num="14" id="244" />
-<TGConnectingPoint num="15" id="245" />
-<TGConnectingPoint num="16" id="246" />
-<TGConnectingPoint num="17" id="247" />
-<TGConnectingPoint num="18" id="248" />
-<TGConnectingPoint num="19" id="249" />
-<TGConnectingPoint num="20" id="250" />
-<TGConnectingPoint num="21" id="251" />
-<TGConnectingPoint num="22" id="252" />
-<TGConnectingPoint num="23" id="253" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="279" >
-<cdparam x="353" y="322" />
-<sizeparam width="153" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC0" />
-<TGConnectingPoint num="0" id="255" />
-<TGConnectingPoint num="1" id="256" />
-<TGConnectingPoint num="2" id="257" />
-<TGConnectingPoint num="3" id="258" />
-<TGConnectingPoint num="4" id="259" />
-<TGConnectingPoint num="5" id="260" />
-<TGConnectingPoint num="6" id="261" />
-<TGConnectingPoint num="7" id="262" />
-<TGConnectingPoint num="8" id="263" />
-<TGConnectingPoint num="9" id="264" />
-<TGConnectingPoint num="10" id="265" />
-<TGConnectingPoint num="11" id="266" />
-<TGConnectingPoint num="12" id="267" />
-<TGConnectingPoint num="13" id="268" />
-<TGConnectingPoint num="14" id="269" />
-<TGConnectingPoint num="15" id="270" />
-<TGConnectingPoint num="16" id="271" />
-<TGConnectingPoint num="17" id="272" />
-<TGConnectingPoint num="18" id="273" />
-<TGConnectingPoint num="19" id="274" />
-<TGConnectingPoint num="20" id="275" />
-<TGConnectingPoint num="21" id="276" />
-<TGConnectingPoint num="22" id="277" />
-<TGConnectingPoint num="23" id="278" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="304" >
-<cdparam x="311" y="238" />
-<sizeparam width="190" height="30" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="GotMessage" />
-<TGConnectingPoint num="0" id="280" />
-<TGConnectingPoint num="1" id="281" />
-<TGConnectingPoint num="2" id="282" />
-<TGConnectingPoint num="3" id="283" />
-<TGConnectingPoint num="4" id="284" />
-<TGConnectingPoint num="5" id="285" />
-<TGConnectingPoint num="6" id="286" />
-<TGConnectingPoint num="7" id="287" />
-<TGConnectingPoint num="8" id="288" />
-<TGConnectingPoint num="9" id="289" />
-<TGConnectingPoint num="10" id="290" />
-<TGConnectingPoint num="11" id="291" />
-<TGConnectingPoint num="12" id="292" />
-<TGConnectingPoint num="13" id="293" />
-<TGConnectingPoint num="14" id="294" />
-<TGConnectingPoint num="15" id="295" />
-<TGConnectingPoint num="16" id="296" />
-<TGConnectingPoint num="17" id="297" />
-<TGConnectingPoint num="18" id="298" />
-<TGConnectingPoint num="19" id="299" />
-<TGConnectingPoint num="20" id="300" />
-<TGConnectingPoint num="21" id="301" />
-<TGConnectingPoint num="22" id="302" />
-<TGConnectingPoint num="23" id="303" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="329" >
-<cdparam x="454" y="495" />
-<sizeparam width="152" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC_OK" />
-<TGConnectingPoint num="0" id="305" />
-<TGConnectingPoint num="1" id="306" />
-<TGConnectingPoint num="2" id="307" />
-<TGConnectingPoint num="3" id="308" />
-<TGConnectingPoint num="4" id="309" />
-<TGConnectingPoint num="5" id="310" />
-<TGConnectingPoint num="6" id="311" />
-<TGConnectingPoint num="7" id="312" />
-<TGConnectingPoint num="8" id="313" />
-<TGConnectingPoint num="9" id="314" />
-<TGConnectingPoint num="10" id="315" />
-<TGConnectingPoint num="11" id="316" />
-<TGConnectingPoint num="12" id="317" />
-<TGConnectingPoint num="13" id="318" />
-<TGConnectingPoint num="14" id="319" />
-<TGConnectingPoint num="15" id="320" />
-<TGConnectingPoint num="16" id="321" />
-<TGConnectingPoint num="17" id="322" />
-<TGConnectingPoint num="18" id="323" />
-<TGConnectingPoint num="19" id="324" />
-<TGConnectingPoint num="20" id="325" />
-<TGConnectingPoint num="21" id="326" />
-<TGConnectingPoint num="22" id="327" />
-<TGConnectingPoint num="23" id="328" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="354" >
-<cdparam x="259" y="100" />
-<sizeparam width="166" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="waitForKeyGroup" />
-<TGConnectingPoint num="0" id="330" />
-<TGConnectingPoint num="1" id="331" />
-<TGConnectingPoint num="2" id="332" />
-<TGConnectingPoint num="3" id="333" />
-<TGConnectingPoint num="4" id="334" />
-<TGConnectingPoint num="5" id="335" />
-<TGConnectingPoint num="6" id="336" />
-<TGConnectingPoint num="7" id="337" />
-<TGConnectingPoint num="8" id="338" />
-<TGConnectingPoint num="9" id="339" />
-<TGConnectingPoint num="10" id="340" />
-<TGConnectingPoint num="11" id="341" />
-<TGConnectingPoint num="12" id="342" />
-<TGConnectingPoint num="13" id="343" />
-<TGConnectingPoint num="14" id="344" />
-<TGConnectingPoint num="15" id="345" />
-<TGConnectingPoint num="16" id="346" />
-<TGConnectingPoint num="17" id="347" />
-<TGConnectingPoint num="18" id="348" />
-<TGConnectingPoint num="19" id="349" />
-<TGConnectingPoint num="20" id="350" />
-<TGConnectingPoint num="21" id="351" />
-<TGConnectingPoint num="22" id="352" />
-<TGConnectingPoint num="23" id="353" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="356" >
-<cdparam x="335" y="52" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="21" >
+<cdparam x="514" y="80" />
+<sizeparam width="102" height="54" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="355" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="DataType0" value="Message" />
+<TGConnectingPoint num="0" id="13" />
+<TGConnectingPoint num="1" id="14" />
+<TGConnectingPoint num="2" id="15" />
+<TGConnectingPoint num="3" id="16" />
+<TGConnectingPoint num="4" id="17" />
+<TGConnectingPoint num="5" id="18" />
+<TGConnectingPoint num="6" id="19" />
+<TGConnectingPoint num="7" id="20" />
+<extraparam>
+<Attribute access="0" id="data" value="" type="0" typeOther="" />
+</extraparam>
</COMPONENT>
-<COMPONENT type="5104" id="367" >
-<cdparam x="314" y="178" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="357" />
-<TGConnectingPoint num="1" id="358" />
-<TGConnectingPoint num="2" id="359" />
-<TGConnectingPoint num="3" id="360" />
-<TGConnectingPoint num="4" id="361" />
-<TGConnectingPoint num="5" id="362" />
-<TGConnectingPoint num="6" id="363" />
-<TGConnectingPoint num="7" id="364" />
-<TGConnectingPoint num="8" id="365" />
-<TGConnectingPoint num="9" id="366" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="378" >
-<cdparam x="512" y="767" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="368" />
-<TGConnectingPoint num="1" id="369" />
-<TGConnectingPoint num="2" id="370" />
-<TGConnectingPoint num="3" id="371" />
-<TGConnectingPoint num="4" id="372" />
-<TGConnectingPoint num="5" id="373" />
-<TGConnectingPoint num="6" id="374" />
-<TGConnectingPoint num="7" id="375" />
-<TGConnectingPoint num="8" id="376" />
-<TGConnectingPoint num="9" id="377" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="403" >
-<cdparam x="451" y="688" />
-<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="WaitForData" />
-<TGConnectingPoint num="0" id="379" />
-<TGConnectingPoint num="1" id="380" />
-<TGConnectingPoint num="2" id="381" />
-<TGConnectingPoint num="3" id="382" />
-<TGConnectingPoint num="4" id="383" />
-<TGConnectingPoint num="5" id="384" />
-<TGConnectingPoint num="6" id="385" />
-<TGConnectingPoint num="7" id="386" />
-<TGConnectingPoint num="8" id="387" />
-<TGConnectingPoint num="9" id="388" />
-<TGConnectingPoint num="10" id="389" />
-<TGConnectingPoint num="11" id="390" />
-<TGConnectingPoint num="12" id="391" />
-<TGConnectingPoint num="13" id="392" />
-<TGConnectingPoint num="14" id="393" />
-<TGConnectingPoint num="15" id="394" />
-<TGConnectingPoint num="16" id="395" />
-<TGConnectingPoint num="17" id="396" />
-<TGConnectingPoint num="18" id="397" />
-<TGConnectingPoint num="19" id="398" />
-<TGConnectingPoint num="20" id="399" />
-<TGConnectingPoint num="21" id="400" />
-<TGConnectingPoint num="22" id="401" />
-<TGConnectingPoint num="23" id="402" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="414" >
-<cdparam x="507" y="628" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="404" />
-<TGConnectingPoint num="1" id="405" />
-<TGConnectingPoint num="2" id="406" />
-<TGConnectingPoint num="3" id="407" />
-<TGConnectingPoint num="4" id="408" />
-<TGConnectingPoint num="5" id="409" />
-<TGConnectingPoint num="6" id="410" />
-<TGConnectingPoint num="7" id="411" />
-<TGConnectingPoint num="8" id="412" />
-<TGConnectingPoint num="9" id="413" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="439" >
-<cdparam x="405" y="405" />
-<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5003" id="30" >
+<cdparam x="631" y="81" />
+<sizeparam width="110" height="56" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC1" />
-<TGConnectingPoint num="0" id="415" />
-<TGConnectingPoint num="1" id="416" />
-<TGConnectingPoint num="2" id="417" />
-<TGConnectingPoint num="3" id="418" />
-<TGConnectingPoint num="4" id="419" />
-<TGConnectingPoint num="5" id="420" />
-<TGConnectingPoint num="6" id="421" />
-<TGConnectingPoint num="7" id="422" />
-<TGConnectingPoint num="8" id="423" />
-<TGConnectingPoint num="9" id="424" />
-<TGConnectingPoint num="10" id="425" />
-<TGConnectingPoint num="11" id="426" />
-<TGConnectingPoint num="12" id="427" />
-<TGConnectingPoint num="13" id="428" />
-<TGConnectingPoint num="14" id="429" />
-<TGConnectingPoint num="15" id="430" />
-<TGConnectingPoint num="16" id="431" />
-<TGConnectingPoint num="17" id="432" />
-<TGConnectingPoint num="18" id="433" />
-<TGConnectingPoint num="19" id="434" />
-<TGConnectingPoint num="20" id="435" />
-<TGConnectingPoint num="21" id="436" />
-<TGConnectingPoint num="22" id="437" />
-<TGConnectingPoint num="23" id="438" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="DataType0" value="Key" />
+<TGConnectingPoint num="0" id="22" />
+<TGConnectingPoint num="1" id="23" />
+<TGConnectingPoint num="2" id="24" />
+<TGConnectingPoint num="3" id="25" />
+<TGConnectingPoint num="4" id="26" />
+<TGConnectingPoint num="5" id="27" />
+<TGConnectingPoint num="6" id="28" />
+<TGConnectingPoint num="7" id="29" />
+<extraparam>
+<Attribute access="0" id="data" value="" type="8" typeOther="" />
+</extraparam>
</COMPONENT>
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="1900" >
-<CONNECTOR type="5102" id="441" >
-<cdparam x="621" y="895" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="621" y="895" id="489" />
-<P2 x="459" y="963" id="501" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="440" >
-<father id="441" num="0" />
-<cdparam x="437" y="926" />
-<sizeparam width="191" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5000" id="155" >
+<cdparam x="44" y="189" />
+<sizeparam width="783" height="387" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="SecuredSystem" />
+<TGConnectingPoint num="0" id="131" />
+<TGConnectingPoint num="1" id="132" />
+<TGConnectingPoint num="2" id="133" />
+<TGConnectingPoint num="3" id="134" />
+<TGConnectingPoint num="4" id="135" />
+<TGConnectingPoint num="5" id="136" />
+<TGConnectingPoint num="6" id="137" />
+<TGConnectingPoint num="7" id="138" />
+<TGConnectingPoint num="8" id="139" />
+<TGConnectingPoint num="9" id="140" />
+<TGConnectingPoint num="10" id="141" />
+<TGConnectingPoint num="11" id="142" />
+<TGConnectingPoint num="12" id="143" />
+<TGConnectingPoint num="13" id="144" />
+<TGConnectingPoint num="14" id="145" />
+<TGConnectingPoint num="15" id="146" />
+<TGConnectingPoint num="16" id="147" />
+<TGConnectingPoint num="17" id="148" />
+<TGConnectingPoint num="18" id="149" />
+<TGConnectingPoint num="19" id="150" />
+<TGConnectingPoint num="20" id="151" />
+<TGConnectingPoint num="21" id="152" />
+<TGConnectingPoint num="22" id="153" />
+<TGConnectingPoint num="23" id="154" />
<extraparam>
-<guard value="[msg.data == timerexpire.data ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
+<Signal value="in chin(Message msg)" />
+<Signal value="out chout(Message msg)" />
+<Signal value="in chinprivate(Message msg)" />
+<Signal value="out choutprivate(Message msg)" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5000" id="80" >
+<father id="155" num="0" />
+<cdparam x="495" y="281" />
+<sizeparam width="315" height="281" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="468" minY="0" maxY="106" />
+<infoparam name="Block0" value="KM" />
+<TGConnectingPoint num="0" id="56" />
+<TGConnectingPoint num="1" id="57" />
+<TGConnectingPoint num="2" id="58" />
+<TGConnectingPoint num="3" id="59" />
+<TGConnectingPoint num="4" id="60" />
+<TGConnectingPoint num="5" id="61" />
+<TGConnectingPoint num="6" id="62" />
+<TGConnectingPoint num="7" id="63" />
+<TGConnectingPoint num="8" id="64" />
+<TGConnectingPoint num="9" id="65" />
+<TGConnectingPoint num="10" id="66" />
+<TGConnectingPoint num="11" id="67" />
+<TGConnectingPoint num="12" id="68" />
+<TGConnectingPoint num="13" id="69" />
+<TGConnectingPoint num="14" id="70" />
+<TGConnectingPoint num="15" id="71" />
+<TGConnectingPoint num="16" id="72" />
+<TGConnectingPoint num="17" id="73" />
+<TGConnectingPoint num="18" id="74" />
+<TGConnectingPoint num="19" id="75" />
+<TGConnectingPoint num="20" id="76" />
+<TGConnectingPoint num="21" id="77" />
+<TGConnectingPoint num="22" id="78" />
+<TGConnectingPoint num="23" id="79" />
+<extraparam>
+<Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg7" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="timestamp1" value="" type="8" typeOther="" />
+<Attribute access="0" id="timestamp2" value="" type="8" typeOther="" />
+<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
+<Attribute access="0" id="b" value="" type="4" typeOther="" />
+<Attribute access="0" id="timerexpire" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="settimer" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg8" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msgauth" value="" type="5" typeOther="Message" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
</extraparam>
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="443" >
-<cdparam x="654" y="890" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="651" y="895" id="481" />
-<P2 x="755" y="946" id="623" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="442" >
-<father id="443" num="0" />
-<cdparam x="728" y="893" />
-<sizeparam width="217" height="48" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="55" >
+<father id="80" num="0" />
+<cdparam x="593" y="331" />
+<sizeparam width="212" height="134" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<cdrectangleparam minX="0" maxX="103" minY="0" maxY="147" />
+<infoparam name="Block0" value="TimerKM" />
+<TGConnectingPoint num="0" id="31" />
+<TGConnectingPoint num="1" id="32" />
+<TGConnectingPoint num="2" id="33" />
+<TGConnectingPoint num="3" id="34" />
+<TGConnectingPoint num="4" id="35" />
+<TGConnectingPoint num="5" id="36" />
+<TGConnectingPoint num="6" id="37" />
+<TGConnectingPoint num="7" id="38" />
+<TGConnectingPoint num="8" id="39" />
+<TGConnectingPoint num="9" id="40" />
+<TGConnectingPoint num="10" id="41" />
+<TGConnectingPoint num="11" id="42" />
+<TGConnectingPoint num="12" id="43" />
+<TGConnectingPoint num="13" id="44" />
+<TGConnectingPoint num="14" id="45" />
+<TGConnectingPoint num="15" id="46" />
+<TGConnectingPoint num="16" id="47" />
+<TGConnectingPoint num="17" id="48" />
+<TGConnectingPoint num="18" id="49" />
+<TGConnectingPoint num="19" id="50" />
+<TGConnectingPoint num="20" id="51" />
+<TGConnectingPoint num="21" id="52" />
+<TGConnectingPoint num="22" id="53" />
+<TGConnectingPoint num="23" id="54" />
<extraparam>
-<guard value="[not(msg.data == timerexpire.data) ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="get2(msg, msg5, msg4)" />
-<actions value="b = verifyMAC(msg5, PSKN, msg4)" />
+<Attribute access="0" id="settimer" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="timerexpire" value="" type="5" typeOther="Message" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
</extraparam>
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="445" >
-<cdparam x="524" y="710" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="529" y="715" id="526" />
-<P2 x="551" y="739" id="734" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="444" >
-<father id="445" num="0" />
-<cdparam x="524" y="750" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="105" >
+<father id="155" num="1" />
+<cdparam x="277" y="282" />
+<sizeparam width="206" height="279" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<cdrectangleparam minX="0" maxX="577" minY="0" maxY="108" />
+<infoparam name="Block0" value="ECU1" />
+<TGConnectingPoint num="0" id="81" />
+<TGConnectingPoint num="1" id="82" />
+<TGConnectingPoint num="2" id="83" />
+<TGConnectingPoint num="3" id="84" />
+<TGConnectingPoint num="4" id="85" />
+<TGConnectingPoint num="5" id="86" />
+<TGConnectingPoint num="6" id="87" />
+<TGConnectingPoint num="7" id="88" />
+<TGConnectingPoint num="8" id="89" />
+<TGConnectingPoint num="9" id="90" />
+<TGConnectingPoint num="10" id="91" />
+<TGConnectingPoint num="11" id="92" />
+<TGConnectingPoint num="12" id="93" />
+<TGConnectingPoint num="13" id="94" />
+<TGConnectingPoint num="14" id="95" />
+<TGConnectingPoint num="15" id="96" />
+<TGConnectingPoint num="16" id="97" />
+<TGConnectingPoint num="17" id="98" />
+<TGConnectingPoint num="18" id="99" />
+<TGConnectingPoint num="19" id="100" />
+<TGConnectingPoint num="20" id="101" />
+<TGConnectingPoint num="21" id="102" />
+<TGConnectingPoint num="22" id="103" />
+<TGConnectingPoint num="23" id="104" />
<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
+<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="groupid" value="" type="8" typeOther="" />
+<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
+<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
+<Attribute access="0" id="b" value="" type="4" typeOther="" />
+<Attribute access="0" id="confData" value="" type="8" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="130" >
+<father id="155" num="2" />
+<cdparam x="54" y="283" />
+<sizeparam width="215" height="278" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="568" minY="0" maxY="109" />
+<infoparam name="Block0" value="ECUN" />
+<TGConnectingPoint num="0" id="106" />
+<TGConnectingPoint num="1" id="107" />
+<TGConnectingPoint num="2" id="108" />
+<TGConnectingPoint num="3" id="109" />
+<TGConnectingPoint num="4" id="110" />
+<TGConnectingPoint num="5" id="111" />
+<TGConnectingPoint num="6" id="112" />
+<TGConnectingPoint num="7" id="113" />
+<TGConnectingPoint num="8" id="114" />
+<TGConnectingPoint num="9" id="115" />
+<TGConnectingPoint num="10" id="116" />
+<TGConnectingPoint num="11" id="117" />
+<TGConnectingPoint num="12" id="118" />
+<TGConnectingPoint num="13" id="119" />
+<TGConnectingPoint num="14" id="120" />
+<TGConnectingPoint num="15" id="121" />
+<TGConnectingPoint num="16" id="122" />
+<TGConnectingPoint num="17" id="123" />
+<TGConnectingPoint num="18" id="124" />
+<TGConnectingPoint num="19" id="125" />
+<TGConnectingPoint num="20" id="126" />
+<TGConnectingPoint num="21" id="127" />
+<TGConnectingPoint num="22" id="128" />
+<TGConnectingPoint num="23" id="129" />
+<extraparam>
+<Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="keyOfGroup" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg3" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
+<Attribute access="0" id="ACK" value="" type="8" typeOther="" />
+<Attribute access="0" id="b" value="" type="4" typeOther="" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="447" >
-<cdparam x="988" y="1206" />
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="SecuredSystem" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="5100" id="157" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="156" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="ECUN" minX="10" maxX="1400" minY="10" maxY="1400" >
+<CONNECTOR type="5102" id="159" >
+<cdparam x="638" y="1030" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="877" y="1165" id="578" />
-<P2 x="886" y="1208" id="536" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="638" y="1030" id="241" />
+<P2 x="656" y="1133" id="186" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="446" >
-<father id="447" num="0" />
-<cdparam x="938" y="1171" />
-<sizeparam width="315" height="80" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="158" >
+<father id="159" num="0" />
+<cdparam x="654" y="1057" />
+<sizeparam width="223" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1187,30 +1147,27 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="msg1.data = ACK" />
-<actions value="msg2.data = timestamp2" />
-<actions value="msg3 = concat2(msg1, msg2)" />
-<actions value="msg4 = MAC(msg3, PSK1)" />
-<actions value="msg = concat2(msg3, msg4)" />
+<actions value="msg3 = sdecrypt(msg1, keyOfGroup)" />
+<actions value="secretData = msg3.data" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="449" >
-<cdparam x="427" y="156" />
+<CONNECTOR type="5102" id="161" >
+<cdparam x="514" y="919" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to Send signal" value="null" />
-<P1 x="393" y="108" id="830" />
-<P2 x="398" y="137" id="819" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="514" y="919" id="274" />
+<P2 x="417" y="985" id="211" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="448" >
-<father id="449" num="0" />
-<cdparam x="427" y="196" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="160" >
+<father id="161" num="0" />
+<cdparam x="413" y="957" />
+<sizeparam width="46" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[ not(b)]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -1218,47 +1175,45 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="451" >
-<cdparam x="472" y="500" />
+<CONNECTOR type="5102" id="163" >
+<cdparam x="570" y="919" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<P1 x="498" y="441" id="653" />
-<P2 x="508" y="569" id="673" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="570" y="919" id="275" />
+<P2 x="638" y="990" id="236" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="450" >
-<father id="451" num="0" />
-<cdparam x="531" y="526" />
-<sizeparam width="307" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="162" >
+<father id="163" num="0" />
+<cdparam x="570" y="959" />
+<sizeparam width="24" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="get3(msg1, msg5, msg2, msg3)" />
-<actions value="msgauth= sdecrypt(msg5, PSK1)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="453" >
-<cdparam x="472" y="500" />
+<CONNECTOR type="5102" id="165" >
+<cdparam x="342" y="72" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="378" y="347" id="808" />
-<P2 x="265" y="421" id="770" />
+<infoparam name="connector from start state to state0" value="null" />
+<P1 x="342" y="72" id="385" />
+<P2 x="342" y="100" id="361" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="452" >
-<father id="453" num="0" />
-<cdparam x="263" y="392" />
-<sizeparam width="190" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="164" >
+<father id="165" num="0" />
+<cdparam x="342" y="112" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[not(msg8.data == msg4.data) ]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -1266,17 +1221,17 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="455" >
-<cdparam x="517" y="650" />
+<CONNECTOR type="5102" id="167" >
+<cdparam x="548" y="792" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="518" y="668" id="759" />
-<P2 x="529" y="685" id="525" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<P1 x="548" y="792" id="399" />
+<P2 x="542" y="879" id="261" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="454" >
-<father id="455" num="0" />
-<cdparam x="517" y="690" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="166" >
+<father id="167" num="0" />
+<cdparam x="548" y="832" />
+<sizeparam width="240" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1286,25 +1241,27 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="get2(msg, msg1, msg2)" />
+<actions value="b = verifyMAC(msg1, keyOfGroup, msg2)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="457" >
-<cdparam x="710" y="775" />
+<CONNECTOR type="5102" id="169" >
+<cdparam x="434" y="475" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="607" y="823" id="723" />
-<P2 x="651" y="855" id="476" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<P1 x="479" y="445" id="460" />
+<P2 x="530" y="495" id="336" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="456" >
-<father id="457" num="0" />
-<cdparam x="685" y="829" />
-<sizeparam width="201" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="168" >
+<father id="169" num="0" />
+<cdparam x="529" y="457" />
+<sizeparam width="291" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -1312,16 +1269,16 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="459" >
-<cdparam x="413" y="171" />
+<CONNECTOR type="5102" id="171" >
+<cdparam x="486" y="696" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="398" y="167" id="820" />
-<P2 x="400" y="185" id="698" />
+<P1 x="543" y="653" id="435" />
+<P2 x="548" y="688" id="410" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="458" >
-<father id="459" num="0" />
-<cdparam x="413" y="211" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="170" >
+<father id="171" num="0" />
+<cdparam x="486" y="736" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1335,41 +1292,40 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="461" >
-<cdparam x="820" y="859" />
+<CONNECTOR type="5102" id="173" >
+<cdparam x="548" y="728" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<P1 x="794" y="986" id="637" />
-<P2 x="821" y="1036" id="598" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="548" y="728" id="415" />
+<P2 x="548" y="762" id="398" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="460" >
-<father id="461" num="0" />
-<cdparam x="851" y="1007" />
-<sizeparam width="186" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="172" >
+<father id="173" num="0" />
+<cdparam x="548" y="768" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="get3(msg5, msg1, msg2, msg3)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="463" >
-<cdparam x="420" y="415" />
+<CONNECTOR type="5102" id="175" >
+<cdparam x="304" y="307" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="400" y="225" id="703" />
-<P2 x="403" y="307" id="795" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<P1 x="429" y="362" id="291" />
+<P2 x="454" y="405" id="446" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="462" >
-<father id="463" num="0" />
-<cdparam x="414" y="254" />
-<sizeparam width="218" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="174" >
+<father id="175" num="0" />
+<cdparam x="440" y="381" />
+<sizeparam width="201" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1379,22 +1335,21 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="get2(msg8, msg1, msg4)" />
-<actions value="msg8 = MAC(msg1, PSK1)" />
+<actions value="b = verifyMAC(msg5, PSKN, msg6)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="465" >
-<cdparam x="967" y="524" />
+<CONNECTOR type="5102" id="177" >
+<cdparam x="342" y="140" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="508" y="609" id="678" />
-<P2 x="518" y="638" id="758" />
+<P1 x="342" y="140" id="366" />
+<P2 x="350" y="173" id="387" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="464" >
-<father id="465" num="0" />
-<cdparam x="622" y="620" />
-<sizeparam width="307" height="80" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="176" >
+<father id="177" num="0" />
+<cdparam x="342" y="180" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -1404,56 +1359,48 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="msg7 = sencrypt(msgauth, PSKN)" />
-<actions value="msg3.data = timestamp1" />
-<actions value="msg1 = concat4(msg7, msg2, msg3, msg3)" />
-<actions value="msg4 = MAC(msg1, PSKN)" />
-<actions value="msg=concat2(msg1, msg4)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="468" >
-<cdparam x="433" y="416" />
+<CONNECTOR type="5102" id="179" >
+<cdparam x="518" y="526" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="403" y="347" id="800" />
-<P2 x="498" y="401" id="648" />
-<Point x="469" y="374" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="530" y="535" id="341" />
+<P2 x="543" y="623" id="434" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="466" >
-<father id="468" num="0" />
-<cdparam x="469" y="374" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="467" >
-<father id="468" num="1" />
-<cdparam x="492" y="361" />
-<sizeparam width="160" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="178" >
+<father id="179" num="0" />
+<cdparam x="565" y="553" />
+<sizeparam width="323" height="96" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[msg8.data == msg4.data]" />
+<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="keyOfGroup.data = msg1.data" />
+<actions value="msg1.data = ACK" />
+<actions value="msg2.data = timestamp" />
+<actions value="msg3 = concat2(msg1, msg2)" />
+<actions value="msg4 = MAC(msg3, PSKN)" />
+<actions value="msg = concat2(msg3, msg4)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="470" >
-<cdparam x="604" y="757" />
+<CONNECTOR type="5102" id="181" >
+<cdparam x="350" y="203" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="600" y="779" id="748" />
-<P2 x="607" y="793" id="722" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="350" y="203" id="388" />
+<P2 x="406" y="238" id="311" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="469" >
-<father id="470" num="0" />
-<cdparam x="604" y="797" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="180" >
+<father id="181" num="0" />
+<cdparam x="350" y="243" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1467,42 +1414,28 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="472" >
-<cdparam x="983" y="1157" />
+<CONNECTOR type="5102" id="184" >
+<cdparam x="406" y="268" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="851" y="1076" id="612" />
-<P2 x="877" y="1125" id="573" />
+<P1 x="406" y="268" id="316" />
+<P2 x="429" y="322" id="286" />
+<Point x="414" y="282" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="471" >
-<father id="472" num="0" />
-<cdparam x="885" y="1097" />
-<sizeparam width="130" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="182" >
+<father id="184" num="0" />
+<cdparam x="414" y="282" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<extraparam>
-<guard value="[msg1.data == ACK ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="474" >
-<cdparam x="1007" y="1347" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="886" y="1238" id="537" />
-<P2 x="907" y="1287" id="548" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="473" >
-<father id="474" num="0" />
-<cdparam x="1007" y="1387" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="183" >
+<father id="184" num="1" />
+<cdparam x="446" y="292" />
+<sizeparam width="226" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
<guard value="[ ]" />
@@ -1510,505 +1443,407 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="get2(msg, msg5, msg6)" />
+<actions value="get4(msg5, msg1, msg2, msg3, msg4)" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="499" >
-<cdparam x="592" y="855" />
-<sizeparam width="118" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="475" />
-<TGConnectingPoint num="1" id="476" />
-<TGConnectingPoint num="2" id="477" />
-<TGConnectingPoint num="3" id="478" />
-<TGConnectingPoint num="4" id="479" />
-<TGConnectingPoint num="5" id="480" />
-<TGConnectingPoint num="6" id="481" />
-<TGConnectingPoint num="7" id="482" />
-<TGConnectingPoint num="8" id="483" />
-<TGConnectingPoint num="9" id="484" />
-<TGConnectingPoint num="10" id="485" />
-<TGConnectingPoint num="11" id="486" />
-<TGConnectingPoint num="12" id="487" />
-<TGConnectingPoint num="13" id="488" />
-<TGConnectingPoint num="14" id="489" />
-<TGConnectingPoint num="15" id="490" />
-<TGConnectingPoint num="16" id="491" />
-<TGConnectingPoint num="17" id="492" />
-<TGConnectingPoint num="18" id="493" />
-<TGConnectingPoint num="19" id="494" />
-<TGConnectingPoint num="20" id="495" />
-<TGConnectingPoint num="21" id="496" />
-<TGConnectingPoint num="22" id="497" />
-<TGConnectingPoint num="23" id="498" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="524" >
-<cdparam x="369" y="963" />
-<sizeparam width="181" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="timerExpired" />
-<TGConnectingPoint num="0" id="500" />
-<TGConnectingPoint num="1" id="501" />
-<TGConnectingPoint num="2" id="502" />
-<TGConnectingPoint num="3" id="503" />
-<TGConnectingPoint num="4" id="504" />
-<TGConnectingPoint num="5" id="505" />
-<TGConnectingPoint num="6" id="506" />
-<TGConnectingPoint num="7" id="507" />
-<TGConnectingPoint num="8" id="508" />
-<TGConnectingPoint num="9" id="509" />
-<TGConnectingPoint num="10" id="510" />
-<TGConnectingPoint num="11" id="511" />
-<TGConnectingPoint num="12" id="512" />
-<TGConnectingPoint num="13" id="513" />
-<TGConnectingPoint num="14" id="514" />
-<TGConnectingPoint num="15" id="515" />
-<TGConnectingPoint num="16" id="516" />
-<TGConnectingPoint num="17" id="517" />
-<TGConnectingPoint num="18" id="518" />
-<TGConnectingPoint num="19" id="519" />
-<TGConnectingPoint num="20" id="520" />
-<TGConnectingPoint num="21" id="521" />
-<TGConnectingPoint num="22" id="522" />
-<TGConnectingPoint num="23" id="523" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="535" >
-<cdparam x="483" y="690" />
-<sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="209" >
+<cdparam x="595" y="1133" />
+<sizeparam width="122" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chout(settimer)" />
-<TGConnectingPoint num="0" id="525" />
-<TGConnectingPoint num="1" id="526" />
-<TGConnectingPoint num="2" id="527" />
-<TGConnectingPoint num="3" id="528" />
-<TGConnectingPoint num="4" id="529" />
-<TGConnectingPoint num="5" id="530" />
-<TGConnectingPoint num="6" id="531" />
-<TGConnectingPoint num="7" id="532" />
-<TGConnectingPoint num="8" id="533" />
-<TGConnectingPoint num="9" id="534" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="546" >
-<cdparam x="850" y="1213" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="gotData" />
+<TGConnectingPoint num="0" id="185" />
+<TGConnectingPoint num="1" id="186" />
+<TGConnectingPoint num="2" id="187" />
+<TGConnectingPoint num="3" id="188" />
+<TGConnectingPoint num="4" id="189" />
+<TGConnectingPoint num="5" id="190" />
+<TGConnectingPoint num="6" id="191" />
+<TGConnectingPoint num="7" id="192" />
+<TGConnectingPoint num="8" id="193" />
+<TGConnectingPoint num="9" id="194" />
+<TGConnectingPoint num="10" id="195" />
+<TGConnectingPoint num="11" id="196" />
+<TGConnectingPoint num="12" id="197" />
+<TGConnectingPoint num="13" id="198" />
+<TGConnectingPoint num="14" id="199" />
+<TGConnectingPoint num="15" id="200" />
+<TGConnectingPoint num="16" id="201" />
+<TGConnectingPoint num="17" id="202" />
+<TGConnectingPoint num="18" id="203" />
+<TGConnectingPoint num="19" id="204" />
+<TGConnectingPoint num="20" id="205" />
+<TGConnectingPoint num="21" id="206" />
+<TGConnectingPoint num="22" id="207" />
+<TGConnectingPoint num="23" id="208" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="234" >
+<cdparam x="366" y="985" />
+<sizeparam width="102" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="536" />
-<TGConnectingPoint num="1" id="537" />
-<TGConnectingPoint num="2" id="538" />
-<TGConnectingPoint num="3" id="539" />
-<TGConnectingPoint num="4" id="540" />
-<TGConnectingPoint num="5" id="541" />
-<TGConnectingPoint num="6" id="542" />
-<TGConnectingPoint num="7" id="543" />
-<TGConnectingPoint num="8" id="544" />
-<TGConnectingPoint num="9" id="545" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="571" >
-<cdparam x="810" y="1287" />
-<sizeparam width="194" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="MacDataFailed" />
+<TGConnectingPoint num="0" id="210" />
+<TGConnectingPoint num="1" id="211" />
+<TGConnectingPoint num="2" id="212" />
+<TGConnectingPoint num="3" id="213" />
+<TGConnectingPoint num="4" id="214" />
+<TGConnectingPoint num="5" id="215" />
+<TGConnectingPoint num="6" id="216" />
+<TGConnectingPoint num="7" id="217" />
+<TGConnectingPoint num="8" id="218" />
+<TGConnectingPoint num="9" id="219" />
+<TGConnectingPoint num="10" id="220" />
+<TGConnectingPoint num="11" id="221" />
+<TGConnectingPoint num="12" id="222" />
+<TGConnectingPoint num="13" id="223" />
+<TGConnectingPoint num="14" id="224" />
+<TGConnectingPoint num="15" id="225" />
+<TGConnectingPoint num="16" id="226" />
+<TGConnectingPoint num="17" id="227" />
+<TGConnectingPoint num="18" id="228" />
+<TGConnectingPoint num="19" id="229" />
+<TGConnectingPoint num="20" id="230" />
+<TGConnectingPoint num="21" id="231" />
+<TGConnectingPoint num="22" id="232" />
+<TGConnectingPoint num="23" id="233" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="259" >
+<cdparam x="580" y="990" />
+<sizeparam width="116" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="ACK_FORWARDED" />
-<TGConnectingPoint num="0" id="547" />
-<TGConnectingPoint num="1" id="548" />
-<TGConnectingPoint num="2" id="549" />
-<TGConnectingPoint num="3" id="550" />
-<TGConnectingPoint num="4" id="551" />
-<TGConnectingPoint num="5" id="552" />
-<TGConnectingPoint num="6" id="553" />
-<TGConnectingPoint num="7" id="554" />
-<TGConnectingPoint num="8" id="555" />
-<TGConnectingPoint num="9" id="556" />
-<TGConnectingPoint num="10" id="557" />
-<TGConnectingPoint num="11" id="558" />
-<TGConnectingPoint num="12" id="559" />
-<TGConnectingPoint num="13" id="560" />
-<TGConnectingPoint num="14" id="561" />
-<TGConnectingPoint num="15" id="562" />
-<TGConnectingPoint num="16" id="563" />
-<TGConnectingPoint num="17" id="564" />
-<TGConnectingPoint num="18" id="565" />
-<TGConnectingPoint num="19" id="566" />
-<TGConnectingPoint num="20" id="567" />
-<TGConnectingPoint num="21" id="568" />
-<TGConnectingPoint num="22" id="569" />
-<TGConnectingPoint num="23" id="570" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="596" >
-<cdparam x="805" y="1125" />
-<sizeparam width="144" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="MACDataOK" />
+<TGConnectingPoint num="0" id="235" />
+<TGConnectingPoint num="1" id="236" />
+<TGConnectingPoint num="2" id="237" />
+<TGConnectingPoint num="3" id="238" />
+<TGConnectingPoint num="4" id="239" />
+<TGConnectingPoint num="5" id="240" />
+<TGConnectingPoint num="6" id="241" />
+<TGConnectingPoint num="7" id="242" />
+<TGConnectingPoint num="8" id="243" />
+<TGConnectingPoint num="9" id="244" />
+<TGConnectingPoint num="10" id="245" />
+<TGConnectingPoint num="11" id="246" />
+<TGConnectingPoint num="12" id="247" />
+<TGConnectingPoint num="13" id="248" />
+<TGConnectingPoint num="14" id="249" />
+<TGConnectingPoint num="15" id="250" />
+<TGConnectingPoint num="16" id="251" />
+<TGConnectingPoint num="17" id="252" />
+<TGConnectingPoint num="18" id="253" />
+<TGConnectingPoint num="19" id="254" />
+<TGConnectingPoint num="20" id="255" />
+<TGConnectingPoint num="21" id="256" />
+<TGConnectingPoint num="22" id="257" />
+<TGConnectingPoint num="23" id="258" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="284" >
+<cdparam x="486" y="879" />
+<sizeparam width="113" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="ACK_OK" />
-<TGConnectingPoint num="0" id="572" />
-<TGConnectingPoint num="1" id="573" />
-<TGConnectingPoint num="2" id="574" />
-<TGConnectingPoint num="3" id="575" />
-<TGConnectingPoint num="4" id="576" />
-<TGConnectingPoint num="5" id="577" />
-<TGConnectingPoint num="6" id="578" />
-<TGConnectingPoint num="7" id="579" />
-<TGConnectingPoint num="8" id="580" />
-<TGConnectingPoint num="9" id="581" />
-<TGConnectingPoint num="10" id="582" />
-<TGConnectingPoint num="11" id="583" />
-<TGConnectingPoint num="12" id="584" />
-<TGConnectingPoint num="13" id="585" />
-<TGConnectingPoint num="14" id="586" />
-<TGConnectingPoint num="15" id="587" />
-<TGConnectingPoint num="16" id="588" />
-<TGConnectingPoint num="17" id="589" />
-<TGConnectingPoint num="18" id="590" />
-<TGConnectingPoint num="19" id="591" />
-<TGConnectingPoint num="20" id="592" />
-<TGConnectingPoint num="21" id="593" />
-<TGConnectingPoint num="22" id="594" />
-<TGConnectingPoint num="23" id="595" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="621" >
-<cdparam x="762" y="1036" />
-<sizeparam width="119" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testingMAC" />
+<TGConnectingPoint num="0" id="260" />
+<TGConnectingPoint num="1" id="261" />
+<TGConnectingPoint num="2" id="262" />
+<TGConnectingPoint num="3" id="263" />
+<TGConnectingPoint num="4" id="264" />
+<TGConnectingPoint num="5" id="265" />
+<TGConnectingPoint num="6" id="266" />
+<TGConnectingPoint num="7" id="267" />
+<TGConnectingPoint num="8" id="268" />
+<TGConnectingPoint num="9" id="269" />
+<TGConnectingPoint num="10" id="270" />
+<TGConnectingPoint num="11" id="271" />
+<TGConnectingPoint num="12" id="272" />
+<TGConnectingPoint num="13" id="273" />
+<TGConnectingPoint num="14" id="274" />
+<TGConnectingPoint num="15" id="275" />
+<TGConnectingPoint num="16" id="276" />
+<TGConnectingPoint num="17" id="277" />
+<TGConnectingPoint num="18" id="278" />
+<TGConnectingPoint num="19" id="279" />
+<TGConnectingPoint num="20" id="280" />
+<TGConnectingPoint num="21" id="281" />
+<TGConnectingPoint num="22" id="282" />
+<TGConnectingPoint num="23" id="283" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="309" >
+<cdparam x="353" y="322" />
+<sizeparam width="153" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="CheckACK" />
-<TGConnectingPoint num="0" id="597" />
-<TGConnectingPoint num="1" id="598" />
-<TGConnectingPoint num="2" id="599" />
-<TGConnectingPoint num="3" id="600" />
-<TGConnectingPoint num="4" id="601" />
-<TGConnectingPoint num="5" id="602" />
-<TGConnectingPoint num="6" id="603" />
-<TGConnectingPoint num="7" id="604" />
-<TGConnectingPoint num="8" id="605" />
-<TGConnectingPoint num="9" id="606" />
-<TGConnectingPoint num="10" id="607" />
-<TGConnectingPoint num="11" id="608" />
-<TGConnectingPoint num="12" id="609" />
-<TGConnectingPoint num="13" id="610" />
-<TGConnectingPoint num="14" id="611" />
-<TGConnectingPoint num="15" id="612" />
-<TGConnectingPoint num="16" id="613" />
-<TGConnectingPoint num="17" id="614" />
-<TGConnectingPoint num="18" id="615" />
-<TGConnectingPoint num="19" id="616" />
-<TGConnectingPoint num="20" id="617" />
-<TGConnectingPoint num="21" id="618" />
-<TGConnectingPoint num="22" id="619" />
-<TGConnectingPoint num="23" id="620" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="646" >
-<cdparam x="676" y="946" />
-<sizeparam width="158" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testMAC0" />
+<TGConnectingPoint num="0" id="285" />
+<TGConnectingPoint num="1" id="286" />
+<TGConnectingPoint num="2" id="287" />
+<TGConnectingPoint num="3" id="288" />
+<TGConnectingPoint num="4" id="289" />
+<TGConnectingPoint num="5" id="290" />
+<TGConnectingPoint num="6" id="291" />
+<TGConnectingPoint num="7" id="292" />
+<TGConnectingPoint num="8" id="293" />
+<TGConnectingPoint num="9" id="294" />
+<TGConnectingPoint num="10" id="295" />
+<TGConnectingPoint num="11" id="296" />
+<TGConnectingPoint num="12" id="297" />
+<TGConnectingPoint num="13" id="298" />
+<TGConnectingPoint num="14" id="299" />
+<TGConnectingPoint num="15" id="300" />
+<TGConnectingPoint num="16" id="301" />
+<TGConnectingPoint num="17" id="302" />
+<TGConnectingPoint num="18" id="303" />
+<TGConnectingPoint num="19" id="304" />
+<TGConnectingPoint num="20" id="305" />
+<TGConnectingPoint num="21" id="306" />
+<TGConnectingPoint num="22" id="307" />
+<TGConnectingPoint num="23" id="308" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="334" >
+<cdparam x="311" y="238" />
+<sizeparam width="190" height="30" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="CheckACKMAC" />
-<TGConnectingPoint num="0" id="622" />
-<TGConnectingPoint num="1" id="623" />
-<TGConnectingPoint num="2" id="624" />
-<TGConnectingPoint num="3" id="625" />
-<TGConnectingPoint num="4" id="626" />
-<TGConnectingPoint num="5" id="627" />
-<TGConnectingPoint num="6" id="628" />
-<TGConnectingPoint num="7" id="629" />
-<TGConnectingPoint num="8" id="630" />
-<TGConnectingPoint num="9" id="631" />
-<TGConnectingPoint num="10" id="632" />
-<TGConnectingPoint num="11" id="633" />
-<TGConnectingPoint num="12" id="634" />
-<TGConnectingPoint num="13" id="635" />
-<TGConnectingPoint num="14" id="636" />
-<TGConnectingPoint num="15" id="637" />
-<TGConnectingPoint num="16" id="638" />
-<TGConnectingPoint num="17" id="639" />
-<TGConnectingPoint num="18" id="640" />
-<TGConnectingPoint num="19" id="641" />
-<TGConnectingPoint num="20" id="642" />
-<TGConnectingPoint num="21" id="643" />
-<TGConnectingPoint num="22" id="644" />
-<TGConnectingPoint num="23" id="645" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="671" >
-<cdparam x="403" y="401" />
-<sizeparam width="191" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="GotMessage" />
+<TGConnectingPoint num="0" id="310" />
+<TGConnectingPoint num="1" id="311" />
+<TGConnectingPoint num="2" id="312" />
+<TGConnectingPoint num="3" id="313" />
+<TGConnectingPoint num="4" id="314" />
+<TGConnectingPoint num="5" id="315" />
+<TGConnectingPoint num="6" id="316" />
+<TGConnectingPoint num="7" id="317" />
+<TGConnectingPoint num="8" id="318" />
+<TGConnectingPoint num="9" id="319" />
+<TGConnectingPoint num="10" id="320" />
+<TGConnectingPoint num="11" id="321" />
+<TGConnectingPoint num="12" id="322" />
+<TGConnectingPoint num="13" id="323" />
+<TGConnectingPoint num="14" id="324" />
+<TGConnectingPoint num="15" id="325" />
+<TGConnectingPoint num="16" id="326" />
+<TGConnectingPoint num="17" id="327" />
+<TGConnectingPoint num="18" id="328" />
+<TGConnectingPoint num="19" id="329" />
+<TGConnectingPoint num="20" id="330" />
+<TGConnectingPoint num="21" id="331" />
+<TGConnectingPoint num="22" id="332" />
+<TGConnectingPoint num="23" id="333" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="359" >
+<cdparam x="454" y="495" />
+<sizeparam width="152" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="testMAC_OK" />
-<TGConnectingPoint num="0" id="647" />
-<TGConnectingPoint num="1" id="648" />
-<TGConnectingPoint num="2" id="649" />
-<TGConnectingPoint num="3" id="650" />
-<TGConnectingPoint num="4" id="651" />
-<TGConnectingPoint num="5" id="652" />
-<TGConnectingPoint num="6" id="653" />
-<TGConnectingPoint num="7" id="654" />
-<TGConnectingPoint num="8" id="655" />
-<TGConnectingPoint num="9" id="656" />
-<TGConnectingPoint num="10" id="657" />
-<TGConnectingPoint num="11" id="658" />
-<TGConnectingPoint num="12" id="659" />
-<TGConnectingPoint num="13" id="660" />
-<TGConnectingPoint num="14" id="661" />
-<TGConnectingPoint num="15" id="662" />
-<TGConnectingPoint num="16" id="663" />
-<TGConnectingPoint num="17" id="664" />
-<TGConnectingPoint num="18" id="665" />
-<TGConnectingPoint num="19" id="666" />
-<TGConnectingPoint num="20" id="667" />
-<TGConnectingPoint num="21" id="668" />
-<TGConnectingPoint num="22" id="669" />
-<TGConnectingPoint num="23" id="670" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="696" >
-<cdparam x="430" y="569" />
-<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="335" />
+<TGConnectingPoint num="1" id="336" />
+<TGConnectingPoint num="2" id="337" />
+<TGConnectingPoint num="3" id="338" />
+<TGConnectingPoint num="4" id="339" />
+<TGConnectingPoint num="5" id="340" />
+<TGConnectingPoint num="6" id="341" />
+<TGConnectingPoint num="7" id="342" />
+<TGConnectingPoint num="8" id="343" />
+<TGConnectingPoint num="9" id="344" />
+<TGConnectingPoint num="10" id="345" />
+<TGConnectingPoint num="11" id="346" />
+<TGConnectingPoint num="12" id="347" />
+<TGConnectingPoint num="13" id="348" />
+<TGConnectingPoint num="14" id="349" />
+<TGConnectingPoint num="15" id="350" />
+<TGConnectingPoint num="16" id="351" />
+<TGConnectingPoint num="17" id="352" />
+<TGConnectingPoint num="18" id="353" />
+<TGConnectingPoint num="19" id="354" />
+<TGConnectingPoint num="20" id="355" />
+<TGConnectingPoint num="21" id="356" />
+<TGConnectingPoint num="22" id="357" />
+<TGConnectingPoint num="23" id="358" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="384" >
+<cdparam x="259" y="100" />
+<sizeparam width="166" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="decipherOK" />
-<TGConnectingPoint num="0" id="672" />
-<TGConnectingPoint num="1" id="673" />
-<TGConnectingPoint num="2" id="674" />
-<TGConnectingPoint num="3" id="675" />
-<TGConnectingPoint num="4" id="676" />
-<TGConnectingPoint num="5" id="677" />
-<TGConnectingPoint num="6" id="678" />
-<TGConnectingPoint num="7" id="679" />
-<TGConnectingPoint num="8" id="680" />
-<TGConnectingPoint num="9" id="681" />
-<TGConnectingPoint num="10" id="682" />
-<TGConnectingPoint num="11" id="683" />
-<TGConnectingPoint num="12" id="684" />
-<TGConnectingPoint num="13" id="685" />
-<TGConnectingPoint num="14" id="686" />
-<TGConnectingPoint num="15" id="687" />
-<TGConnectingPoint num="16" id="688" />
-<TGConnectingPoint num="17" id="689" />
-<TGConnectingPoint num="18" id="690" />
-<TGConnectingPoint num="19" id="691" />
-<TGConnectingPoint num="20" id="692" />
-<TGConnectingPoint num="21" id="693" />
-<TGConnectingPoint num="22" id="694" />
-<TGConnectingPoint num="23" id="695" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="721" >
-<cdparam x="316" y="185" />
-<sizeparam width="168" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="waitForKeyGroup" />
+<TGConnectingPoint num="0" id="360" />
+<TGConnectingPoint num="1" id="361" />
+<TGConnectingPoint num="2" id="362" />
+<TGConnectingPoint num="3" id="363" />
+<TGConnectingPoint num="4" id="364" />
+<TGConnectingPoint num="5" id="365" />
+<TGConnectingPoint num="6" id="366" />
+<TGConnectingPoint num="7" id="367" />
+<TGConnectingPoint num="8" id="368" />
+<TGConnectingPoint num="9" id="369" />
+<TGConnectingPoint num="10" id="370" />
+<TGConnectingPoint num="11" id="371" />
+<TGConnectingPoint num="12" id="372" />
+<TGConnectingPoint num="13" id="373" />
+<TGConnectingPoint num="14" id="374" />
+<TGConnectingPoint num="15" id="375" />
+<TGConnectingPoint num="16" id="376" />
+<TGConnectingPoint num="17" id="377" />
+<TGConnectingPoint num="18" id="378" />
+<TGConnectingPoint num="19" id="379" />
+<TGConnectingPoint num="20" id="380" />
+<TGConnectingPoint num="21" id="381" />
+<TGConnectingPoint num="22" id="382" />
+<TGConnectingPoint num="23" id="383" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="386" >
+<cdparam x="335" y="52" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="gotFirstMessage" />
-<TGConnectingPoint num="0" id="697" />
-<TGConnectingPoint num="1" id="698" />
-<TGConnectingPoint num="2" id="699" />
-<TGConnectingPoint num="3" id="700" />
-<TGConnectingPoint num="4" id="701" />
-<TGConnectingPoint num="5" id="702" />
-<TGConnectingPoint num="6" id="703" />
-<TGConnectingPoint num="7" id="704" />
-<TGConnectingPoint num="8" id="705" />
-<TGConnectingPoint num="9" id="706" />
-<TGConnectingPoint num="10" id="707" />
-<TGConnectingPoint num="11" id="708" />
-<TGConnectingPoint num="12" id="709" />
-<TGConnectingPoint num="13" id="710" />
-<TGConnectingPoint num="14" id="711" />
-<TGConnectingPoint num="15" id="712" />
-<TGConnectingPoint num="16" id="713" />
-<TGConnectingPoint num="17" id="714" />
-<TGConnectingPoint num="18" id="715" />
-<TGConnectingPoint num="19" id="716" />
-<TGConnectingPoint num="20" id="717" />
-<TGConnectingPoint num="21" id="718" />
-<TGConnectingPoint num="22" id="719" />
-<TGConnectingPoint num="23" id="720" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="732" >
-<cdparam x="571" y="798" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="385" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="397" >
+<cdparam x="314" y="178" />
<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="387" />
+<TGConnectingPoint num="1" id="388" />
+<TGConnectingPoint num="2" id="389" />
+<TGConnectingPoint num="3" id="390" />
+<TGConnectingPoint num="4" id="391" />
+<TGConnectingPoint num="5" id="392" />
+<TGConnectingPoint num="6" id="393" />
+<TGConnectingPoint num="7" id="394" />
+<TGConnectingPoint num="8" id="395" />
+<TGConnectingPoint num="9" id="396" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="408" >
+<cdparam x="512" y="767" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="722" />
-<TGConnectingPoint num="1" id="723" />
-<TGConnectingPoint num="2" id="724" />
-<TGConnectingPoint num="3" id="725" />
-<TGConnectingPoint num="4" id="726" />
-<TGConnectingPoint num="5" id="727" />
-<TGConnectingPoint num="6" id="728" />
-<TGConnectingPoint num="7" id="729" />
-<TGConnectingPoint num="8" id="730" />
-<TGConnectingPoint num="9" id="731" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="757" >
-<cdparam x="454" y="739" />
+<TGConnectingPoint num="0" id="398" />
+<TGConnectingPoint num="1" id="399" />
+<TGConnectingPoint num="2" id="400" />
+<TGConnectingPoint num="3" id="401" />
+<TGConnectingPoint num="4" id="402" />
+<TGConnectingPoint num="5" id="403" />
+<TGConnectingPoint num="6" id="404" />
+<TGConnectingPoint num="7" id="405" />
+<TGConnectingPoint num="8" id="406" />
+<TGConnectingPoint num="9" id="407" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="433" >
+<cdparam x="451" y="688" />
<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="WaitForACK" />
-<TGConnectingPoint num="0" id="733" />
-<TGConnectingPoint num="1" id="734" />
-<TGConnectingPoint num="2" id="735" />
-<TGConnectingPoint num="3" id="736" />
-<TGConnectingPoint num="4" id="737" />
-<TGConnectingPoint num="5" id="738" />
-<TGConnectingPoint num="6" id="739" />
-<TGConnectingPoint num="7" id="740" />
-<TGConnectingPoint num="8" id="741" />
-<TGConnectingPoint num="9" id="742" />
-<TGConnectingPoint num="10" id="743" />
-<TGConnectingPoint num="11" id="744" />
-<TGConnectingPoint num="12" id="745" />
-<TGConnectingPoint num="13" id="746" />
-<TGConnectingPoint num="14" id="747" />
-<TGConnectingPoint num="15" id="748" />
-<TGConnectingPoint num="16" id="749" />
-<TGConnectingPoint num="17" id="750" />
-<TGConnectingPoint num="18" id="751" />
-<TGConnectingPoint num="19" id="752" />
-<TGConnectingPoint num="20" id="753" />
-<TGConnectingPoint num="21" id="754" />
-<TGConnectingPoint num="22" id="755" />
-<TGConnectingPoint num="23" id="756" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="768" >
-<cdparam x="482" y="643" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitForData" />
+<TGConnectingPoint num="0" id="409" />
+<TGConnectingPoint num="1" id="410" />
+<TGConnectingPoint num="2" id="411" />
+<TGConnectingPoint num="3" id="412" />
+<TGConnectingPoint num="4" id="413" />
+<TGConnectingPoint num="5" id="414" />
+<TGConnectingPoint num="6" id="415" />
+<TGConnectingPoint num="7" id="416" />
+<TGConnectingPoint num="8" id="417" />
+<TGConnectingPoint num="9" id="418" />
+<TGConnectingPoint num="10" id="419" />
+<TGConnectingPoint num="11" id="420" />
+<TGConnectingPoint num="12" id="421" />
+<TGConnectingPoint num="13" id="422" />
+<TGConnectingPoint num="14" id="423" />
+<TGConnectingPoint num="15" id="424" />
+<TGConnectingPoint num="16" id="425" />
+<TGConnectingPoint num="17" id="426" />
+<TGConnectingPoint num="18" id="427" />
+<TGConnectingPoint num="19" id="428" />
+<TGConnectingPoint num="20" id="429" />
+<TGConnectingPoint num="21" id="430" />
+<TGConnectingPoint num="22" id="431" />
+<TGConnectingPoint num="23" id="432" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="444" >
+<cdparam x="507" y="628" />
<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="758" />
-<TGConnectingPoint num="1" id="759" />
-<TGConnectingPoint num="2" id="760" />
-<TGConnectingPoint num="3" id="761" />
-<TGConnectingPoint num="4" id="762" />
-<TGConnectingPoint num="5" id="763" />
-<TGConnectingPoint num="6" id="764" />
-<TGConnectingPoint num="7" id="765" />
-<TGConnectingPoint num="8" id="766" />
-<TGConnectingPoint num="9" id="767" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="793" >
-<cdparam x="199" y="421" />
-<sizeparam width="133" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="TestMACFailed" />
-<TGConnectingPoint num="0" id="769" />
-<TGConnectingPoint num="1" id="770" />
-<TGConnectingPoint num="2" id="771" />
-<TGConnectingPoint num="3" id="772" />
-<TGConnectingPoint num="4" id="773" />
-<TGConnectingPoint num="5" id="774" />
-<TGConnectingPoint num="6" id="775" />
-<TGConnectingPoint num="7" id="776" />
-<TGConnectingPoint num="8" id="777" />
-<TGConnectingPoint num="9" id="778" />
-<TGConnectingPoint num="10" id="779" />
-<TGConnectingPoint num="11" id="780" />
-<TGConnectingPoint num="12" id="781" />
-<TGConnectingPoint num="13" id="782" />
-<TGConnectingPoint num="14" id="783" />
-<TGConnectingPoint num="15" id="784" />
-<TGConnectingPoint num="16" id="785" />
-<TGConnectingPoint num="17" id="786" />
-<TGConnectingPoint num="18" id="787" />
-<TGConnectingPoint num="19" id="788" />
-<TGConnectingPoint num="20" id="789" />
-<TGConnectingPoint num="21" id="790" />
-<TGConnectingPoint num="22" id="791" />
-<TGConnectingPoint num="23" id="792" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="818" >
-<cdparam x="354" y="307" />
+<TGConnectingPoint num="0" id="434" />
+<TGConnectingPoint num="1" id="435" />
+<TGConnectingPoint num="2" id="436" />
+<TGConnectingPoint num="3" id="437" />
+<TGConnectingPoint num="4" id="438" />
+<TGConnectingPoint num="5" id="439" />
+<TGConnectingPoint num="6" id="440" />
+<TGConnectingPoint num="7" id="441" />
+<TGConnectingPoint num="8" id="442" />
+<TGConnectingPoint num="9" id="443" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="469" >
+<cdparam x="405" y="405" />
<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="testMAC1" />
-<TGConnectingPoint num="0" id="794" />
-<TGConnectingPoint num="1" id="795" />
-<TGConnectingPoint num="2" id="796" />
-<TGConnectingPoint num="3" id="797" />
-<TGConnectingPoint num="4" id="798" />
-<TGConnectingPoint num="5" id="799" />
-<TGConnectingPoint num="6" id="800" />
-<TGConnectingPoint num="7" id="801" />
-<TGConnectingPoint num="8" id="802" />
-<TGConnectingPoint num="9" id="803" />
-<TGConnectingPoint num="10" id="804" />
-<TGConnectingPoint num="11" id="805" />
-<TGConnectingPoint num="12" id="806" />
-<TGConnectingPoint num="13" id="807" />
-<TGConnectingPoint num="14" id="808" />
-<TGConnectingPoint num="15" id="809" />
-<TGConnectingPoint num="16" id="810" />
-<TGConnectingPoint num="17" id="811" />
-<TGConnectingPoint num="18" id="812" />
-<TGConnectingPoint num="19" id="813" />
-<TGConnectingPoint num="20" id="814" />
-<TGConnectingPoint num="21" id="815" />
-<TGConnectingPoint num="22" id="816" />
-<TGConnectingPoint num="23" id="817" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="829" >
-<cdparam x="358" y="142" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chin(msg8)" />
-<TGConnectingPoint num="0" id="819" />
-<TGConnectingPoint num="1" id="820" />
-<TGConnectingPoint num="2" id="821" />
-<TGConnectingPoint num="3" id="822" />
-<TGConnectingPoint num="4" id="823" />
-<TGConnectingPoint num="5" id="824" />
-<TGConnectingPoint num="6" id="825" />
-<TGConnectingPoint num="7" id="826" />
-<TGConnectingPoint num="8" id="827" />
-<TGConnectingPoint num="9" id="828" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="831" >
-<cdparam x="386" y="88" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="830" />
+<TGConnectingPoint num="0" id="445" />
+<TGConnectingPoint num="1" id="446" />
+<TGConnectingPoint num="2" id="447" />
+<TGConnectingPoint num="3" id="448" />
+<TGConnectingPoint num="4" id="449" />
+<TGConnectingPoint num="5" id="450" />
+<TGConnectingPoint num="6" id="451" />
+<TGConnectingPoint num="7" id="452" />
+<TGConnectingPoint num="8" id="453" />
+<TGConnectingPoint num="9" id="454" />
+<TGConnectingPoint num="10" id="455" />
+<TGConnectingPoint num="11" id="456" />
+<TGConnectingPoint num="12" id="457" />
+<TGConnectingPoint num="13" id="458" />
+<TGConnectingPoint num="14" id="459" />
+<TGConnectingPoint num="15" id="460" />
+<TGConnectingPoint num="16" id="461" />
+<TGConnectingPoint num="17" id="462" />
+<TGConnectingPoint num="18" id="463" />
+<TGConnectingPoint num="19" id="464" />
+<TGConnectingPoint num="20" id="465" />
+<TGConnectingPoint num="21" id="466" />
+<TGConnectingPoint num="22" id="467" />
+<TGConnectingPoint num="23" id="468" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="833" >
+<CONNECTOR type="5102" id="471" >
<cdparam x="225" y="74" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to state0" value="null" />
-<P1 x="173" y="59" id="1087" />
-<P2 x="177" y="90" id="855" />
+<P1 x="173" y="59" id="725" />
+<P2 x="177" y="90" id="493" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="832" >
-<father id="833" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="470" >
+<father id="471" num="0" />
<cdparam x="225" y="114" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2023,15 +1858,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="835" >
+<CONNECTOR type="5102" id="473" >
<cdparam x="192" y="159" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="211" y="152" id="869" />
-<P2 x="228" y="199" id="1076" />
+<P1 x="211" y="152" id="507" />
+<P2 x="228" y="199" id="714" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="834" >
-<father id="835" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="472" >
+<father id="473" num="0" />
<cdparam x="274" y="118" />
<sizeparam width="215" height="112" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2053,15 +1888,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="837" >
+<CONNECTOR type="5102" id="475" >
<cdparam x="512" y="848" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="530" y="917" id="880" />
-<P2 x="530" y="985" id="916" />
+<P1 x="530" y="917" id="518" />
+<P2 x="530" y="985" id="554" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="836" >
-<father id="837" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="474" >
+<father id="475" num="0" />
<cdparam x="512" y="888" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2076,15 +1911,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="839" >
+<CONNECTOR type="5102" id="477" >
<cdparam x="512" y="778" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="523" y="778" id="946" />
-<P2 x="530" y="887" id="879" />
+<P1 x="523" y="778" id="584" />
+<P2 x="530" y="887" id="517" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="838" >
-<father id="839" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="476" >
+<father id="477" num="0" />
<cdparam x="512" y="818" />
<sizeparam width="174" height="64" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2103,15 +1938,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="841" >
+<CONNECTOR type="5102" id="479" >
<cdparam x="363" y="654" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="363" y="654" id="1004" />
-<P2 x="238" y="734" id="891" />
+<P1 x="363" y="654" id="642" />
+<P2 x="238" y="734" id="529" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="840" >
-<father id="841" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="478" >
+<father id="479" num="0" />
<cdparam x="254" y="699" />
<sizeparam width="152" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2126,15 +1961,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="843" >
+<CONNECTOR type="5102" id="481" >
<cdparam x="436" y="654" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="436" y="654" id="1005" />
-<P2 x="523" y="738" id="941" />
+<P1 x="436" y="654" id="643" />
+<P2 x="523" y="738" id="579" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="842" >
-<father id="843" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="480" >
+<father id="481" num="0" />
<cdparam x="446" y="694" />
<sizeparam width="126" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2149,15 +1984,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="845" >
+<CONNECTOR type="5102" id="483" >
<cdparam x="249" y="524" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="249" y="524" id="1029" />
-<P2 x="171" y="604" id="966" />
+<P1 x="249" y="524" id="667" />
+<P2 x="171" y="604" id="604" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="844" >
-<father id="845" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="482" >
+<father id="483" num="0" />
<cdparam x="160" y="553" />
<sizeparam width="42" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2172,15 +2007,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="847" >
+<CONNECTOR type="5102" id="485" >
<cdparam x="302" y="524" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="302" y="524" id="1030" />
-<P2 x="400" y="614" id="991" />
+<P1 x="302" y="524" id="668" />
+<P2 x="400" y="614" id="629" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="846" >
-<father id="847" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="484" >
+<father id="485" num="0" />
<cdparam x="357" y="554" />
<sizeparam width="24" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2195,15 +2030,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="849" >
+<CONNECTOR type="5102" id="487" >
<cdparam x="252" y="389" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="252" y="389" id="1041" />
-<P2 x="276" y="484" id="1016" />
+<P1 x="252" y="389" id="679" />
+<P2 x="276" y="484" id="654" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="848" >
-<father id="849" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="486" >
+<father id="487" num="0" />
<cdparam x="252" y="429" />
<sizeparam width="200" height="48" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2221,15 +2056,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="851" >
+<CONNECTOR type="5102" id="489" >
<cdparam x="240" y="318" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="240" y="318" id="1057" />
-<P2 x="252" y="359" id="1040" />
+<P1 x="240" y="318" id="695" />
+<P2 x="252" y="359" id="678" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="850" >
-<father id="851" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="488" >
+<father id="489" num="0" />
<cdparam x="240" y="358" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2244,15 +2079,15 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="853" >
+<CONNECTOR type="5102" id="491" >
<cdparam x="220" y="243" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
-<P1 x="228" y="229" id="1077" />
-<P2 x="240" y="278" id="1052" />
+<P1 x="228" y="229" id="715" />
+<P2 x="240" y="278" id="690" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="852" >
-<father id="853" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="490" >
+<father id="491" num="0" />
<cdparam x="220" y="283" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -2267,365 +2102,390 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="878" >
+<COMPONENT type="5106" id="516" >
<cdparam x="110" y="90" />
<sizeparam width="135" height="62" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="makingFirstMessage" />
-<TGConnectingPoint num="0" id="854" />
-<TGConnectingPoint num="1" id="855" />
-<TGConnectingPoint num="2" id="856" />
-<TGConnectingPoint num="3" id="857" />
-<TGConnectingPoint num="4" id="858" />
-<TGConnectingPoint num="5" id="859" />
-<TGConnectingPoint num="6" id="860" />
-<TGConnectingPoint num="7" id="861" />
-<TGConnectingPoint num="8" id="862" />
-<TGConnectingPoint num="9" id="863" />
-<TGConnectingPoint num="10" id="864" />
-<TGConnectingPoint num="11" id="865" />
-<TGConnectingPoint num="12" id="866" />
-<TGConnectingPoint num="13" id="867" />
-<TGConnectingPoint num="14" id="868" />
-<TGConnectingPoint num="15" id="869" />
-<TGConnectingPoint num="16" id="870" />
-<TGConnectingPoint num="17" id="871" />
-<TGConnectingPoint num="18" id="872" />
-<TGConnectingPoint num="19" id="873" />
-<TGConnectingPoint num="20" id="874" />
-<TGConnectingPoint num="21" id="875" />
-<TGConnectingPoint num="22" id="876" />
-<TGConnectingPoint num="23" id="877" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="889" >
+<TGConnectingPoint num="0" id="492" />
+<TGConnectingPoint num="1" id="493" />
+<TGConnectingPoint num="2" id="494" />
+<TGConnectingPoint num="3" id="495" />
+<TGConnectingPoint num="4" id="496" />
+<TGConnectingPoint num="5" id="497" />
+<TGConnectingPoint num="6" id="498" />
+<TGConnectingPoint num="7" id="499" />
+<TGConnectingPoint num="8" id="500" />
+<TGConnectingPoint num="9" id="501" />
+<TGConnectingPoint num="10" id="502" />
+<TGConnectingPoint num="11" id="503" />
+<TGConnectingPoint num="12" id="504" />
+<TGConnectingPoint num="13" id="505" />
+<TGConnectingPoint num="14" id="506" />
+<TGConnectingPoint num="15" id="507" />
+<TGConnectingPoint num="16" id="508" />
+<TGConnectingPoint num="17" id="509" />
+<TGConnectingPoint num="18" id="510" />
+<TGConnectingPoint num="19" id="511" />
+<TGConnectingPoint num="20" id="512" />
+<TGConnectingPoint num="21" id="513" />
+<TGConnectingPoint num="22" id="514" />
+<TGConnectingPoint num="23" id="515" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="527" >
<cdparam x="494" y="892" />
<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="879" />
-<TGConnectingPoint num="1" id="880" />
-<TGConnectingPoint num="2" id="881" />
-<TGConnectingPoint num="3" id="882" />
-<TGConnectingPoint num="4" id="883" />
-<TGConnectingPoint num="5" id="884" />
-<TGConnectingPoint num="6" id="885" />
-<TGConnectingPoint num="7" id="886" />
-<TGConnectingPoint num="8" id="887" />
-<TGConnectingPoint num="9" id="888" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="914" >
+<TGConnectingPoint num="0" id="517" />
+<TGConnectingPoint num="1" id="518" />
+<TGConnectingPoint num="2" id="519" />
+<TGConnectingPoint num="3" id="520" />
+<TGConnectingPoint num="4" id="521" />
+<TGConnectingPoint num="5" id="522" />
+<TGConnectingPoint num="6" id="523" />
+<TGConnectingPoint num="7" id="524" />
+<TGConnectingPoint num="8" id="525" />
+<TGConnectingPoint num="9" id="526" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="552" >
<cdparam x="164" y="734" />
<sizeparam width="149" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="NotAnACK" />
-<TGConnectingPoint num="0" id="890" />
-<TGConnectingPoint num="1" id="891" />
-<TGConnectingPoint num="2" id="892" />
-<TGConnectingPoint num="3" id="893" />
-<TGConnectingPoint num="4" id="894" />
-<TGConnectingPoint num="5" id="895" />
-<TGConnectingPoint num="6" id="896" />
-<TGConnectingPoint num="7" id="897" />
-<TGConnectingPoint num="8" id="898" />
-<TGConnectingPoint num="9" id="899" />
-<TGConnectingPoint num="10" id="900" />
-<TGConnectingPoint num="11" id="901" />
-<TGConnectingPoint num="12" id="902" />
-<TGConnectingPoint num="13" id="903" />
-<TGConnectingPoint num="14" id="904" />
-<TGConnectingPoint num="15" id="905" />
-<TGConnectingPoint num="16" id="906" />
-<TGConnectingPoint num="17" id="907" />
-<TGConnectingPoint num="18" id="908" />
-<TGConnectingPoint num="19" id="909" />
-<TGConnectingPoint num="20" id="910" />
-<TGConnectingPoint num="21" id="911" />
-<TGConnectingPoint num="22" id="912" />
-<TGConnectingPoint num="23" id="913" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="939" >
+<TGConnectingPoint num="0" id="528" />
+<TGConnectingPoint num="1" id="529" />
+<TGConnectingPoint num="2" id="530" />
+<TGConnectingPoint num="3" id="531" />
+<TGConnectingPoint num="4" id="532" />
+<TGConnectingPoint num="5" id="533" />
+<TGConnectingPoint num="6" id="534" />
+<TGConnectingPoint num="7" id="535" />
+<TGConnectingPoint num="8" id="536" />
+<TGConnectingPoint num="9" id="537" />
+<TGConnectingPoint num="10" id="538" />
+<TGConnectingPoint num="11" id="539" />
+<TGConnectingPoint num="12" id="540" />
+<TGConnectingPoint num="13" id="541" />
+<TGConnectingPoint num="14" id="542" />
+<TGConnectingPoint num="15" id="543" />
+<TGConnectingPoint num="16" id="544" />
+<TGConnectingPoint num="17" id="545" />
+<TGConnectingPoint num="18" id="546" />
+<TGConnectingPoint num="19" id="547" />
+<TGConnectingPoint num="20" id="548" />
+<TGConnectingPoint num="21" id="549" />
+<TGConnectingPoint num="22" id="550" />
+<TGConnectingPoint num="23" id="551" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="577" >
<cdparam x="448" y="985" />
<sizeparam width="164" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="AllDone" />
-<TGConnectingPoint num="0" id="915" />
-<TGConnectingPoint num="1" id="916" />
-<TGConnectingPoint num="2" id="917" />
-<TGConnectingPoint num="3" id="918" />
-<TGConnectingPoint num="4" id="919" />
-<TGConnectingPoint num="5" id="920" />
-<TGConnectingPoint num="6" id="921" />
-<TGConnectingPoint num="7" id="922" />
-<TGConnectingPoint num="8" id="923" />
-<TGConnectingPoint num="9" id="924" />
-<TGConnectingPoint num="10" id="925" />
-<TGConnectingPoint num="11" id="926" />
-<TGConnectingPoint num="12" id="927" />
-<TGConnectingPoint num="13" id="928" />
-<TGConnectingPoint num="14" id="929" />
-<TGConnectingPoint num="15" id="930" />
-<TGConnectingPoint num="16" id="931" />
-<TGConnectingPoint num="17" id="932" />
-<TGConnectingPoint num="18" id="933" />
-<TGConnectingPoint num="19" id="934" />
-<TGConnectingPoint num="20" id="935" />
-<TGConnectingPoint num="21" id="936" />
-<TGConnectingPoint num="22" id="937" />
-<TGConnectingPoint num="23" id="938" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="964" >
+<TGConnectingPoint num="0" id="553" />
+<TGConnectingPoint num="1" id="554" />
+<TGConnectingPoint num="2" id="555" />
+<TGConnectingPoint num="3" id="556" />
+<TGConnectingPoint num="4" id="557" />
+<TGConnectingPoint num="5" id="558" />
+<TGConnectingPoint num="6" id="559" />
+<TGConnectingPoint num="7" id="560" />
+<TGConnectingPoint num="8" id="561" />
+<TGConnectingPoint num="9" id="562" />
+<TGConnectingPoint num="10" id="563" />
+<TGConnectingPoint num="11" id="564" />
+<TGConnectingPoint num="12" id="565" />
+<TGConnectingPoint num="13" id="566" />
+<TGConnectingPoint num="14" id="567" />
+<TGConnectingPoint num="15" id="568" />
+<TGConnectingPoint num="16" id="569" />
+<TGConnectingPoint num="17" id="570" />
+<TGConnectingPoint num="18" id="571" />
+<TGConnectingPoint num="19" id="572" />
+<TGConnectingPoint num="20" id="573" />
+<TGConnectingPoint num="21" id="574" />
+<TGConnectingPoint num="22" id="575" />
+<TGConnectingPoint num="23" id="576" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="602" >
<cdparam x="406" y="738" />
<sizeparam width="234" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="SendingConfidentialData" />
-<TGConnectingPoint num="0" id="940" />
-<TGConnectingPoint num="1" id="941" />
-<TGConnectingPoint num="2" id="942" />
-<TGConnectingPoint num="3" id="943" />
-<TGConnectingPoint num="4" id="944" />
-<TGConnectingPoint num="5" id="945" />
-<TGConnectingPoint num="6" id="946" />
-<TGConnectingPoint num="7" id="947" />
-<TGConnectingPoint num="8" id="948" />
-<TGConnectingPoint num="9" id="949" />
-<TGConnectingPoint num="10" id="950" />
-<TGConnectingPoint num="11" id="951" />
-<TGConnectingPoint num="12" id="952" />
-<TGConnectingPoint num="13" id="953" />
-<TGConnectingPoint num="14" id="954" />
-<TGConnectingPoint num="15" id="955" />
-<TGConnectingPoint num="16" id="956" />
-<TGConnectingPoint num="17" id="957" />
-<TGConnectingPoint num="18" id="958" />
-<TGConnectingPoint num="19" id="959" />
-<TGConnectingPoint num="20" id="960" />
-<TGConnectingPoint num="21" id="961" />
-<TGConnectingPoint num="22" id="962" />
-<TGConnectingPoint num="23" id="963" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="989" >
+<TGConnectingPoint num="0" id="578" />
+<TGConnectingPoint num="1" id="579" />
+<TGConnectingPoint num="2" id="580" />
+<TGConnectingPoint num="3" id="581" />
+<TGConnectingPoint num="4" id="582" />
+<TGConnectingPoint num="5" id="583" />
+<TGConnectingPoint num="6" id="584" />
+<TGConnectingPoint num="7" id="585" />
+<TGConnectingPoint num="8" id="586" />
+<TGConnectingPoint num="9" id="587" />
+<TGConnectingPoint num="10" id="588" />
+<TGConnectingPoint num="11" id="589" />
+<TGConnectingPoint num="12" id="590" />
+<TGConnectingPoint num="13" id="591" />
+<TGConnectingPoint num="14" id="592" />
+<TGConnectingPoint num="15" id="593" />
+<TGConnectingPoint num="16" id="594" />
+<TGConnectingPoint num="17" id="595" />
+<TGConnectingPoint num="18" id="596" />
+<TGConnectingPoint num="19" id="597" />
+<TGConnectingPoint num="20" id="598" />
+<TGConnectingPoint num="21" id="599" />
+<TGConnectingPoint num="22" id="600" />
+<TGConnectingPoint num="23" id="601" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="627" >
<cdparam x="108" y="604" />
<sizeparam width="127" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="testMACFailed" />
-<TGConnectingPoint num="0" id="965" />
-<TGConnectingPoint num="1" id="966" />
-<TGConnectingPoint num="2" id="967" />
-<TGConnectingPoint num="3" id="968" />
-<TGConnectingPoint num="4" id="969" />
-<TGConnectingPoint num="5" id="970" />
-<TGConnectingPoint num="6" id="971" />
-<TGConnectingPoint num="7" id="972" />
-<TGConnectingPoint num="8" id="973" />
-<TGConnectingPoint num="9" id="974" />
-<TGConnectingPoint num="10" id="975" />
-<TGConnectingPoint num="11" id="976" />
-<TGConnectingPoint num="12" id="977" />
-<TGConnectingPoint num="13" id="978" />
-<TGConnectingPoint num="14" id="979" />
-<TGConnectingPoint num="15" id="980" />
-<TGConnectingPoint num="16" id="981" />
-<TGConnectingPoint num="17" id="982" />
-<TGConnectingPoint num="18" id="983" />
-<TGConnectingPoint num="19" id="984" />
-<TGConnectingPoint num="20" id="985" />
-<TGConnectingPoint num="21" id="986" />
-<TGConnectingPoint num="22" id="987" />
-<TGConnectingPoint num="23" id="988" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1014" >
+<TGConnectingPoint num="0" id="603" />
+<TGConnectingPoint num="1" id="604" />
+<TGConnectingPoint num="2" id="605" />
+<TGConnectingPoint num="3" id="606" />
+<TGConnectingPoint num="4" id="607" />
+<TGConnectingPoint num="5" id="608" />
+<TGConnectingPoint num="6" id="609" />
+<TGConnectingPoint num="7" id="610" />
+<TGConnectingPoint num="8" id="611" />
+<TGConnectingPoint num="9" id="612" />
+<TGConnectingPoint num="10" id="613" />
+<TGConnectingPoint num="11" id="614" />
+<TGConnectingPoint num="12" id="615" />
+<TGConnectingPoint num="13" id="616" />
+<TGConnectingPoint num="14" id="617" />
+<TGConnectingPoint num="15" id="618" />
+<TGConnectingPoint num="16" id="619" />
+<TGConnectingPoint num="17" id="620" />
+<TGConnectingPoint num="18" id="621" />
+<TGConnectingPoint num="19" id="622" />
+<TGConnectingPoint num="20" id="623" />
+<TGConnectingPoint num="21" id="624" />
+<TGConnectingPoint num="22" id="625" />
+<TGConnectingPoint num="23" id="626" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="652" >
<cdparam x="327" y="614" />
<sizeparam width="146" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="TestingACK" />
-<TGConnectingPoint num="0" id="990" />
-<TGConnectingPoint num="1" id="991" />
-<TGConnectingPoint num="2" id="992" />
-<TGConnectingPoint num="3" id="993" />
-<TGConnectingPoint num="4" id="994" />
-<TGConnectingPoint num="5" id="995" />
-<TGConnectingPoint num="6" id="996" />
-<TGConnectingPoint num="7" id="997" />
-<TGConnectingPoint num="8" id="998" />
-<TGConnectingPoint num="9" id="999" />
-<TGConnectingPoint num="10" id="1000" />
-<TGConnectingPoint num="11" id="1001" />
-<TGConnectingPoint num="12" id="1002" />
-<TGConnectingPoint num="13" id="1003" />
-<TGConnectingPoint num="14" id="1004" />
-<TGConnectingPoint num="15" id="1005" />
-<TGConnectingPoint num="16" id="1006" />
-<TGConnectingPoint num="17" id="1007" />
-<TGConnectingPoint num="18" id="1008" />
-<TGConnectingPoint num="19" id="1009" />
-<TGConnectingPoint num="20" id="1010" />
-<TGConnectingPoint num="21" id="1011" />
-<TGConnectingPoint num="22" id="1012" />
-<TGConnectingPoint num="23" id="1013" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1039" >
+<TGConnectingPoint num="0" id="628" />
+<TGConnectingPoint num="1" id="629" />
+<TGConnectingPoint num="2" id="630" />
+<TGConnectingPoint num="3" id="631" />
+<TGConnectingPoint num="4" id="632" />
+<TGConnectingPoint num="5" id="633" />
+<TGConnectingPoint num="6" id="634" />
+<TGConnectingPoint num="7" id="635" />
+<TGConnectingPoint num="8" id="636" />
+<TGConnectingPoint num="9" id="637" />
+<TGConnectingPoint num="10" id="638" />
+<TGConnectingPoint num="11" id="639" />
+<TGConnectingPoint num="12" id="640" />
+<TGConnectingPoint num="13" id="641" />
+<TGConnectingPoint num="14" id="642" />
+<TGConnectingPoint num="15" id="643" />
+<TGConnectingPoint num="16" id="644" />
+<TGConnectingPoint num="17" id="645" />
+<TGConnectingPoint num="18" id="646" />
+<TGConnectingPoint num="19" id="647" />
+<TGConnectingPoint num="20" id="648" />
+<TGConnectingPoint num="21" id="649" />
+<TGConnectingPoint num="22" id="650" />
+<TGConnectingPoint num="23" id="651" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="677" >
<cdparam x="223" y="484" />
<sizeparam width="106" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="TestMAC" />
-<TGConnectingPoint num="0" id="1015" />
-<TGConnectingPoint num="1" id="1016" />
-<TGConnectingPoint num="2" id="1017" />
-<TGConnectingPoint num="3" id="1018" />
-<TGConnectingPoint num="4" id="1019" />
-<TGConnectingPoint num="5" id="1020" />
-<TGConnectingPoint num="6" id="1021" />
-<TGConnectingPoint num="7" id="1022" />
-<TGConnectingPoint num="8" id="1023" />
-<TGConnectingPoint num="9" id="1024" />
-<TGConnectingPoint num="10" id="1025" />
-<TGConnectingPoint num="11" id="1026" />
-<TGConnectingPoint num="12" id="1027" />
-<TGConnectingPoint num="13" id="1028" />
-<TGConnectingPoint num="14" id="1029" />
-<TGConnectingPoint num="15" id="1030" />
-<TGConnectingPoint num="16" id="1031" />
-<TGConnectingPoint num="17" id="1032" />
-<TGConnectingPoint num="18" id="1033" />
-<TGConnectingPoint num="19" id="1034" />
-<TGConnectingPoint num="20" id="1035" />
-<TGConnectingPoint num="21" id="1036" />
-<TGConnectingPoint num="22" id="1037" />
-<TGConnectingPoint num="23" id="1038" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="1050" >
+<TGConnectingPoint num="0" id="653" />
+<TGConnectingPoint num="1" id="654" />
+<TGConnectingPoint num="2" id="655" />
+<TGConnectingPoint num="3" id="656" />
+<TGConnectingPoint num="4" id="657" />
+<TGConnectingPoint num="5" id="658" />
+<TGConnectingPoint num="6" id="659" />
+<TGConnectingPoint num="7" id="660" />
+<TGConnectingPoint num="8" id="661" />
+<TGConnectingPoint num="9" id="662" />
+<TGConnectingPoint num="10" id="663" />
+<TGConnectingPoint num="11" id="664" />
+<TGConnectingPoint num="12" id="665" />
+<TGConnectingPoint num="13" id="666" />
+<TGConnectingPoint num="14" id="667" />
+<TGConnectingPoint num="15" id="668" />
+<TGConnectingPoint num="16" id="669" />
+<TGConnectingPoint num="17" id="670" />
+<TGConnectingPoint num="18" id="671" />
+<TGConnectingPoint num="19" id="672" />
+<TGConnectingPoint num="20" id="673" />
+<TGConnectingPoint num="21" id="674" />
+<TGConnectingPoint num="22" id="675" />
+<TGConnectingPoint num="23" id="676" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="688" >
<cdparam x="216" y="364" />
<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="1040" />
-<TGConnectingPoint num="1" id="1041" />
-<TGConnectingPoint num="2" id="1042" />
-<TGConnectingPoint num="3" id="1043" />
-<TGConnectingPoint num="4" id="1044" />
-<TGConnectingPoint num="5" id="1045" />
-<TGConnectingPoint num="6" id="1046" />
-<TGConnectingPoint num="7" id="1047" />
-<TGConnectingPoint num="8" id="1048" />
-<TGConnectingPoint num="9" id="1049" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1075" >
+<TGConnectingPoint num="0" id="678" />
+<TGConnectingPoint num="1" id="679" />
+<TGConnectingPoint num="2" id="680" />
+<TGConnectingPoint num="3" id="681" />
+<TGConnectingPoint num="4" id="682" />
+<TGConnectingPoint num="5" id="683" />
+<TGConnectingPoint num="6" id="684" />
+<TGConnectingPoint num="7" id="685" />
+<TGConnectingPoint num="8" id="686" />
+<TGConnectingPoint num="9" id="687" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="713" >
<cdparam x="142" y="278" />
<sizeparam width="196" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="state0" value="WaitingForAnAnswerFromKM" />
-<TGConnectingPoint num="0" id="1051" />
-<TGConnectingPoint num="1" id="1052" />
-<TGConnectingPoint num="2" id="1053" />
-<TGConnectingPoint num="3" id="1054" />
-<TGConnectingPoint num="4" id="1055" />
-<TGConnectingPoint num="5" id="1056" />
-<TGConnectingPoint num="6" id="1057" />
-<TGConnectingPoint num="7" id="1058" />
-<TGConnectingPoint num="8" id="1059" />
-<TGConnectingPoint num="9" id="1060" />
-<TGConnectingPoint num="10" id="1061" />
-<TGConnectingPoint num="11" id="1062" />
-<TGConnectingPoint num="12" id="1063" />
-<TGConnectingPoint num="13" id="1064" />
-<TGConnectingPoint num="14" id="1065" />
-<TGConnectingPoint num="15" id="1066" />
-<TGConnectingPoint num="16" id="1067" />
-<TGConnectingPoint num="17" id="1068" />
-<TGConnectingPoint num="18" id="1069" />
-<TGConnectingPoint num="19" id="1070" />
-<TGConnectingPoint num="20" id="1071" />
-<TGConnectingPoint num="21" id="1072" />
-<TGConnectingPoint num="22" id="1073" />
-<TGConnectingPoint num="23" id="1074" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1086" >
+<TGConnectingPoint num="0" id="689" />
+<TGConnectingPoint num="1" id="690" />
+<TGConnectingPoint num="2" id="691" />
+<TGConnectingPoint num="3" id="692" />
+<TGConnectingPoint num="4" id="693" />
+<TGConnectingPoint num="5" id="694" />
+<TGConnectingPoint num="6" id="695" />
+<TGConnectingPoint num="7" id="696" />
+<TGConnectingPoint num="8" id="697" />
+<TGConnectingPoint num="9" id="698" />
+<TGConnectingPoint num="10" id="699" />
+<TGConnectingPoint num="11" id="700" />
+<TGConnectingPoint num="12" id="701" />
+<TGConnectingPoint num="13" id="702" />
+<TGConnectingPoint num="14" id="703" />
+<TGConnectingPoint num="15" id="704" />
+<TGConnectingPoint num="16" id="705" />
+<TGConnectingPoint num="17" id="706" />
+<TGConnectingPoint num="18" id="707" />
+<TGConnectingPoint num="19" id="708" />
+<TGConnectingPoint num="20" id="709" />
+<TGConnectingPoint num="21" id="710" />
+<TGConnectingPoint num="22" id="711" />
+<TGConnectingPoint num="23" id="712" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="724" >
<cdparam x="188" y="204" />
<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="Send signal" value="chout(msg6)" />
-<TGConnectingPoint num="0" id="1076" />
-<TGConnectingPoint num="1" id="1077" />
-<TGConnectingPoint num="2" id="1078" />
-<TGConnectingPoint num="3" id="1079" />
-<TGConnectingPoint num="4" id="1080" />
-<TGConnectingPoint num="5" id="1081" />
-<TGConnectingPoint num="6" id="1082" />
-<TGConnectingPoint num="7" id="1083" />
-<TGConnectingPoint num="8" id="1084" />
-<TGConnectingPoint num="9" id="1085" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1088" >
+<TGConnectingPoint num="0" id="714" />
+<TGConnectingPoint num="1" id="715" />
+<TGConnectingPoint num="2" id="716" />
+<TGConnectingPoint num="3" id="717" />
+<TGConnectingPoint num="4" id="718" />
+<TGConnectingPoint num="5" id="719" />
+<TGConnectingPoint num="6" id="720" />
+<TGConnectingPoint num="7" id="721" />
+<TGConnectingPoint num="8" id="722" />
+<TGConnectingPoint num="9" id="723" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="726" >
<cdparam x="166" y="39" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1087" />
+<TGConnectingPoint num="0" id="725" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="TimerKM" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1090" >
-<cdparam x="405" y="289" />
+<AVATARStateMachineDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="1900" >
+<CONNECTOR type="5102" id="728" >
+<cdparam x="621" y="895" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="405" y="289" id="1123" />
-<P2 x="408" y="331" id="1098" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="458" y="749" id="775" />
+<P2 x="425" y="798" id="787" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1089" >
-<father id="1090" num="0" />
-<cdparam x="405" y="329" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="727" >
+<father id="728" num="0" />
+<cdparam x="270" y="771" />
+<sizeparam width="191" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<extraparam>
+<guard value="[msg.data == timerexpire.data ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="730" >
+<cdparam x="654" y="890" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="488" y="749" id="767" />
+<P2 x="611" y="797" id="909" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="729" >
+<father id="730" num="0" />
+<cdparam x="581" y="749" />
+<sizeparam width="217" height="48" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[not(msg.data == timerexpire.data) ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="get2(msg, msg5, msg4)" />
+<actions value="b = verifyMAC(msg5, PSKN, msg4)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1092" >
-<cdparam x="404" y="216" />
+<CONNECTOR type="5102" id="732" >
+<cdparam x="524" y="710" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="404" y="216" id="1139" />
-<P2 x="405" y="259" id="1122" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="489" y="594" id="812" />
+<P2 x="488" y="613" id="1020" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1091" >
-<father id="1092" num="0" />
-<cdparam x="404" y="256" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="731" >
+<father id="732" num="0" />
+<cdparam x="524" y="750" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
<guard value="[ ]" />
@@ -2636,19 +2496,19 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1094" >
-<cdparam x="404" y="135" />
+<CONNECTOR type="5102" id="734" >
+<cdparam x="988" y="1206" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="404" y="135" id="1159" />
-<P2 x="404" y="176" id="1134" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="611" y="980" id="864" />
+<P2 x="611" y="1068" id="822" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1093" >
-<father id="1094" num="0" />
-<cdparam x="404" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="733" >
+<father id="734" num="0" />
+<cdparam x="625" y="998" />
+<sizeparam width="315" height="80" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
<guard value="[ ]" />
@@ -2656,19 +2516,24 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="msg1.data = ACK" />
+<actions value="msg2.data = timestamp2" />
+<actions value="msg3 = concat2(msg1, msg2)" />
+<actions value="msg4 = MAC(msg3, PSK1)" />
+<actions value="msg = concat2(msg3, msg4)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1096" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="736" >
+<cdparam x="427" y="156" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from start state to Send signal" value="null" />
-<P1 x="407" y="70" id="1169" />
-<P2 x="404" y="105" id="1158" />
+<P1 x="398" y="124" id="1116" />
+<P2 x="398" y="137" id="1105" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1095" >
-<father id="1096" num="0" />
-<cdparam x="407" y="110" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="735" >
+<father id="736" num="0" />
+<cdparam x="427" y="196" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -2682,319 +2547,183 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="1121" >
-<cdparam x="315" y="331" />
-<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="timerExpired" />
-<TGConnectingPoint num="0" id="1097" />
-<TGConnectingPoint num="1" id="1098" />
-<TGConnectingPoint num="2" id="1099" />
-<TGConnectingPoint num="3" id="1100" />
-<TGConnectingPoint num="4" id="1101" />
-<TGConnectingPoint num="5" id="1102" />
-<TGConnectingPoint num="6" id="1103" />
-<TGConnectingPoint num="7" id="1104" />
-<TGConnectingPoint num="8" id="1105" />
-<TGConnectingPoint num="9" id="1106" />
-<TGConnectingPoint num="10" id="1107" />
-<TGConnectingPoint num="11" id="1108" />
-<TGConnectingPoint num="12" id="1109" />
-<TGConnectingPoint num="13" id="1110" />
-<TGConnectingPoint num="14" id="1111" />
-<TGConnectingPoint num="15" id="1112" />
-<TGConnectingPoint num="16" id="1113" />
-<TGConnectingPoint num="17" id="1114" />
-<TGConnectingPoint num="18" id="1115" />
-<TGConnectingPoint num="19" id="1116" />
-<TGConnectingPoint num="20" id="1117" />
-<TGConnectingPoint num="21" id="1118" />
-<TGConnectingPoint num="22" id="1119" />
-<TGConnectingPoint num="23" id="1120" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1132" >
-<cdparam x="351" y="264" />
-<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(timerexpire)" />
-<TGConnectingPoint num="0" id="1122" />
-<TGConnectingPoint num="1" id="1123" />
-<TGConnectingPoint num="2" id="1124" />
-<TGConnectingPoint num="3" id="1125" />
-<TGConnectingPoint num="4" id="1126" />
-<TGConnectingPoint num="5" id="1127" />
-<TGConnectingPoint num="6" id="1128" />
-<TGConnectingPoint num="7" id="1129" />
-<TGConnectingPoint num="8" id="1130" />
-<TGConnectingPoint num="9" id="1131" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1157" >
-<cdparam x="311" y="176" />
-<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="timerSet" />
-<TGConnectingPoint num="0" id="1133" />
-<TGConnectingPoint num="1" id="1134" />
-<TGConnectingPoint num="2" id="1135" />
-<TGConnectingPoint num="3" id="1136" />
-<TGConnectingPoint num="4" id="1137" />
-<TGConnectingPoint num="5" id="1138" />
-<TGConnectingPoint num="6" id="1139" />
-<TGConnectingPoint num="7" id="1140" />
-<TGConnectingPoint num="8" id="1141" />
-<TGConnectingPoint num="9" id="1142" />
-<TGConnectingPoint num="10" id="1143" />
-<TGConnectingPoint num="11" id="1144" />
-<TGConnectingPoint num="12" id="1145" />
-<TGConnectingPoint num="13" id="1146" />
-<TGConnectingPoint num="14" id="1147" />
-<TGConnectingPoint num="15" id="1148" />
-<TGConnectingPoint num="16" id="1149" />
-<TGConnectingPoint num="17" id="1150" />
-<TGConnectingPoint num="18" id="1151" />
-<TGConnectingPoint num="19" id="1152" />
-<TGConnectingPoint num="20" id="1153" />
-<TGConnectingPoint num="21" id="1154" />
-<TGConnectingPoint num="22" id="1155" />
-<TGConnectingPoint num="23" id="1156" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="1168" >
-<cdparam x="358" y="110" />
-<sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(settimer)" />
-<TGConnectingPoint num="0" id="1158" />
-<TGConnectingPoint num="1" id="1159" />
-<TGConnectingPoint num="2" id="1160" />
-<TGConnectingPoint num="3" id="1161" />
-<TGConnectingPoint num="4" id="1162" />
-<TGConnectingPoint num="5" id="1163" />
-<TGConnectingPoint num="6" id="1164" />
-<TGConnectingPoint num="7" id="1165" />
-<TGConnectingPoint num="8" id="1166" />
-<TGConnectingPoint num="9" id="1167" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1170" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="738" >
+<cdparam x="472" y="500" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<P1 x="489" y="376" id="939" />
+<P2 x="489" y="426" id="959" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="737" >
+<father id="738" num="0" />
+<cdparam x="513" y="397" />
+<sizeparam width="307" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1169" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="get3(msg1, msg5, msg2, msg3)" />
+<actions value="msgauth= sdecrypt(msg5, PSK1)" />
+</extraparam>
+</SUBCOMPONENT>
-<AVATARStateMachineDiagramPanel name="SecuredSystem" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="1543" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="740" >
+<cdparam x="472" y="500" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="373" y="292" id="1094" />
+<P2 x="316" y="334" id="1056" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="739" >
+<father id="740" num="0" />
+<cdparam x="208" y="317" />
+<sizeparam width="190" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1544" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<extraparam>
+<guard value="[not(msg8.data == msg4.data) ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
-<Modeling type="AVATAR Design" nameTab="Example" >
-<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="301" id="1179" >
-<cdparam x="147" y="96" />
-<sizeparam width="394" height="68" minWidth="50" minHeight="20" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="742" >
+<cdparam x="517" y="650" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="489" y="563" id="1045" />
+<P2 x="489" y="564" id="811" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="741" >
+<father id="742" num="0" />
+<cdparam x="517" y="690" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="#InitialCommonKnowledge Alice.sk Bob.sk
-#Confidentiality Alice.secretData
-#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2
-" />
-<TGConnectingPoint num="0" id="1171" />
-<TGConnectingPoint num="1" id="1172" />
-<TGConnectingPoint num="2" id="1173" />
-<TGConnectingPoint num="3" id="1174" />
-<TGConnectingPoint num="4" id="1175" />
-<TGConnectingPoint num="5" id="1176" />
-<TGConnectingPoint num="6" id="1177" />
-<TGConnectingPoint num="7" id="1178" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<Line value="#InitialCommonKnowledge Alice.sk Bob.sk" />
-<Line value="#Confidentiality Alice.secretData" />
-<Line value="#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="5000" id="1204" >
-<cdparam x="382" y="171" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="744" >
+<cdparam x="710" y="775" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="488" y="689" id="1009" />
+<P2 x="488" y="709" id="762" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="743" >
+<father id="744" num="0" />
+<cdparam x="685" y="829" />
+<sizeparam width="201" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="Bob" />
-<TGConnectingPoint num="0" id="1180" />
-<TGConnectingPoint num="1" id="1181" />
-<TGConnectingPoint num="2" id="1182" />
-<TGConnectingPoint num="3" id="1183" />
-<TGConnectingPoint num="4" id="1184" />
-<TGConnectingPoint num="5" id="1185" />
-<TGConnectingPoint num="6" id="1186" />
-<TGConnectingPoint num="7" id="1187" />
-<TGConnectingPoint num="8" id="1188" />
-<TGConnectingPoint num="9" id="1189" />
-<TGConnectingPoint num="10" id="1190" />
-<TGConnectingPoint num="11" id="1191" />
-<TGConnectingPoint num="12" id="1192" />
-<TGConnectingPoint num="13" id="1193" />
-<TGConnectingPoint num="14" id="1194" />
-<TGConnectingPoint num="15" id="1195" />
-<TGConnectingPoint num="16" id="1196" />
-<TGConnectingPoint num="17" id="1197" />
-<TGConnectingPoint num="18" id="1198" />
-<TGConnectingPoint num="19" id="1199" />
-<TGConnectingPoint num="20" id="1200" />
-<TGConnectingPoint num="21" id="1201" />
-<TGConnectingPoint num="22" id="1202" />
-<TGConnectingPoint num="23" id="1203" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="5000" id="1229" >
-<cdparam x="158" y="172" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="746" >
+<cdparam x="413" y="171" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="398" y="167" id="1106" />
+<P2 x="398" y="177" id="984" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="745" >
+<father id="746" num="0" />
+<cdparam x="413" y="211" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="Alice" />
-<TGConnectingPoint num="0" id="1205" />
-<TGConnectingPoint num="1" id="1206" />
-<TGConnectingPoint num="2" id="1207" />
-<TGConnectingPoint num="3" id="1208" />
-<TGConnectingPoint num="4" id="1209" />
-<TGConnectingPoint num="5" id="1210" />
-<TGConnectingPoint num="6" id="1211" />
-<TGConnectingPoint num="7" id="1212" />
-<TGConnectingPoint num="8" id="1213" />
-<TGConnectingPoint num="9" id="1214" />
-<TGConnectingPoint num="10" id="1215" />
-<TGConnectingPoint num="11" id="1216" />
-<TGConnectingPoint num="12" id="1217" />
-<TGConnectingPoint num="13" id="1218" />
-<TGConnectingPoint num="14" id="1219" />
-<TGConnectingPoint num="15" id="1220" />
-<TGConnectingPoint num="16" id="1221" />
-<TGConnectingPoint num="17" id="1222" />
-<TGConnectingPoint num="18" id="1223" />
-<TGConnectingPoint num="19" id="1224" />
-<TGConnectingPoint num="20" id="1225" />
-<TGConnectingPoint num="21" id="1226" />
-<TGConnectingPoint num="22" id="1227" />
-<TGConnectingPoint num="23" id="1228" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="5003" id="1238" >
-<cdparam x="383" y="310" />
-<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="748" >
+<cdparam x="820" y="859" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<P1 x="611" y="837" id="914" />
+<P2 x="611" y="874" id="884" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="747" >
+<father id="748" num="0" />
+<cdparam x="626" y="851" />
+<sizeparam width="186" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="1230" />
-<TGConnectingPoint num="1" id="1231" />
-<TGConnectingPoint num="2" id="1232" />
-<TGConnectingPoint num="3" id="1233" />
-<TGConnectingPoint num="4" id="1234" />
-<TGConnectingPoint num="5" id="1235" />
-<TGConnectingPoint num="6" id="1236" />
-<TGConnectingPoint num="7" id="1237" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<Attribute access="0" id="data" value="" type="0" typeOther="" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="get3(msg5, msg1, msg2, msg3)" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="5003" id="1247" >
-<cdparam x="194" y="311" />
-<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="750" >
+<cdparam x="420" y="415" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="398" y="217" id="989" />
+<P2 x="398" y="252" id="1081" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="749" >
+<father id="750" num="0" />
+<cdparam x="418" y="233" />
+<sizeparam width="218" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="1239" />
-<TGConnectingPoint num="1" id="1240" />
-<TGConnectingPoint num="2" id="1241" />
-<TGConnectingPoint num="3" id="1242" />
-<TGConnectingPoint num="4" id="1243" />
-<TGConnectingPoint num="5" id="1244" />
-<TGConnectingPoint num="6" id="1245" />
-<TGConnectingPoint num="7" id="1246" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="get2(msg8, msg1, msg4)" />
+<actions value="msg8 = MAC(msg1, PSK1)" />
</extraparam>
-</COMPONENT>
-
-
-</AVATARBlockDiagramPanel>
+</SUBCOMPONENT>
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1249" >
-<cdparam x="416" y="379" />
+<CONNECTOR type="5102" id="752" >
+<cdparam x="967" y="524" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="416" y="379" id="1264" />
-<P2 x="420" y="424" id="1284" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="489" y="466" id="964" />
+<P2 x="489" y="533" id="1044" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1248" >
-<father id="1249" num="0" />
-<cdparam x="431" y="403" />
-<sizeparam width="143" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="751" >
+<father id="752" num="0" />
+<cdparam x="532" y="480" />
+<sizeparam width="307" height="80" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3004,44 +2733,47 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="receivedData = m.data" />
+<actions value="msg7 = sencrypt(msgauth, PSKN)" />
+<actions value="msg3.data = timestamp1" />
+<actions value="msg1 = concat4(msg7, msg2, msg3, msg3)" />
+<actions value="msg4 = MAC(msg1, PSKN)" />
+<actions value="msg=concat2(msg1, msg4)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1251" >
-<cdparam x="407" y="273" />
+<CONNECTOR type="5102" id="754" >
+<cdparam x="433" y="416" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="407" y="273" id="1314" />
-<P2 x="416" y="339" id="1259" />
+<P1 x="398" y="292" id="1086" />
+<P2 x="489" y="336" id="934" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1250" >
-<father id="1251" num="0" />
-<cdparam x="419" y="312" />
-<sizeparam width="207" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="753" >
+<father id="754" num="0" />
+<cdparam x="465" y="314" />
+<sizeparam width="160" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[msg8.data == msg4.data]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="m = sdecrypt(m2, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1253" >
-<cdparam x="406" y="201" />
+<CONNECTOR type="5102" id="756" >
+<cdparam x="604" y="757" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<P1 x="406" y="201" id="1334" />
-<P2 x="407" y="233" id="1309" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="488" y="653" id="1025" />
+<P2 x="488" y="659" id="1008" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1252" >
-<father id="1253" num="0" />
-<cdparam x="406" y="241" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="755" >
+<father id="756" num="0" />
+<cdparam x="604" y="797" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -3055,22 +2787,22 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1255" >
-<cdparam x="406" y="141" />
+<CONNECTOR type="5102" id="758" >
+<cdparam x="983" y="1157" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<P1 x="406" y="141" id="1350" />
-<P2 x="406" y="171" id="1333" />
+<infoparam name="connector from state0 to state0" value="null" />
+<P1 x="611" y="914" id="889" />
+<P2 x="611" y="940" id="859" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1254" >
-<father id="1255" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="757" >
+<father id="758" num="0" />
+<cdparam x="629" y="930" />
+<sizeparam width="130" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
-<guard value="[ ]" />
+<guard value="[msg1.data == ACK ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
@@ -3078,19 +2810,19 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1257" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="760" >
+<cdparam x="732" y="1157" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<P1 x="407" y="70" id="1369" />
-<P2 x="406" y="101" id="1345" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="611" y="1098" id="823" />
+<P2 x="610" y="1117" id="834" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1256" >
-<father id="1257" num="0" />
-<cdparam x="407" y="110" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="759" >
+<father id="760" num="0" />
+<cdparam x="732" y="1197" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
<extraparam>
<guard value="[ ]" />
@@ -3101,175 +2833,503 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="1282" >
-<cdparam x="327" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="785" >
+<cdparam x="429" y="709" />
+<sizeparam width="118" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="1258" />
-<TGConnectingPoint num="1" id="1259" />
-<TGConnectingPoint num="2" id="1260" />
-<TGConnectingPoint num="3" id="1261" />
-<TGConnectingPoint num="4" id="1262" />
-<TGConnectingPoint num="5" id="1263" />
-<TGConnectingPoint num="6" id="1264" />
-<TGConnectingPoint num="7" id="1265" />
-<TGConnectingPoint num="8" id="1266" />
-<TGConnectingPoint num="9" id="1267" />
-<TGConnectingPoint num="10" id="1268" />
-<TGConnectingPoint num="11" id="1269" />
-<TGConnectingPoint num="12" id="1270" />
-<TGConnectingPoint num="13" id="1271" />
-<TGConnectingPoint num="14" id="1272" />
-<TGConnectingPoint num="15" id="1273" />
-<TGConnectingPoint num="16" id="1274" />
-<TGConnectingPoint num="17" id="1275" />
-<TGConnectingPoint num="18" id="1276" />
-<TGConnectingPoint num="19" id="1277" />
-<TGConnectingPoint num="20" id="1278" />
-<TGConnectingPoint num="21" id="1279" />
-<TGConnectingPoint num="22" id="1280" />
-<TGConnectingPoint num="23" id="1281" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1307" >
-<cdparam x="350" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="761" />
+<TGConnectingPoint num="1" id="762" />
+<TGConnectingPoint num="2" id="763" />
+<TGConnectingPoint num="3" id="764" />
+<TGConnectingPoint num="4" id="765" />
+<TGConnectingPoint num="5" id="766" />
+<TGConnectingPoint num="6" id="767" />
+<TGConnectingPoint num="7" id="768" />
+<TGConnectingPoint num="8" id="769" />
+<TGConnectingPoint num="9" id="770" />
+<TGConnectingPoint num="10" id="771" />
+<TGConnectingPoint num="11" id="772" />
+<TGConnectingPoint num="12" id="773" />
+<TGConnectingPoint num="13" id="774" />
+<TGConnectingPoint num="14" id="775" />
+<TGConnectingPoint num="15" id="776" />
+<TGConnectingPoint num="16" id="777" />
+<TGConnectingPoint num="17" id="778" />
+<TGConnectingPoint num="18" id="779" />
+<TGConnectingPoint num="19" id="780" />
+<TGConnectingPoint num="20" id="781" />
+<TGConnectingPoint num="21" id="782" />
+<TGConnectingPoint num="22" id="783" />
+<TGConnectingPoint num="23" id="784" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="810" >
+<cdparam x="335" y="798" />
+<sizeparam width="181" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="1283" />
-<TGConnectingPoint num="1" id="1284" />
-<TGConnectingPoint num="2" id="1285" />
-<TGConnectingPoint num="3" id="1286" />
-<TGConnectingPoint num="4" id="1287" />
-<TGConnectingPoint num="5" id="1288" />
-<TGConnectingPoint num="6" id="1289" />
-<TGConnectingPoint num="7" id="1290" />
-<TGConnectingPoint num="8" id="1291" />
-<TGConnectingPoint num="9" id="1292" />
-<TGConnectingPoint num="10" id="1293" />
-<TGConnectingPoint num="11" id="1294" />
-<TGConnectingPoint num="12" id="1295" />
-<TGConnectingPoint num="13" id="1296" />
-<TGConnectingPoint num="14" id="1297" />
-<TGConnectingPoint num="15" id="1298" />
-<TGConnectingPoint num="16" id="1299" />
-<TGConnectingPoint num="17" id="1300" />
-<TGConnectingPoint num="18" id="1301" />
-<TGConnectingPoint num="19" id="1302" />
-<TGConnectingPoint num="20" id="1303" />
-<TGConnectingPoint num="21" id="1304" />
-<TGConnectingPoint num="22" id="1305" />
-<TGConnectingPoint num="23" id="1306" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1332" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="timerExpired" />
+<TGConnectingPoint num="0" id="786" />
+<TGConnectingPoint num="1" id="787" />
+<TGConnectingPoint num="2" id="788" />
+<TGConnectingPoint num="3" id="789" />
+<TGConnectingPoint num="4" id="790" />
+<TGConnectingPoint num="5" id="791" />
+<TGConnectingPoint num="6" id="792" />
+<TGConnectingPoint num="7" id="793" />
+<TGConnectingPoint num="8" id="794" />
+<TGConnectingPoint num="9" id="795" />
+<TGConnectingPoint num="10" id="796" />
+<TGConnectingPoint num="11" id="797" />
+<TGConnectingPoint num="12" id="798" />
+<TGConnectingPoint num="13" id="799" />
+<TGConnectingPoint num="14" id="800" />
+<TGConnectingPoint num="15" id="801" />
+<TGConnectingPoint num="16" id="802" />
+<TGConnectingPoint num="17" id="803" />
+<TGConnectingPoint num="18" id="804" />
+<TGConnectingPoint num="19" id="805" />
+<TGConnectingPoint num="20" id="806" />
+<TGConnectingPoint num="21" id="807" />
+<TGConnectingPoint num="22" id="808" />
+<TGConnectingPoint num="23" id="809" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="821" >
+<cdparam x="443" y="569" />
+<sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="1308" />
-<TGConnectingPoint num="1" id="1309" />
-<TGConnectingPoint num="2" id="1310" />
-<TGConnectingPoint num="3" id="1311" />
-<TGConnectingPoint num="4" id="1312" />
-<TGConnectingPoint num="5" id="1313" />
-<TGConnectingPoint num="6" id="1314" />
-<TGConnectingPoint num="7" id="1315" />
-<TGConnectingPoint num="8" id="1316" />
-<TGConnectingPoint num="9" id="1317" />
-<TGConnectingPoint num="10" id="1318" />
-<TGConnectingPoint num="11" id="1319" />
-<TGConnectingPoint num="12" id="1320" />
-<TGConnectingPoint num="13" id="1321" />
-<TGConnectingPoint num="14" id="1322" />
-<TGConnectingPoint num="15" id="1323" />
-<TGConnectingPoint num="16" id="1324" />
-<TGConnectingPoint num="17" id="1325" />
-<TGConnectingPoint num="18" id="1326" />
-<TGConnectingPoint num="19" id="1327" />
-<TGConnectingPoint num="20" id="1328" />
-<TGConnectingPoint num="21" id="1329" />
-<TGConnectingPoint num="22" id="1330" />
-<TGConnectingPoint num="23" id="1331" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="1343" >
-<cdparam x="373" y="176" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(settimer)" />
+<TGConnectingPoint num="0" id="811" />
+<TGConnectingPoint num="1" id="812" />
+<TGConnectingPoint num="2" id="813" />
+<TGConnectingPoint num="3" id="814" />
+<TGConnectingPoint num="4" id="815" />
+<TGConnectingPoint num="5" id="816" />
+<TGConnectingPoint num="6" id="817" />
+<TGConnectingPoint num="7" id="818" />
+<TGConnectingPoint num="8" id="819" />
+<TGConnectingPoint num="9" id="820" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="832" >
+<cdparam x="575" y="1073" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="1333" />
-<TGConnectingPoint num="1" id="1334" />
-<TGConnectingPoint num="2" id="1335" />
-<TGConnectingPoint num="3" id="1336" />
-<TGConnectingPoint num="4" id="1337" />
-<TGConnectingPoint num="5" id="1338" />
-<TGConnectingPoint num="6" id="1339" />
-<TGConnectingPoint num="7" id="1340" />
-<TGConnectingPoint num="8" id="1341" />
-<TGConnectingPoint num="9" id="1342" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1368" >
-<cdparam x="340" y="101" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(msg)" />
+<TGConnectingPoint num="0" id="822" />
+<TGConnectingPoint num="1" id="823" />
+<TGConnectingPoint num="2" id="824" />
+<TGConnectingPoint num="3" id="825" />
+<TGConnectingPoint num="4" id="826" />
+<TGConnectingPoint num="5" id="827" />
+<TGConnectingPoint num="6" id="828" />
+<TGConnectingPoint num="7" id="829" />
+<TGConnectingPoint num="8" id="830" />
+<TGConnectingPoint num="9" id="831" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="857" >
+<cdparam x="513" y="1117" />
+<sizeparam width="194" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="1344" />
-<TGConnectingPoint num="1" id="1345" />
-<TGConnectingPoint num="2" id="1346" />
-<TGConnectingPoint num="3" id="1347" />
-<TGConnectingPoint num="4" id="1348" />
-<TGConnectingPoint num="5" id="1349" />
-<TGConnectingPoint num="6" id="1350" />
-<TGConnectingPoint num="7" id="1351" />
-<TGConnectingPoint num="8" id="1352" />
-<TGConnectingPoint num="9" id="1353" />
-<TGConnectingPoint num="10" id="1354" />
-<TGConnectingPoint num="11" id="1355" />
-<TGConnectingPoint num="12" id="1356" />
-<TGConnectingPoint num="13" id="1357" />
-<TGConnectingPoint num="14" id="1358" />
-<TGConnectingPoint num="15" id="1359" />
-<TGConnectingPoint num="16" id="1360" />
-<TGConnectingPoint num="17" id="1361" />
-<TGConnectingPoint num="18" id="1362" />
-<TGConnectingPoint num="19" id="1363" />
-<TGConnectingPoint num="20" id="1364" />
-<TGConnectingPoint num="21" id="1365" />
-<TGConnectingPoint num="22" id="1366" />
-<TGConnectingPoint num="23" id="1367" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1370" >
-<cdparam x="400" y="50" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="ACK_FORWARDED" />
+<TGConnectingPoint num="0" id="833" />
+<TGConnectingPoint num="1" id="834" />
+<TGConnectingPoint num="2" id="835" />
+<TGConnectingPoint num="3" id="836" />
+<TGConnectingPoint num="4" id="837" />
+<TGConnectingPoint num="5" id="838" />
+<TGConnectingPoint num="6" id="839" />
+<TGConnectingPoint num="7" id="840" />
+<TGConnectingPoint num="8" id="841" />
+<TGConnectingPoint num="9" id="842" />
+<TGConnectingPoint num="10" id="843" />
+<TGConnectingPoint num="11" id="844" />
+<TGConnectingPoint num="12" id="845" />
+<TGConnectingPoint num="13" id="846" />
+<TGConnectingPoint num="14" id="847" />
+<TGConnectingPoint num="15" id="848" />
+<TGConnectingPoint num="16" id="849" />
+<TGConnectingPoint num="17" id="850" />
+<TGConnectingPoint num="18" id="851" />
+<TGConnectingPoint num="19" id="852" />
+<TGConnectingPoint num="20" id="853" />
+<TGConnectingPoint num="21" id="854" />
+<TGConnectingPoint num="22" id="855" />
+<TGConnectingPoint num="23" id="856" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="882" >
+<cdparam x="539" y="940" />
+<sizeparam width="144" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="ACK_OK" />
+<TGConnectingPoint num="0" id="858" />
+<TGConnectingPoint num="1" id="859" />
+<TGConnectingPoint num="2" id="860" />
+<TGConnectingPoint num="3" id="861" />
+<TGConnectingPoint num="4" id="862" />
+<TGConnectingPoint num="5" id="863" />
+<TGConnectingPoint num="6" id="864" />
+<TGConnectingPoint num="7" id="865" />
+<TGConnectingPoint num="8" id="866" />
+<TGConnectingPoint num="9" id="867" />
+<TGConnectingPoint num="10" id="868" />
+<TGConnectingPoint num="11" id="869" />
+<TGConnectingPoint num="12" id="870" />
+<TGConnectingPoint num="13" id="871" />
+<TGConnectingPoint num="14" id="872" />
+<TGConnectingPoint num="15" id="873" />
+<TGConnectingPoint num="16" id="874" />
+<TGConnectingPoint num="17" id="875" />
+<TGConnectingPoint num="18" id="876" />
+<TGConnectingPoint num="19" id="877" />
+<TGConnectingPoint num="20" id="878" />
+<TGConnectingPoint num="21" id="879" />
+<TGConnectingPoint num="22" id="880" />
+<TGConnectingPoint num="23" id="881" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="907" >
+<cdparam x="552" y="874" />
+<sizeparam width="119" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="CheckACK" />
+<TGConnectingPoint num="0" id="883" />
+<TGConnectingPoint num="1" id="884" />
+<TGConnectingPoint num="2" id="885" />
+<TGConnectingPoint num="3" id="886" />
+<TGConnectingPoint num="4" id="887" />
+<TGConnectingPoint num="5" id="888" />
+<TGConnectingPoint num="6" id="889" />
+<TGConnectingPoint num="7" id="890" />
+<TGConnectingPoint num="8" id="891" />
+<TGConnectingPoint num="9" id="892" />
+<TGConnectingPoint num="10" id="893" />
+<TGConnectingPoint num="11" id="894" />
+<TGConnectingPoint num="12" id="895" />
+<TGConnectingPoint num="13" id="896" />
+<TGConnectingPoint num="14" id="897" />
+<TGConnectingPoint num="15" id="898" />
+<TGConnectingPoint num="16" id="899" />
+<TGConnectingPoint num="17" id="900" />
+<TGConnectingPoint num="18" id="901" />
+<TGConnectingPoint num="19" id="902" />
+<TGConnectingPoint num="20" id="903" />
+<TGConnectingPoint num="21" id="904" />
+<TGConnectingPoint num="22" id="905" />
+<TGConnectingPoint num="23" id="906" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="932" >
+<cdparam x="532" y="797" />
+<sizeparam width="158" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="CheckACKMAC" />
+<TGConnectingPoint num="0" id="908" />
+<TGConnectingPoint num="1" id="909" />
+<TGConnectingPoint num="2" id="910" />
+<TGConnectingPoint num="3" id="911" />
+<TGConnectingPoint num="4" id="912" />
+<TGConnectingPoint num="5" id="913" />
+<TGConnectingPoint num="6" id="914" />
+<TGConnectingPoint num="7" id="915" />
+<TGConnectingPoint num="8" id="916" />
+<TGConnectingPoint num="9" id="917" />
+<TGConnectingPoint num="10" id="918" />
+<TGConnectingPoint num="11" id="919" />
+<TGConnectingPoint num="12" id="920" />
+<TGConnectingPoint num="13" id="921" />
+<TGConnectingPoint num="14" id="922" />
+<TGConnectingPoint num="15" id="923" />
+<TGConnectingPoint num="16" id="924" />
+<TGConnectingPoint num="17" id="925" />
+<TGConnectingPoint num="18" id="926" />
+<TGConnectingPoint num="19" id="927" />
+<TGConnectingPoint num="20" id="928" />
+<TGConnectingPoint num="21" id="929" />
+<TGConnectingPoint num="22" id="930" />
+<TGConnectingPoint num="23" id="931" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="957" >
+<cdparam x="394" y="336" />
+<sizeparam width="191" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="testMAC_OK" />
+<TGConnectingPoint num="0" id="933" />
+<TGConnectingPoint num="1" id="934" />
+<TGConnectingPoint num="2" id="935" />
+<TGConnectingPoint num="3" id="936" />
+<TGConnectingPoint num="4" id="937" />
+<TGConnectingPoint num="5" id="938" />
+<TGConnectingPoint num="6" id="939" />
+<TGConnectingPoint num="7" id="940" />
+<TGConnectingPoint num="8" id="941" />
+<TGConnectingPoint num="9" id="942" />
+<TGConnectingPoint num="10" id="943" />
+<TGConnectingPoint num="11" id="944" />
+<TGConnectingPoint num="12" id="945" />
+<TGConnectingPoint num="13" id="946" />
+<TGConnectingPoint num="14" id="947" />
+<TGConnectingPoint num="15" id="948" />
+<TGConnectingPoint num="16" id="949" />
+<TGConnectingPoint num="17" id="950" />
+<TGConnectingPoint num="18" id="951" />
+<TGConnectingPoint num="19" id="952" />
+<TGConnectingPoint num="20" id="953" />
+<TGConnectingPoint num="21" id="954" />
+<TGConnectingPoint num="22" id="955" />
+<TGConnectingPoint num="23" id="956" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="982" >
+<cdparam x="411" y="426" />
+<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="decipherOK" />
+<TGConnectingPoint num="0" id="958" />
+<TGConnectingPoint num="1" id="959" />
+<TGConnectingPoint num="2" id="960" />
+<TGConnectingPoint num="3" id="961" />
+<TGConnectingPoint num="4" id="962" />
+<TGConnectingPoint num="5" id="963" />
+<TGConnectingPoint num="6" id="964" />
+<TGConnectingPoint num="7" id="965" />
+<TGConnectingPoint num="8" id="966" />
+<TGConnectingPoint num="9" id="967" />
+<TGConnectingPoint num="10" id="968" />
+<TGConnectingPoint num="11" id="969" />
+<TGConnectingPoint num="12" id="970" />
+<TGConnectingPoint num="13" id="971" />
+<TGConnectingPoint num="14" id="972" />
+<TGConnectingPoint num="15" id="973" />
+<TGConnectingPoint num="16" id="974" />
+<TGConnectingPoint num="17" id="975" />
+<TGConnectingPoint num="18" id="976" />
+<TGConnectingPoint num="19" id="977" />
+<TGConnectingPoint num="20" id="978" />
+<TGConnectingPoint num="21" id="979" />
+<TGConnectingPoint num="22" id="980" />
+<TGConnectingPoint num="23" id="981" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1007" >
+<cdparam x="314" y="177" />
+<sizeparam width="168" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="gotFirstMessage" />
+<TGConnectingPoint num="0" id="983" />
+<TGConnectingPoint num="1" id="984" />
+<TGConnectingPoint num="2" id="985" />
+<TGConnectingPoint num="3" id="986" />
+<TGConnectingPoint num="4" id="987" />
+<TGConnectingPoint num="5" id="988" />
+<TGConnectingPoint num="6" id="989" />
+<TGConnectingPoint num="7" id="990" />
+<TGConnectingPoint num="8" id="991" />
+<TGConnectingPoint num="9" id="992" />
+<TGConnectingPoint num="10" id="993" />
+<TGConnectingPoint num="11" id="994" />
+<TGConnectingPoint num="12" id="995" />
+<TGConnectingPoint num="13" id="996" />
+<TGConnectingPoint num="14" id="997" />
+<TGConnectingPoint num="15" id="998" />
+<TGConnectingPoint num="16" id="999" />
+<TGConnectingPoint num="17" id="1000" />
+<TGConnectingPoint num="18" id="1001" />
+<TGConnectingPoint num="19" id="1002" />
+<TGConnectingPoint num="20" id="1003" />
+<TGConnectingPoint num="21" id="1004" />
+<TGConnectingPoint num="22" id="1005" />
+<TGConnectingPoint num="23" id="1006" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1018" >
+<cdparam x="452" y="664" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="1008" />
+<TGConnectingPoint num="1" id="1009" />
+<TGConnectingPoint num="2" id="1010" />
+<TGConnectingPoint num="3" id="1011" />
+<TGConnectingPoint num="4" id="1012" />
+<TGConnectingPoint num="5" id="1013" />
+<TGConnectingPoint num="6" id="1014" />
+<TGConnectingPoint num="7" id="1015" />
+<TGConnectingPoint num="8" id="1016" />
+<TGConnectingPoint num="9" id="1017" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1043" >
+<cdparam x="391" y="613" />
+<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="WaitForACK" />
+<TGConnectingPoint num="0" id="1019" />
+<TGConnectingPoint num="1" id="1020" />
+<TGConnectingPoint num="2" id="1021" />
+<TGConnectingPoint num="3" id="1022" />
+<TGConnectingPoint num="4" id="1023" />
+<TGConnectingPoint num="5" id="1024" />
+<TGConnectingPoint num="6" id="1025" />
+<TGConnectingPoint num="7" id="1026" />
+<TGConnectingPoint num="8" id="1027" />
+<TGConnectingPoint num="9" id="1028" />
+<TGConnectingPoint num="10" id="1029" />
+<TGConnectingPoint num="11" id="1030" />
+<TGConnectingPoint num="12" id="1031" />
+<TGConnectingPoint num="13" id="1032" />
+<TGConnectingPoint num="14" id="1033" />
+<TGConnectingPoint num="15" id="1034" />
+<TGConnectingPoint num="16" id="1035" />
+<TGConnectingPoint num="17" id="1036" />
+<TGConnectingPoint num="18" id="1037" />
+<TGConnectingPoint num="19" id="1038" />
+<TGConnectingPoint num="20" id="1039" />
+<TGConnectingPoint num="21" id="1040" />
+<TGConnectingPoint num="22" id="1041" />
+<TGConnectingPoint num="23" id="1042" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1054" >
+<cdparam x="453" y="538" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(msg)" />
+<TGConnectingPoint num="0" id="1044" />
+<TGConnectingPoint num="1" id="1045" />
+<TGConnectingPoint num="2" id="1046" />
+<TGConnectingPoint num="3" id="1047" />
+<TGConnectingPoint num="4" id="1048" />
+<TGConnectingPoint num="5" id="1049" />
+<TGConnectingPoint num="6" id="1050" />
+<TGConnectingPoint num="7" id="1051" />
+<TGConnectingPoint num="8" id="1052" />
+<TGConnectingPoint num="9" id="1053" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1079" >
+<cdparam x="250" y="334" />
+<sizeparam width="133" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="TestMACFailed" />
+<TGConnectingPoint num="0" id="1055" />
+<TGConnectingPoint num="1" id="1056" />
+<TGConnectingPoint num="2" id="1057" />
+<TGConnectingPoint num="3" id="1058" />
+<TGConnectingPoint num="4" id="1059" />
+<TGConnectingPoint num="5" id="1060" />
+<TGConnectingPoint num="6" id="1061" />
+<TGConnectingPoint num="7" id="1062" />
+<TGConnectingPoint num="8" id="1063" />
+<TGConnectingPoint num="9" id="1064" />
+<TGConnectingPoint num="10" id="1065" />
+<TGConnectingPoint num="11" id="1066" />
+<TGConnectingPoint num="12" id="1067" />
+<TGConnectingPoint num="13" id="1068" />
+<TGConnectingPoint num="14" id="1069" />
+<TGConnectingPoint num="15" id="1070" />
+<TGConnectingPoint num="16" id="1071" />
+<TGConnectingPoint num="17" id="1072" />
+<TGConnectingPoint num="18" id="1073" />
+<TGConnectingPoint num="19" id="1074" />
+<TGConnectingPoint num="20" id="1075" />
+<TGConnectingPoint num="21" id="1076" />
+<TGConnectingPoint num="22" id="1077" />
+<TGConnectingPoint num="23" id="1078" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1104" >
+<cdparam x="349" y="252" />
+<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="testMAC1" />
+<TGConnectingPoint num="0" id="1080" />
+<TGConnectingPoint num="1" id="1081" />
+<TGConnectingPoint num="2" id="1082" />
+<TGConnectingPoint num="3" id="1083" />
+<TGConnectingPoint num="4" id="1084" />
+<TGConnectingPoint num="5" id="1085" />
+<TGConnectingPoint num="6" id="1086" />
+<TGConnectingPoint num="7" id="1087" />
+<TGConnectingPoint num="8" id="1088" />
+<TGConnectingPoint num="9" id="1089" />
+<TGConnectingPoint num="10" id="1090" />
+<TGConnectingPoint num="11" id="1091" />
+<TGConnectingPoint num="12" id="1092" />
+<TGConnectingPoint num="13" id="1093" />
+<TGConnectingPoint num="14" id="1094" />
+<TGConnectingPoint num="15" id="1095" />
+<TGConnectingPoint num="16" id="1096" />
+<TGConnectingPoint num="17" id="1097" />
+<TGConnectingPoint num="18" id="1098" />
+<TGConnectingPoint num="19" id="1099" />
+<TGConnectingPoint num="20" id="1100" />
+<TGConnectingPoint num="21" id="1101" />
+<TGConnectingPoint num="22" id="1102" />
+<TGConnectingPoint num="23" id="1103" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1115" >
+<cdparam x="358" y="142" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chin(msg8)" />
+<TGConnectingPoint num="0" id="1105" />
+<TGConnectingPoint num="1" id="1106" />
+<TGConnectingPoint num="2" id="1107" />
+<TGConnectingPoint num="3" id="1108" />
+<TGConnectingPoint num="4" id="1109" />
+<TGConnectingPoint num="5" id="1110" />
+<TGConnectingPoint num="6" id="1111" />
+<TGConnectingPoint num="7" id="1112" />
+<TGConnectingPoint num="8" id="1113" />
+<TGConnectingPoint num="9" id="1114" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1117" >
+<cdparam x="391" y="104" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1369" />
+<TGConnectingPoint num="0" id="1116" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1372" >
-<cdparam x="407" y="310" />
+<AVATARStateMachineDiagramPanel name="TimerKM" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1119" >
+<cdparam x="405" y="289" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<P1 x="407" y="310" id="1380" />
-<P2 x="408" y="341" id="1390" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="405" y="289" id="1152" />
+<P2 x="408" y="331" id="1127" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1371" >
-<father id="1372" num="0" />
-<cdparam x="407" y="350" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1118" >
+<father id="1119" num="0" />
+<cdparam x="405" y="329" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -3283,16 +3343,16 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1374" >
-<cdparam x="407" y="251" />
+<CONNECTOR type="5102" id="1121" >
+<cdparam x="404" y="216" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<P1 x="407" y="251" id="1398" />
-<P2 x="407" y="280" id="1379" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<P1 x="404" y="216" id="1168" />
+<P2 x="405" y="259" id="1151" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1373" >
-<father id="1374" num="0" />
-<cdparam x="407" y="291" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1120" >
+<father id="1121" num="0" />
+<cdparam x="404" y="256" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -3306,17 +3366,17 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1376" >
-<cdparam x="407" y="132" />
+<CONNECTOR type="5102" id="1123" >
+<cdparam x="404" y="135" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<P1 x="407" y="132" id="1423" />
-<P2 x="407" y="211" id="1393" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<P1 x="404" y="135" id="1188" />
+<P2 x="404" y="176" id="1163" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1375" >
-<father id="1376" num="0" />
-<cdparam x="415" y="162" />
-<sizeparam width="185" height="32" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1122" >
+<father id="1123" num="0" />
+<cdparam x="404" y="175" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -3326,20 +3386,18 @@
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="1378" >
+<CONNECTOR type="5102" id="1125" >
<cdparam x="407" y="70" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<P1 x="407" y="70" id="1442" />
-<P2 x="407" y="92" id="1418" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<P1 x="407" y="70" id="1198" />
+<P2 x="404" y="105" id="1187" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1377" >
-<father id="1378" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1124" >
+<father id="1125" num="0" />
<cdparam x="407" y="110" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -3354,267 +3412,113 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="1389" >
-<cdparam x="374" y="285" />
-<sizeparam width="66" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="1379" />
-<TGConnectingPoint num="1" id="1380" />
-<TGConnectingPoint num="2" id="1381" />
-<TGConnectingPoint num="3" id="1382" />
-<TGConnectingPoint num="4" id="1383" />
-<TGConnectingPoint num="5" id="1384" />
-<TGConnectingPoint num="6" id="1385" />
-<TGConnectingPoint num="7" id="1386" />
-<TGConnectingPoint num="8" id="1387" />
-<TGConnectingPoint num="9" id="1388" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="1391" >
-<cdparam x="398" y="346" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1390" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1416" >
-<cdparam x="336" y="211" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="1392" />
-<TGConnectingPoint num="1" id="1393" />
-<TGConnectingPoint num="2" id="1394" />
-<TGConnectingPoint num="3" id="1395" />
-<TGConnectingPoint num="4" id="1396" />
-<TGConnectingPoint num="5" id="1397" />
-<TGConnectingPoint num="6" id="1398" />
-<TGConnectingPoint num="7" id="1399" />
-<TGConnectingPoint num="8" id="1400" />
-<TGConnectingPoint num="9" id="1401" />
-<TGConnectingPoint num="10" id="1402" />
-<TGConnectingPoint num="11" id="1403" />
-<TGConnectingPoint num="12" id="1404" />
-<TGConnectingPoint num="13" id="1405" />
-<TGConnectingPoint num="14" id="1406" />
-<TGConnectingPoint num="15" id="1407" />
-<TGConnectingPoint num="16" id="1408" />
-<TGConnectingPoint num="17" id="1409" />
-<TGConnectingPoint num="18" id="1410" />
-<TGConnectingPoint num="19" id="1411" />
-<TGConnectingPoint num="20" id="1412" />
-<TGConnectingPoint num="21" id="1413" />
-<TGConnectingPoint num="22" id="1414" />
-<TGConnectingPoint num="23" id="1415" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1441" >
-<cdparam x="340" y="92" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="1417" />
-<TGConnectingPoint num="1" id="1418" />
-<TGConnectingPoint num="2" id="1419" />
-<TGConnectingPoint num="3" id="1420" />
-<TGConnectingPoint num="4" id="1421" />
-<TGConnectingPoint num="5" id="1422" />
-<TGConnectingPoint num="6" id="1423" />
-<TGConnectingPoint num="7" id="1424" />
-<TGConnectingPoint num="8" id="1425" />
-<TGConnectingPoint num="9" id="1426" />
-<TGConnectingPoint num="10" id="1427" />
-<TGConnectingPoint num="11" id="1428" />
-<TGConnectingPoint num="12" id="1429" />
-<TGConnectingPoint num="13" id="1430" />
-<TGConnectingPoint num="14" id="1431" />
-<TGConnectingPoint num="15" id="1432" />
-<TGConnectingPoint num="16" id="1433" />
-<TGConnectingPoint num="17" id="1434" />
-<TGConnectingPoint num="18" id="1435" />
-<TGConnectingPoint num="19" id="1436" />
-<TGConnectingPoint num="20" id="1437" />
-<TGConnectingPoint num="21" id="1438" />
-<TGConnectingPoint num="22" id="1439" />
-<TGConnectingPoint num="23" id="1440" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="1443" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1442" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
-<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5002" id="1444" >
-<cdparam x="269" y="201" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Block0 to Block0" value="" />
-<P1 x="324" y="185" id="1483" />
-<P2 x="389" y="187" id="1457" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<isd value="in fromnet()" />
-<oso value="out tonet()" />
-<FIFOType asynchronous="true" size="1" blocking="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="5000" id="1469" >
-<cdparam x="389" y="111" />
-<sizeparam width="131" height="102" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="Bob" />
-<TGConnectingPoint num="0" id="1445" />
-<TGConnectingPoint num="1" id="1446" />
-<TGConnectingPoint num="2" id="1447" />
-<TGConnectingPoint num="3" id="1448" />
-<TGConnectingPoint num="4" id="1449" />
-<TGConnectingPoint num="5" id="1450" />
-<TGConnectingPoint num="6" id="1451" />
-<TGConnectingPoint num="7" id="1452" />
-<TGConnectingPoint num="8" id="1453" />
-<TGConnectingPoint num="9" id="1454" />
-<TGConnectingPoint num="10" id="1455" />
-<TGConnectingPoint num="11" id="1456" />
-<TGConnectingPoint num="12" id="1457" />
-<TGConnectingPoint num="13" id="1458" />
-<TGConnectingPoint num="14" id="1459" />
-<TGConnectingPoint num="15" id="1460" />
-<TGConnectingPoint num="16" id="1461" />
-<TGConnectingPoint num="17" id="1462" />
-<TGConnectingPoint num="18" id="1463" />
-<TGConnectingPoint num="19" id="1464" />
-<TGConnectingPoint num="20" id="1465" />
-<TGConnectingPoint num="21" id="1466" />
-<TGConnectingPoint num="22" id="1467" />
-<TGConnectingPoint num="23" id="1468" />
-<extraparam>
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Signal value="in fromnet()" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5000" id="1494" >
-<cdparam x="201" y="103" />
-<sizeparam width="123" height="110" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1150" >
+<cdparam x="315" y="331" />
+<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="Alice" />
-<TGConnectingPoint num="0" id="1470" />
-<TGConnectingPoint num="1" id="1471" />
-<TGConnectingPoint num="2" id="1472" />
-<TGConnectingPoint num="3" id="1473" />
-<TGConnectingPoint num="4" id="1474" />
-<TGConnectingPoint num="5" id="1475" />
-<TGConnectingPoint num="6" id="1476" />
-<TGConnectingPoint num="7" id="1477" />
-<TGConnectingPoint num="8" id="1478" />
-<TGConnectingPoint num="9" id="1479" />
-<TGConnectingPoint num="10" id="1480" />
-<TGConnectingPoint num="11" id="1481" />
-<TGConnectingPoint num="12" id="1482" />
-<TGConnectingPoint num="13" id="1483" />
-<TGConnectingPoint num="14" id="1484" />
-<TGConnectingPoint num="15" id="1485" />
-<TGConnectingPoint num="16" id="1486" />
-<TGConnectingPoint num="17" id="1487" />
-<TGConnectingPoint num="18" id="1488" />
-<TGConnectingPoint num="19" id="1489" />
-<TGConnectingPoint num="20" id="1490" />
-<TGConnectingPoint num="21" id="1491" />
-<TGConnectingPoint num="22" id="1492" />
-<TGConnectingPoint num="23" id="1493" />
-<extraparam>
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Signal value="out tonet()" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="1503" >
-<cdparam x="380" y="246" />
-<sizeparam width="116" height="77" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="timerExpired" />
+<TGConnectingPoint num="0" id="1126" />
+<TGConnectingPoint num="1" id="1127" />
+<TGConnectingPoint num="2" id="1128" />
+<TGConnectingPoint num="3" id="1129" />
+<TGConnectingPoint num="4" id="1130" />
+<TGConnectingPoint num="5" id="1131" />
+<TGConnectingPoint num="6" id="1132" />
+<TGConnectingPoint num="7" id="1133" />
+<TGConnectingPoint num="8" id="1134" />
+<TGConnectingPoint num="9" id="1135" />
+<TGConnectingPoint num="10" id="1136" />
+<TGConnectingPoint num="11" id="1137" />
+<TGConnectingPoint num="12" id="1138" />
+<TGConnectingPoint num="13" id="1139" />
+<TGConnectingPoint num="14" id="1140" />
+<TGConnectingPoint num="15" id="1141" />
+<TGConnectingPoint num="16" id="1142" />
+<TGConnectingPoint num="17" id="1143" />
+<TGConnectingPoint num="18" id="1144" />
+<TGConnectingPoint num="19" id="1145" />
+<TGConnectingPoint num="20" id="1146" />
+<TGConnectingPoint num="21" id="1147" />
+<TGConnectingPoint num="22" id="1148" />
+<TGConnectingPoint num="23" id="1149" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1161" >
+<cdparam x="351" y="264" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="1495" />
-<TGConnectingPoint num="1" id="1496" />
-<TGConnectingPoint num="2" id="1497" />
-<TGConnectingPoint num="3" id="1498" />
-<TGConnectingPoint num="4" id="1499" />
-<TGConnectingPoint num="5" id="1500" />
-<TGConnectingPoint num="6" id="1501" />
-<TGConnectingPoint num="7" id="1502" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="0" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="1512" >
-<cdparam x="201" y="244" />
-<sizeparam width="130" height="76" minWidth="5" minHeight="2" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="Send signal" value="chout(timerexpire)" />
+<TGConnectingPoint num="0" id="1151" />
+<TGConnectingPoint num="1" id="1152" />
+<TGConnectingPoint num="2" id="1153" />
+<TGConnectingPoint num="3" id="1154" />
+<TGConnectingPoint num="4" id="1155" />
+<TGConnectingPoint num="5" id="1156" />
+<TGConnectingPoint num="6" id="1157" />
+<TGConnectingPoint num="7" id="1158" />
+<TGConnectingPoint num="8" id="1159" />
+<TGConnectingPoint num="9" id="1160" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1186" >
+<cdparam x="311" y="176" />
+<sizeparam width="187" height="40" minWidth="40" minHeight="30" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="1504" />
-<TGConnectingPoint num="1" id="1505" />
-<TGConnectingPoint num="2" id="1506" />
-<TGConnectingPoint num="3" id="1507" />
-<TGConnectingPoint num="4" id="1508" />
-<TGConnectingPoint num="5" id="1509" />
-<TGConnectingPoint num="6" id="1510" />
-<TGConnectingPoint num="7" id="1511" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-
-</AVATARBlockDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="1514" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="state0" value="timerSet" />
+<TGConnectingPoint num="0" id="1162" />
+<TGConnectingPoint num="1" id="1163" />
+<TGConnectingPoint num="2" id="1164" />
+<TGConnectingPoint num="3" id="1165" />
+<TGConnectingPoint num="4" id="1166" />
+<TGConnectingPoint num="5" id="1167" />
+<TGConnectingPoint num="6" id="1168" />
+<TGConnectingPoint num="7" id="1169" />
+<TGConnectingPoint num="8" id="1170" />
+<TGConnectingPoint num="9" id="1171" />
+<TGConnectingPoint num="10" id="1172" />
+<TGConnectingPoint num="11" id="1173" />
+<TGConnectingPoint num="12" id="1174" />
+<TGConnectingPoint num="13" id="1175" />
+<TGConnectingPoint num="14" id="1176" />
+<TGConnectingPoint num="15" id="1177" />
+<TGConnectingPoint num="16" id="1178" />
+<TGConnectingPoint num="17" id="1179" />
+<TGConnectingPoint num="18" id="1180" />
+<TGConnectingPoint num="19" id="1181" />
+<TGConnectingPoint num="20" id="1182" />
+<TGConnectingPoint num="21" id="1183" />
+<TGConnectingPoint num="22" id="1184" />
+<TGConnectingPoint num="23" id="1185" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1197" >
+<cdparam x="358" y="110" />
+<sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1513" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="1516" >
+<infoparam name="Send signal" value="chin(settimer)" />
+<TGConnectingPoint num="0" id="1187" />
+<TGConnectingPoint num="1" id="1188" />
+<TGConnectingPoint num="2" id="1189" />
+<TGConnectingPoint num="3" id="1190" />
+<TGConnectingPoint num="4" id="1191" />
+<TGConnectingPoint num="5" id="1192" />
+<TGConnectingPoint num="6" id="1193" />
+<TGConnectingPoint num="7" id="1194" />
+<TGConnectingPoint num="8" id="1195" />
+<TGConnectingPoint num="9" id="1196" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="1199" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1515" />
+<TGConnectingPoint num="0" id="1198" />
</COMPONENT>
diff --git a/src/avatartranslator/AvatarBlock.java b/src/avatartranslator/AvatarBlock.java
index 6fc6054234241430894e40745368d220be730ae2..2543b60cb926c975020a50b878906544de075488 100644
--- a/src/avatartranslator/AvatarBlock.java
+++ b/src/avatartranslator/AvatarBlock.java
@@ -59,7 +59,6 @@ public class AvatarBlock extends AvatarElement {
private AvatarStateMachine asm;
-
public AvatarBlock(String _name, Object _referenceObject) {
super(_name, _referenceObject);
attributes = new LinkedList<AvatarAttribute>();
diff --git a/src/ui/cd/TGConnectingPointAssociation.java b/src/ui/cd/TGConnectingPointAssociation.java
index 0f7fcd4b2db6088114fe110d6a90279ed44057a5..80c9ea5c017480773e7d5aa0b5eafd21dfd4265c 100755
--- a/src/ui/cd/TGConnectingPointAssociation.java
+++ b/src/ui/cd/TGConnectingPointAssociation.java
@@ -37,7 +37,7 @@ knowledge of the CeCILL license and that you accept its terms.
/**
* Class TGConnectingPointAssociation
- * Definition of connecting points on which attrbiute connectors can be connected
+ * Definition of connecting points on which attribute connectors can be connected
* Creation: 20/12/2003
* @version 1.0 20/12/2003
* @author Ludovic APVRILLE
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index d4f6b0361b46e5e223fbc986bc7dcd694f14b51a..02ef2ee44f17527078544398c6210c02eee85100 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -124,6 +124,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
JCheckBox latex, debug, animate, diploids, update, openDiagram, animateWithInfo;
JTabbedPane commandTab, infoTab;
protected JTextField paramMainCommand;
+ protected JTextField saveDirName;
protected JTextField saveFileName;
protected JTextField stateFileName;
protected JTextField benchmarkFileName;
@@ -483,6 +484,12 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
c01.fill = GridBagConstraints.BOTH;
c01.gridheight = 1;
+ jp02.add(new JLabel("Directory:"), c01);
+ saveDirName = new JTextField(30);
+ if (ConfigurationTTool.SystemCCodeDirectory != null) {
+ saveDirName.setText(ConfigurationTTool.SystemCCodeDirectory);
+ }
+ jp02.add(saveDirName, c01);
jp02.add(new JLabel("File name:"), c01);
saveFileName = new JTextField(30);
jp02.add(saveFileName, c01);
@@ -1757,6 +1764,9 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
public void sendSaveTraceCommand(String format) {
String param = saveFileName.getText().trim();
+ if (saveDirName.getText().length() > 0) {
+ param = saveDirName.getText() + File.separator + param;
+ }
if (param.length() >0) {
sendCommand("save-trace-in-file" + " " + format + " " + param);
} else {
diff --git a/src/ui/window/JDialogAvatarBlock.java b/src/ui/window/JDialogAvatarBlock.java
index c955b1647147cc42244e5153bcb4894c84a1ba61..fc15b940f2dd66011f730be988594bf95ff28828 100755
--- a/src/ui/window/JDialogAvatarBlock.java
+++ b/src/ui/window/JDialogAvatarBlock.java
@@ -532,7 +532,6 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
} else if (evt.getSource() == upButton) {
upAttribute();
} else if (evt.getSource() == upMethodButton) {
- //TraceManager.addDev("Up method");
upMethod();
} else if (evt.getSource() == downMethodButton) {
downMethod();
@@ -542,6 +541,8 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
addMethod();
} else if (evt.getSource() == downSignalButton) {
downSignal();
+ } else if (evt.getSource() == upSignalButton) {
+ upSignal();
} else if (evt.getSource() == removeSignalButton) {
removeSignal();
} else if (evt.getSource() == addSignalButton) {
@@ -656,7 +657,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
}
public void addMethod() {
- TraceManager.addDev("addMethod");
+ //TraceManager.addDev("addMethod");
String s = methodText.getText();
AvatarMethod am = AvatarMethod.isAValidMethod(s);
AvatarMethod amtmp;
@@ -691,7 +692,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
}
public void addSignal() {
- TraceManager.addDev("addSignal");
+ //TraceManager.addDev("addSignal");
String s = signalText.getText();
AvatarSignal as = AvatarSignal.isAValidSignal(signalInOutBox.getSelectedIndex(), s);
AvatarSignal astmp;
@@ -748,7 +749,9 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
public void upAttribute() {
int i = listAttribute.getSelectedIndex();
+ //TraceManager.addDev("Selected index = " + i);
if (i > 0) {
+ //TraceManager.addDev("Modifying ...");
Object o = attributes.elementAt(i);
attributes.removeElementAt(i);
attributes.insertElementAt(o, i-1);
@@ -769,6 +772,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
public void upMethod() {
int i = listMethod.getSelectedIndex();
+ //TraceManager.addDev("Selected index method = " + i);
if (i > 0) {
Object o = methods.elementAt(i);
methods.removeElementAt(i);
diff --git a/src/ui/window/JDialogNote.java b/src/ui/window/JDialogNote.java
index 4d79d2c47963d9d912a2cb176433fd80a46815ec..c64293ff7c404fbd0ac8c4d1a3f5b28a96b83aec 100755
--- a/src/ui/window/JDialogNote.java
+++ b/src/ui/window/JDialogNote.java
@@ -87,9 +87,8 @@ public class JDialogNote extends javax.swing.JDialog implements ActionListener {
jta.setTabSize(3);
jta.append(text);
jta.setFont(new Font("times", Font.PLAIN, 12));
- jta.setPreferredSize(new Dimension(300, 300));
JScrollPane jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-
+ jsp.setPreferredSize(new Dimension(300, 300));
c.add(jsp, BorderLayout.CENTER);
close = new JButton("Ok", IconManager.imgic25);
diff --git a/src/ui/window/JDialogObserver.java b/src/ui/window/JDialogObserver.java
index 994035054318f8fcc5b0509162d278a1887cf880..ef51690d1a27d887feb3d869b222cb9ac25f6364 100755
--- a/src/ui/window/JDialogObserver.java
+++ b/src/ui/window/JDialogObserver.java
@@ -128,8 +128,8 @@ public class JDialogObserver extends javax.swing.JDialog implements ActionListen
jta.setTabSize(3);
jta.append(text);
jta.setFont(new Font("times", Font.PLAIN, 12));
- jta.setPreferredSize(new Dimension(300, 200));
JScrollPane jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+ jsp.setPreferredSize(new Dimension(300, 200));
panel1.add(jsp);*/
//}
diff --git a/src/ui/window/JDialogRequirement.java b/src/ui/window/JDialogRequirement.java
index 0ee012db448d51b03776c6d16f8d59fafe08d288..7331e70ec04df9100f177c25c501dec61e5da52a 100755
--- a/src/ui/window/JDialogRequirement.java
+++ b/src/ui/window/JDialogRequirement.java
@@ -162,8 +162,9 @@ public class JDialogRequirement extends javax.swing.JDialog implements ActionLis
jta.setTabSize(3);
jta.append(text);
jta.setFont(new Font("times", Font.PLAIN, 12));
- jta.setPreferredSize(new Dimension(300, 200));
+
JScrollPane jsp = new JScrollPane(jta, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+ jsp.setPreferredSize(new Dimension(300, 200));
panel1.add(jsp);
//}