diff --git a/modeling/SysMLSec/AliceAndBob.xml b/modeling/SysMLSec/AliceAndBob.xml
index eaf6f98128552069e17e865a779d6bbf98b74d43..c542ebe37d2ff802b31229af0d2ba250da88439f 100644
--- a/modeling/SysMLSec/AliceAndBob.xml
+++ b/modeling/SysMLSec/AliceAndBob.xml
@@ -1,15 +1,49 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<TURTLEGMODELING version="0.98-beta3">
+<TURTLEGMODELING version="0.98-beta4">
<Modeling type="AVATAR Design" nameTab="Example" >
-<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
-<Validated value="" />
+<Validated value="System;Bob;Alice;" />
<Ignored value="" />
+<COMPONENT type="302" id="457" >
+<cdparam x="611" y="138" />
+<sizeparam width="471" height="97" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Proverif Pragma" value="#InitialSessionKnowledge Alice.sk Bob.sk
+
+#Confidentiality Alice.secretData
+#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2
+" />
+<TGConnectingPoint num="0" id="458" />
+<TGConnectingPoint num="1" id="459" />
+<TGConnectingPoint num="2" id="460" />
+<TGConnectingPoint num="3" id="461" />
+<TGConnectingPoint num="4" id="462" />
+<TGConnectingPoint num="5" id="463" />
+<TGConnectingPoint num="6" id="464" />
+<TGConnectingPoint num="7" id="465" />
+<TGConnectingPoint num="8" id="466" />
+<TGConnectingPoint num="9" id="467" />
+<TGConnectingPoint num="10" id="468" />
+<TGConnectingPoint num="11" id="469" />
+<TGConnectingPoint num="12" id="470" />
+<TGConnectingPoint num="13" id="471" />
+<TGConnectingPoint num="14" id="472" />
+<TGConnectingPoint num="15" id="473" />
+<extraparam>
+<Line value="#InitialSessionKnowledge Alice.sk Bob.sk" />
+<Line value="" />
+<Line value="#Confidentiality Alice.secretData" />
+<Line value="#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2" />
+</extraparam>
+</COMPONENT>
+
<CONNECTOR type="5002" id="6" >
<cdparam x="568" y="220" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -17,8 +51,8 @@
<TGConnectingPoint num="0" id="3" />
<TGConnectingPoint num="1" id="4" />
<TGConnectingPoint num="2" id="5" />
-<P1 x="459" y="199" id="95" />
-<P2 x="459" y="254" id="88" />
+<P1 x="459" y="199" id="103" />
+<P2 x="459" y="254" id="96" />
<Point x="490" y="199" />
<Point x="490" y="254" />
<AutomaticDrawing data="true" />
@@ -44,9 +78,9 @@
<infoparam name="point " value="null" />
</SUBCOMPONENT>
-<COMPONENT type="301" id="15" >
+<COMPONENT type="301" id="23" >
<cdparam x="40" y="64" />
-<sizeparam width="411" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="446" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="UML Note" value="#InitialSessionKnowledge Alice.sk Bob.sk
@@ -62,6 +96,14 @@
<TGConnectingPoint num="5" id="12" />
<TGConnectingPoint num="6" id="13" />
<TGConnectingPoint num="7" id="14" />
+<TGConnectingPoint num="8" id="15" />
+<TGConnectingPoint num="9" id="16" />
+<TGConnectingPoint num="10" id="17" />
+<TGConnectingPoint num="11" id="18" />
+<TGConnectingPoint num="12" id="19" />
+<TGConnectingPoint num="13" id="20" />
+<TGConnectingPoint num="14" id="21" />
+<TGConnectingPoint num="15" id="22" />
<extraparam>
<Line value="#InitialSessionKnowledge Alice.sk Bob.sk" />
<Line value="" />
@@ -70,117 +112,117 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="24" >
+<COMPONENT type="5003" id="32" >
<cdparam x="260" y="373" />
<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" 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="16" />
-<TGConnectingPoint num="1" id="17" />
-<TGConnectingPoint num="2" id="18" />
-<TGConnectingPoint num="3" id="19" />
-<TGConnectingPoint num="4" id="20" />
-<TGConnectingPoint num="5" id="21" />
-<TGConnectingPoint num="6" id="22" />
-<TGConnectingPoint num="7" id="23" />
+<TGConnectingPoint num="0" id="24" />
+<TGConnectingPoint num="1" id="25" />
+<TGConnectingPoint num="2" id="26" />
+<TGConnectingPoint num="3" id="27" />
+<TGConnectingPoint num="4" id="28" />
+<TGConnectingPoint num="5" id="29" />
+<TGConnectingPoint num="6" id="30" />
+<TGConnectingPoint num="7" id="31" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="33" >
+<COMPONENT type="5003" id="41" >
<cdparam x="68" y="372" />
<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" 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="25" />
-<TGConnectingPoint num="1" id="26" />
-<TGConnectingPoint num="2" id="27" />
-<TGConnectingPoint num="3" id="28" />
-<TGConnectingPoint num="4" id="29" />
-<TGConnectingPoint num="5" id="30" />
-<TGConnectingPoint num="6" id="31" />
-<TGConnectingPoint num="7" id="32" />
+<TGConnectingPoint num="0" id="33" />
+<TGConnectingPoint num="1" id="34" />
+<TGConnectingPoint num="2" id="35" />
+<TGConnectingPoint num="3" id="36" />
+<TGConnectingPoint num="4" id="37" />
+<TGConnectingPoint num="5" id="38" />
+<TGConnectingPoint num="6" id="39" />
+<TGConnectingPoint num="7" id="40" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="108" >
+<COMPONENT type="5000" id="116" >
<cdparam x="21" y="145" />
<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" 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="84" />
-<TGConnectingPoint num="1" id="85" />
-<TGConnectingPoint num="2" id="86" />
-<TGConnectingPoint num="3" id="87" />
-<TGConnectingPoint num="4" id="88" />
-<TGConnectingPoint num="5" id="89" />
-<TGConnectingPoint num="6" id="90" />
-<TGConnectingPoint num="7" id="91" />
-<TGConnectingPoint num="8" id="92" />
-<TGConnectingPoint num="9" id="93" />
-<TGConnectingPoint num="10" id="94" />
-<TGConnectingPoint num="11" id="95" />
-<TGConnectingPoint num="12" id="96" />
-<TGConnectingPoint num="13" id="97" />
-<TGConnectingPoint num="14" id="98" />
-<TGConnectingPoint num="15" id="99" />
-<TGConnectingPoint num="16" id="100" />
-<TGConnectingPoint num="17" id="101" />
-<TGConnectingPoint num="18" id="102" />
-<TGConnectingPoint num="19" id="103" />
-<TGConnectingPoint num="20" id="104" />
-<TGConnectingPoint num="21" id="105" />
-<TGConnectingPoint num="22" id="106" />
-<TGConnectingPoint num="23" id="107" />
+<TGConnectingPoint num="0" id="92" />
+<TGConnectingPoint num="1" id="93" />
+<TGConnectingPoint num="2" id="94" />
+<TGConnectingPoint num="3" id="95" />
+<TGConnectingPoint num="4" id="96" />
+<TGConnectingPoint num="5" id="97" />
+<TGConnectingPoint num="6" id="98" />
+<TGConnectingPoint num="7" id="99" />
+<TGConnectingPoint num="8" id="100" />
+<TGConnectingPoint num="9" id="101" />
+<TGConnectingPoint num="10" id="102" />
+<TGConnectingPoint num="11" id="103" />
+<TGConnectingPoint num="12" id="104" />
+<TGConnectingPoint num="13" id="105" />
+<TGConnectingPoint num="14" id="106" />
+<TGConnectingPoint num="15" id="107" />
+<TGConnectingPoint num="16" id="108" />
+<TGConnectingPoint num="17" id="109" />
+<TGConnectingPoint num="18" id="110" />
+<TGConnectingPoint num="19" id="111" />
+<TGConnectingPoint num="20" id="112" />
+<TGConnectingPoint num="21" id="113" />
+<TGConnectingPoint num="22" id="114" />
+<TGConnectingPoint num="23" id="115" />
<extraparam>
<CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<Signal value="in chin(Message msg)" attached="true" />
+<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="58" >
-<father id="108" num="0" />
-<cdparam x="30" y="213" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="66" >
+<father id="116" num="0" />
+<cdparam x="257" y="214" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="Alice" />
-<TGConnectingPoint num="0" id="34" />
-<TGConnectingPoint num="1" id="35" />
-<TGConnectingPoint num="2" id="36" />
-<TGConnectingPoint num="3" id="37" />
-<TGConnectingPoint num="4" id="38" />
-<TGConnectingPoint num="5" id="39" />
-<TGConnectingPoint num="6" id="40" />
-<TGConnectingPoint num="7" id="41" />
-<TGConnectingPoint num="8" id="42" />
-<TGConnectingPoint num="9" id="43" />
-<TGConnectingPoint num="10" id="44" />
-<TGConnectingPoint num="11" id="45" />
-<TGConnectingPoint num="12" id="46" />
-<TGConnectingPoint num="13" id="47" />
-<TGConnectingPoint num="14" id="48" />
-<TGConnectingPoint num="15" id="49" />
-<TGConnectingPoint num="16" id="50" />
-<TGConnectingPoint num="17" id="51" />
-<TGConnectingPoint num="18" id="52" />
-<TGConnectingPoint num="19" id="53" />
-<TGConnectingPoint num="20" id="54" />
-<TGConnectingPoint num="21" id="55" />
-<TGConnectingPoint num="22" id="56" />
-<TGConnectingPoint num="23" id="57" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
+<TGConnectingPoint num="0" id="42" />
+<TGConnectingPoint num="1" id="43" />
+<TGConnectingPoint num="2" id="44" />
+<TGConnectingPoint num="3" id="45" />
+<TGConnectingPoint num="4" id="46" />
+<TGConnectingPoint num="5" id="47" />
+<TGConnectingPoint num="6" id="48" />
+<TGConnectingPoint num="7" id="49" />
+<TGConnectingPoint num="8" id="50" />
+<TGConnectingPoint num="9" id="51" />
+<TGConnectingPoint num="10" id="52" />
+<TGConnectingPoint num="11" id="53" />
+<TGConnectingPoint num="12" id="54" />
+<TGConnectingPoint num="13" id="55" />
+<TGConnectingPoint num="14" id="56" />
+<TGConnectingPoint num="15" id="57" />
+<TGConnectingPoint num="16" id="58" />
+<TGConnectingPoint num="17" id="59" />
+<TGConnectingPoint num="18" id="60" />
+<TGConnectingPoint num="19" id="61" />
+<TGConnectingPoint num="20" id="62" />
+<TGConnectingPoint num="21" id="63" />
+<TGConnectingPoint num="22" id="64" />
+<TGConnectingPoint num="23" id="65" />
<extraparam>
<CryptoBlock value="false" />
-<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="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)" />
@@ -195,43 +237,43 @@
<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="83" >
-<father id="108" num="1" />
-<cdparam x="257" y="214" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="91" >
+<father id="116" num="1" />
+<cdparam x="30" y="213" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
-<TGConnectingPoint num="0" id="59" />
-<TGConnectingPoint num="1" id="60" />
-<TGConnectingPoint num="2" id="61" />
-<TGConnectingPoint num="3" id="62" />
-<TGConnectingPoint num="4" id="63" />
-<TGConnectingPoint num="5" id="64" />
-<TGConnectingPoint num="6" id="65" />
-<TGConnectingPoint num="7" id="66" />
-<TGConnectingPoint num="8" id="67" />
-<TGConnectingPoint num="9" id="68" />
-<TGConnectingPoint num="10" id="69" />
-<TGConnectingPoint num="11" id="70" />
-<TGConnectingPoint num="12" id="71" />
-<TGConnectingPoint num="13" id="72" />
-<TGConnectingPoint num="14" id="73" />
-<TGConnectingPoint num="15" id="74" />
-<TGConnectingPoint num="16" id="75" />
-<TGConnectingPoint num="17" id="76" />
-<TGConnectingPoint num="18" id="77" />
-<TGConnectingPoint num="19" id="78" />
-<TGConnectingPoint num="20" id="79" />
-<TGConnectingPoint num="21" id="80" />
-<TGConnectingPoint num="22" id="81" />
-<TGConnectingPoint num="23" id="82" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
+<TGConnectingPoint num="0" id="67" />
+<TGConnectingPoint num="1" id="68" />
+<TGConnectingPoint num="2" id="69" />
+<TGConnectingPoint num="3" id="70" />
+<TGConnectingPoint num="4" id="71" />
+<TGConnectingPoint num="5" id="72" />
+<TGConnectingPoint num="6" id="73" />
+<TGConnectingPoint num="7" id="74" />
+<TGConnectingPoint num="8" id="75" />
+<TGConnectingPoint num="9" id="76" />
+<TGConnectingPoint num="10" id="77" />
+<TGConnectingPoint num="11" id="78" />
+<TGConnectingPoint num="12" id="79" />
+<TGConnectingPoint num="13" id="80" />
+<TGConnectingPoint num="14" id="81" />
+<TGConnectingPoint num="15" id="82" />
+<TGConnectingPoint num="16" id="83" />
+<TGConnectingPoint num="17" id="84" />
+<TGConnectingPoint num="18" id="85" />
+<TGConnectingPoint num="19" id="86" />
+<TGConnectingPoint num="20" id="87" />
+<TGConnectingPoint num="21" id="88" />
+<TGConnectingPoint num="22" id="89" />
+<TGConnectingPoint num="23" id="90" />
<extraparam>
<CryptoBlock value="false" />
+<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="m1" 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)" />
@@ -251,96 +293,66 @@
</AVATARBlockDiagramPanel>
<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="110" >
+<COMPONENT type="5100" id="118" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="109" />
+<TGConnectingPoint num="0" id="117" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="117" >
-<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" />
-<TGConnectingPoint num="0" id="116" />
-<P1 x="416" y="379" id="152" />
-<P2 x="420" y="424" id="188" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="115" >
-<father id="117" num="0" />
-<cdparam x="431" y="403" />
-<sizeparam width="143" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="111" />
-<TGConnectingPoint num="1" id="112" />
-<TGConnectingPoint num="2" id="113" />
-<TGConnectingPoint num="3" id="114" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="receivedData = m.data" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="124" >
-<cdparam x="407" y="273" />
+<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="125" >
+<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 state0" value="null" />
-<TGConnectingPoint num="0" id="123" />
-<P1 x="407" y="273" id="234" />
-<P2 x="416" y="339" id="147" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="124" />
+<P1 x="407" y="310" id="148" />
+<P2 x="408" y="341" id="158" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="122" >
-<father id="124" num="0" />
-<cdparam x="419" y="312" />
-<sizeparam width="207" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="123" >
+<father id="125" num="0" />
+<cdparam x="407" y="350" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="118" />
-<TGConnectingPoint num="1" id="119" />
-<TGConnectingPoint num="2" id="120" />
-<TGConnectingPoint num="3" id="121" />
+<TGConnectingPoint num="0" id="119" />
+<TGConnectingPoint num="1" id="120" />
+<TGConnectingPoint num="2" id="121" />
+<TGConnectingPoint num="3" id="122" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="m = sdecrypt(m2, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="131" >
-<cdparam x="406" y="201" />
+<CONNECTOR type="5102" id="132" >
+<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" />
-<TGConnectingPoint num="0" id="130" />
-<P1 x="406" y="201" id="270" />
-<P2 x="407" y="233" id="229" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="131" />
+<P1 x="407" y="251" id="166" />
+<P2 x="407" y="280" id="147" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="129" >
-<father id="131" num="0" />
-<cdparam x="406" y="241" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="130" >
+<father id="132" num="0" />
+<cdparam x="407" y="291" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="125" />
-<TGConnectingPoint num="1" id="126" />
-<TGConnectingPoint num="2" id="127" />
-<TGConnectingPoint num="3" id="128" />
+<TGConnectingPoint num="0" id="126" />
+<TGConnectingPoint num="1" id="127" />
+<TGConnectingPoint num="2" id="128" />
+<TGConnectingPoint num="3" id="129" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -350,53 +362,55 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="138" >
-<cdparam x="406" y="141" />
+<CONNECTOR type="5102" id="139" >
+<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" />
-<TGConnectingPoint num="0" id="137" />
-<P1 x="406" y="141" id="286" />
-<P2 x="406" y="171" id="269" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="138" />
+<P1 x="407" y="132" id="207" />
+<P2 x="407" y="211" id="161" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="136" >
-<father id="138" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="137" >
+<father id="139" num="0" />
+<cdparam x="415" y="162" />
+<sizeparam width="185" height="30" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="132" />
-<TGConnectingPoint num="1" id="133" />
-<TGConnectingPoint num="2" id="134" />
-<TGConnectingPoint num="3" id="135" />
+<TGConnectingPoint num="0" id="133" />
+<TGConnectingPoint num="1" id="134" />
+<TGConnectingPoint num="2" id="135" />
+<TGConnectingPoint num="3" id="136" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="m.data = secretData" />
+<actions value="m1 = sencrypt(m, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="145" >
+<CONNECTOR type="5102" id="146" >
<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" />
-<TGConnectingPoint num="0" id="144" />
-<P1 x="407" y="70" id="321" />
-<P2 x="406" y="101" id="281" />
+<TGConnectingPoint num="0" id="145" />
+<P1 x="407" y="70" id="242" />
+<P2 x="407" y="92" id="202" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="143" >
-<father id="145" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="144" >
+<father id="146" num="0" />
<cdparam x="407" y="110" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="139" />
-<TGConnectingPoint num="1" id="140" />
-<TGConnectingPoint num="2" id="141" />
-<TGConnectingPoint num="3" id="142" />
+<TGConnectingPoint num="0" id="140" />
+<TGConnectingPoint num="1" id="141" />
+<TGConnectingPoint num="2" id="142" />
+<TGConnectingPoint num="3" id="143" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -406,284 +420,223 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5106" id="186" >
-<cdparam x="327" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="157" >
+<cdparam x="373" y="285" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" 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="146" />
-<TGConnectingPoint num="1" id="147" />
-<TGConnectingPoint num="2" id="148" />
-<TGConnectingPoint num="3" id="149" />
-<TGConnectingPoint num="4" id="150" />
-<TGConnectingPoint num="5" id="151" />
-<TGConnectingPoint num="6" id="152" />
-<TGConnectingPoint num="7" id="153" />
-<TGConnectingPoint num="8" id="154" />
-<TGConnectingPoint num="9" id="155" />
-<TGConnectingPoint num="10" id="156" />
-<TGConnectingPoint num="11" id="157" />
-<TGConnectingPoint num="12" id="158" />
-<TGConnectingPoint num="13" id="159" />
-<TGConnectingPoint num="14" id="160" />
-<TGConnectingPoint num="15" id="161" />
-<TGConnectingPoint num="16" id="162" />
-<TGConnectingPoint num="17" id="163" />
-<TGConnectingPoint num="18" id="164" />
-<TGConnectingPoint num="19" id="165" />
-<TGConnectingPoint num="20" id="166" />
-<TGConnectingPoint num="21" id="167" />
-<TGConnectingPoint num="22" id="168" />
-<TGConnectingPoint num="23" id="169" />
-<TGConnectingPoint num="24" id="170" />
-<TGConnectingPoint num="25" id="171" />
-<TGConnectingPoint num="26" id="172" />
-<TGConnectingPoint num="27" id="173" />
-<TGConnectingPoint num="28" id="174" />
-<TGConnectingPoint num="29" id="175" />
-<TGConnectingPoint num="30" id="176" />
-<TGConnectingPoint num="31" id="177" />
-<TGConnectingPoint num="32" id="178" />
-<TGConnectingPoint num="33" id="179" />
-<TGConnectingPoint num="34" id="180" />
-<TGConnectingPoint num="35" id="181" />
-<TGConnectingPoint num="36" id="182" />
-<TGConnectingPoint num="37" id="183" />
-<TGConnectingPoint num="38" id="184" />
-<TGConnectingPoint num="39" id="185" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(m1)" />
+<TGConnectingPoint num="0" id="147" />
+<TGConnectingPoint num="1" id="148" />
+<TGConnectingPoint num="2" id="149" />
+<TGConnectingPoint num="3" id="150" />
+<TGConnectingPoint num="4" id="151" />
+<TGConnectingPoint num="5" id="152" />
+<TGConnectingPoint num="6" id="153" />
+<TGConnectingPoint num="7" id="154" />
+<TGConnectingPoint num="8" id="155" />
+<TGConnectingPoint num="9" id="156" />
</COMPONENT>
-<COMPONENT type="5106" id="227" >
-<cdparam x="350" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="159" >
+<cdparam x="398" y="346" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" 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="187" />
-<TGConnectingPoint num="1" id="188" />
-<TGConnectingPoint num="2" id="189" />
-<TGConnectingPoint num="3" id="190" />
-<TGConnectingPoint num="4" id="191" />
-<TGConnectingPoint num="5" id="192" />
-<TGConnectingPoint num="6" id="193" />
-<TGConnectingPoint num="7" id="194" />
-<TGConnectingPoint num="8" id="195" />
-<TGConnectingPoint num="9" id="196" />
-<TGConnectingPoint num="10" id="197" />
-<TGConnectingPoint num="11" id="198" />
-<TGConnectingPoint num="12" id="199" />
-<TGConnectingPoint num="13" id="200" />
-<TGConnectingPoint num="14" id="201" />
-<TGConnectingPoint num="15" id="202" />
-<TGConnectingPoint num="16" id="203" />
-<TGConnectingPoint num="17" id="204" />
-<TGConnectingPoint num="18" id="205" />
-<TGConnectingPoint num="19" id="206" />
-<TGConnectingPoint num="20" id="207" />
-<TGConnectingPoint num="21" id="208" />
-<TGConnectingPoint num="22" id="209" />
-<TGConnectingPoint num="23" id="210" />
-<TGConnectingPoint num="24" id="211" />
-<TGConnectingPoint num="25" id="212" />
-<TGConnectingPoint num="26" id="213" />
-<TGConnectingPoint num="27" id="214" />
-<TGConnectingPoint num="28" id="215" />
-<TGConnectingPoint num="29" id="216" />
-<TGConnectingPoint num="30" id="217" />
-<TGConnectingPoint num="31" id="218" />
-<TGConnectingPoint num="32" id="219" />
-<TGConnectingPoint num="33" id="220" />
-<TGConnectingPoint num="34" id="221" />
-<TGConnectingPoint num="35" id="222" />
-<TGConnectingPoint num="36" id="223" />
-<TGConnectingPoint num="37" id="224" />
-<TGConnectingPoint num="38" id="225" />
-<TGConnectingPoint num="39" id="226" />
-<extraparam>
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="158" />
</COMPONENT>
-<COMPONENT type="5106" id="268" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="200" >
+<cdparam x="336" y="211" />
+<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" 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="228" />
-<TGConnectingPoint num="1" id="229" />
-<TGConnectingPoint num="2" id="230" />
-<TGConnectingPoint num="3" id="231" />
-<TGConnectingPoint num="4" id="232" />
-<TGConnectingPoint num="5" id="233" />
-<TGConnectingPoint num="6" id="234" />
-<TGConnectingPoint num="7" id="235" />
-<TGConnectingPoint num="8" id="236" />
-<TGConnectingPoint num="9" id="237" />
-<TGConnectingPoint num="10" id="238" />
-<TGConnectingPoint num="11" id="239" />
-<TGConnectingPoint num="12" id="240" />
-<TGConnectingPoint num="13" id="241" />
-<TGConnectingPoint num="14" id="242" />
-<TGConnectingPoint num="15" id="243" />
-<TGConnectingPoint num="16" id="244" />
-<TGConnectingPoint num="17" id="245" />
-<TGConnectingPoint num="18" id="246" />
-<TGConnectingPoint num="19" id="247" />
-<TGConnectingPoint num="20" id="248" />
-<TGConnectingPoint num="21" id="249" />
-<TGConnectingPoint num="22" id="250" />
-<TGConnectingPoint num="23" id="251" />
-<TGConnectingPoint num="24" id="252" />
-<TGConnectingPoint num="25" id="253" />
-<TGConnectingPoint num="26" id="254" />
-<TGConnectingPoint num="27" id="255" />
-<TGConnectingPoint num="28" id="256" />
-<TGConnectingPoint num="29" id="257" />
-<TGConnectingPoint num="30" id="258" />
-<TGConnectingPoint num="31" id="259" />
-<TGConnectingPoint num="32" id="260" />
-<TGConnectingPoint num="33" id="261" />
-<TGConnectingPoint num="34" id="262" />
-<TGConnectingPoint num="35" id="263" />
-<TGConnectingPoint num="36" id="264" />
-<TGConnectingPoint num="37" id="265" />
-<TGConnectingPoint num="38" id="266" />
-<TGConnectingPoint num="39" id="267" />
+<infoparam name="state0" value="sendingMessage" />
+<TGConnectingPoint num="0" id="160" />
+<TGConnectingPoint num="1" id="161" />
+<TGConnectingPoint num="2" id="162" />
+<TGConnectingPoint num="3" id="163" />
+<TGConnectingPoint num="4" id="164" />
+<TGConnectingPoint num="5" id="165" />
+<TGConnectingPoint num="6" id="166" />
+<TGConnectingPoint num="7" id="167" />
+<TGConnectingPoint num="8" id="168" />
+<TGConnectingPoint num="9" id="169" />
+<TGConnectingPoint num="10" id="170" />
+<TGConnectingPoint num="11" id="171" />
+<TGConnectingPoint num="12" id="172" />
+<TGConnectingPoint num="13" id="173" />
+<TGConnectingPoint num="14" id="174" />
+<TGConnectingPoint num="15" id="175" />
+<TGConnectingPoint num="16" id="176" />
+<TGConnectingPoint num="17" id="177" />
+<TGConnectingPoint num="18" id="178" />
+<TGConnectingPoint num="19" id="179" />
+<TGConnectingPoint num="20" id="180" />
+<TGConnectingPoint num="21" id="181" />
+<TGConnectingPoint num="22" id="182" />
+<TGConnectingPoint num="23" id="183" />
+<TGConnectingPoint num="24" id="184" />
+<TGConnectingPoint num="25" id="185" />
+<TGConnectingPoint num="26" id="186" />
+<TGConnectingPoint num="27" id="187" />
+<TGConnectingPoint num="28" id="188" />
+<TGConnectingPoint num="29" id="189" />
+<TGConnectingPoint num="30" id="190" />
+<TGConnectingPoint num="31" id="191" />
+<TGConnectingPoint num="32" id="192" />
+<TGConnectingPoint num="33" id="193" />
+<TGConnectingPoint num="34" id="194" />
+<TGConnectingPoint num="35" id="195" />
+<TGConnectingPoint num="36" id="196" />
+<TGConnectingPoint num="37" id="197" />
+<TGConnectingPoint num="38" id="198" />
+<TGConnectingPoint num="39" id="199" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5104" id="279" >
-<cdparam x="372" y="176" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" 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="269" />
-<TGConnectingPoint num="1" id="270" />
-<TGConnectingPoint num="2" id="271" />
-<TGConnectingPoint num="3" id="272" />
-<TGConnectingPoint num="4" id="273" />
-<TGConnectingPoint num="5" id="274" />
-<TGConnectingPoint num="6" id="275" />
-<TGConnectingPoint num="7" id="276" />
-<TGConnectingPoint num="8" id="277" />
-<TGConnectingPoint num="9" id="278" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="320" >
-<cdparam x="340" y="101" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="241" >
+<cdparam x="340" y="92" />
+<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" 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="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" />
-<TGConnectingPoint num="24" id="304" />
-<TGConnectingPoint num="25" id="305" />
-<TGConnectingPoint num="26" id="306" />
-<TGConnectingPoint num="27" id="307" />
-<TGConnectingPoint num="28" id="308" />
-<TGConnectingPoint num="29" id="309" />
-<TGConnectingPoint num="30" id="310" />
-<TGConnectingPoint num="31" id="311" />
-<TGConnectingPoint num="32" id="312" />
-<TGConnectingPoint num="33" id="313" />
-<TGConnectingPoint num="34" id="314" />
-<TGConnectingPoint num="35" id="315" />
-<TGConnectingPoint num="36" id="316" />
-<TGConnectingPoint num="37" id="317" />
-<TGConnectingPoint num="38" id="318" />
-<TGConnectingPoint num="39" id="319" />
+<infoparam name="state0" value="makingMessage" />
+<TGConnectingPoint num="0" id="201" />
+<TGConnectingPoint num="1" id="202" />
+<TGConnectingPoint num="2" id="203" />
+<TGConnectingPoint num="3" id="204" />
+<TGConnectingPoint num="4" id="205" />
+<TGConnectingPoint num="5" id="206" />
+<TGConnectingPoint num="6" id="207" />
+<TGConnectingPoint num="7" id="208" />
+<TGConnectingPoint num="8" id="209" />
+<TGConnectingPoint num="9" id="210" />
+<TGConnectingPoint num="10" id="211" />
+<TGConnectingPoint num="11" id="212" />
+<TGConnectingPoint num="12" id="213" />
+<TGConnectingPoint num="13" id="214" />
+<TGConnectingPoint num="14" id="215" />
+<TGConnectingPoint num="15" id="216" />
+<TGConnectingPoint num="16" id="217" />
+<TGConnectingPoint num="17" id="218" />
+<TGConnectingPoint num="18" id="219" />
+<TGConnectingPoint num="19" id="220" />
+<TGConnectingPoint num="20" id="221" />
+<TGConnectingPoint num="21" id="222" />
+<TGConnectingPoint num="22" id="223" />
+<TGConnectingPoint num="23" id="224" />
+<TGConnectingPoint num="24" id="225" />
+<TGConnectingPoint num="25" id="226" />
+<TGConnectingPoint num="26" id="227" />
+<TGConnectingPoint num="27" id="228" />
+<TGConnectingPoint num="28" id="229" />
+<TGConnectingPoint num="29" id="230" />
+<TGConnectingPoint num="30" id="231" />
+<TGConnectingPoint num="31" id="232" />
+<TGConnectingPoint num="32" id="233" />
+<TGConnectingPoint num="33" id="234" />
+<TGConnectingPoint num="34" id="235" />
+<TGConnectingPoint num="35" id="236" />
+<TGConnectingPoint num="36" id="237" />
+<TGConnectingPoint num="37" id="238" />
+<TGConnectingPoint num="38" id="239" />
+<TGConnectingPoint num="39" id="240" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="322" >
+<COMPONENT type="5100" id="243" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="321" />
+<TGConnectingPoint num="0" id="242" />
</COMPONENT>
</AVATARStateMachineDiagramPanel>
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="329" >
-<cdparam x="407" y="310" />
+<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="250" >
+<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 Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="328" />
-<P1 x="407" y="310" id="352" />
-<P2 x="408" y="341" id="362" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="249" />
+<P1 x="416" y="379" id="285" />
+<P2 x="420" y="424" id="321" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="327" >
-<father id="329" num="0" />
-<cdparam x="407" y="350" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="248" >
+<father id="250" num="0" />
+<cdparam x="431" y="403" />
+<sizeparam width="143" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="323" />
-<TGConnectingPoint num="1" id="324" />
-<TGConnectingPoint num="2" id="325" />
-<TGConnectingPoint num="3" id="326" />
+<TGConnectingPoint num="0" id="244" />
+<TGConnectingPoint num="1" id="245" />
+<TGConnectingPoint num="2" id="246" />
+<TGConnectingPoint num="3" id="247" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
+<actions value="receivedData = m.data" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="336" >
-<cdparam x="407" y="251" />
+<CONNECTOR type="5102" id="257" >
+<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 stop state" value="null" />
-<TGConnectingPoint num="0" id="335" />
-<P1 x="407" y="251" id="370" />
-<P2 x="407" y="280" id="351" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="256" />
+<P1 x="407" y="273" id="367" />
+<P2 x="416" y="339" id="280" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="334" >
-<father id="336" num="0" />
-<cdparam x="407" y="291" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="255" >
+<father id="257" num="0" />
+<cdparam x="419" y="312" />
+<sizeparam width="207" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
+<TGConnectingPoint num="0" id="251" />
+<TGConnectingPoint num="1" id="252" />
+<TGConnectingPoint num="2" id="253" />
+<TGConnectingPoint num="3" id="254" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="m = sdecrypt(m2, sk)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="264" >
+<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 Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="263" />
+<P1 x="406" y="201" id="403" />
+<P2 x="407" y="233" id="362" />
+<AutomaticDrawing data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="262" >
+<father id="264" num="0" />
+<cdparam x="406" y="241" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="330" />
-<TGConnectingPoint num="1" id="331" />
-<TGConnectingPoint num="2" id="332" />
-<TGConnectingPoint num="3" id="333" />
+<TGConnectingPoint num="0" id="258" />
+<TGConnectingPoint num="1" id="259" />
+<TGConnectingPoint num="2" id="260" />
+<TGConnectingPoint num="3" id="261" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -693,55 +646,53 @@
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="343" >
-<cdparam x="407" y="132" />
+<CONNECTOR type="5102" id="271" >
+<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 state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="342" />
-<P1 x="407" y="132" id="411" />
-<P2 x="407" y="211" id="365" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="270" />
+<P1 x="406" y="141" id="419" />
+<P2 x="406" y="171" id="402" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="341" >
-<father id="343" num="0" />
-<cdparam x="415" y="162" />
-<sizeparam width="185" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="269" >
+<father id="271" num="0" />
+<cdparam x="406" y="181" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="337" />
-<TGConnectingPoint num="1" id="338" />
-<TGConnectingPoint num="2" id="339" />
-<TGConnectingPoint num="3" id="340" />
+<TGConnectingPoint num="0" id="265" />
+<TGConnectingPoint num="1" id="266" />
+<TGConnectingPoint num="2" id="267" />
+<TGConnectingPoint num="3" id="268" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
<afterMax value="" />
<computeMin value="" />
<computeMax value="" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
</extraparam>
</SUBCOMPONENT>
-<CONNECTOR type="5102" id="350" >
+<CONNECTOR type="5102" id="278" >
<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" />
-<TGConnectingPoint num="0" id="349" />
-<P1 x="407" y="70" id="446" />
-<P2 x="407" y="92" id="406" />
+<TGConnectingPoint num="0" id="277" />
+<P1 x="407" y="70" id="454" />
+<P2 x="406" y="101" id="414" />
<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="348" >
-<father id="350" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="276" >
+<father id="278" num="0" />
<cdparam x="407" y="110" />
<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="" />
-<TGConnectingPoint num="0" id="344" />
-<TGConnectingPoint num="1" id="345" />
-<TGConnectingPoint num="2" id="346" />
-<TGConnectingPoint num="3" id="347" />
+<TGConnectingPoint num="0" id="272" />
+<TGConnectingPoint num="1" id="273" />
+<TGConnectingPoint num="2" id="274" />
+<TGConnectingPoint num="3" id="275" />
<extraparam>
<guard value="[ ]" />
<afterMin value="" />
@@ -751,140 +702,231 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5103" id="361" >
-<cdparam x="373" y="285" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="319" >
+<cdparam x="327" y="339" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" 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="351" />
-<TGConnectingPoint num="1" id="352" />
-<TGConnectingPoint num="2" id="353" />
-<TGConnectingPoint num="3" id="354" />
-<TGConnectingPoint num="4" id="355" />
-<TGConnectingPoint num="5" id="356" />
-<TGConnectingPoint num="6" id="357" />
-<TGConnectingPoint num="7" id="358" />
-<TGConnectingPoint num="8" id="359" />
-<TGConnectingPoint num="9" id="360" />
+<infoparam name="state0" value="messageDecrypted" />
+<TGConnectingPoint num="0" id="279" />
+<TGConnectingPoint num="1" id="280" />
+<TGConnectingPoint num="2" id="281" />
+<TGConnectingPoint num="3" id="282" />
+<TGConnectingPoint num="4" id="283" />
+<TGConnectingPoint num="5" id="284" />
+<TGConnectingPoint num="6" id="285" />
+<TGConnectingPoint num="7" id="286" />
+<TGConnectingPoint num="8" id="287" />
+<TGConnectingPoint num="9" id="288" />
+<TGConnectingPoint num="10" id="289" />
+<TGConnectingPoint num="11" id="290" />
+<TGConnectingPoint num="12" id="291" />
+<TGConnectingPoint num="13" id="292" />
+<TGConnectingPoint num="14" id="293" />
+<TGConnectingPoint num="15" id="294" />
+<TGConnectingPoint num="16" id="295" />
+<TGConnectingPoint num="17" id="296" />
+<TGConnectingPoint num="18" id="297" />
+<TGConnectingPoint num="19" id="298" />
+<TGConnectingPoint num="20" id="299" />
+<TGConnectingPoint num="21" id="300" />
+<TGConnectingPoint num="22" id="301" />
+<TGConnectingPoint num="23" id="302" />
+<TGConnectingPoint num="24" id="303" />
+<TGConnectingPoint num="25" id="304" />
+<TGConnectingPoint num="26" id="305" />
+<TGConnectingPoint num="27" id="306" />
+<TGConnectingPoint num="28" id="307" />
+<TGConnectingPoint num="29" id="308" />
+<TGConnectingPoint num="30" id="309" />
+<TGConnectingPoint num="31" id="310" />
+<TGConnectingPoint num="32" id="311" />
+<TGConnectingPoint num="33" id="312" />
+<TGConnectingPoint num="34" id="313" />
+<TGConnectingPoint num="35" id="314" />
+<TGConnectingPoint num="36" id="315" />
+<TGConnectingPoint num="37" id="316" />
+<TGConnectingPoint num="38" id="317" />
+<TGConnectingPoint num="39" id="318" />
+<extraparam>
+</extraparam>
</COMPONENT>
-<COMPONENT type="5101" id="363" >
-<cdparam x="398" y="346" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="360" >
+<cdparam x="350" y="424" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" 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="362" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="320" />
+<TGConnectingPoint num="1" id="321" />
+<TGConnectingPoint num="2" id="322" />
+<TGConnectingPoint num="3" id="323" />
+<TGConnectingPoint num="4" id="324" />
+<TGConnectingPoint num="5" id="325" />
+<TGConnectingPoint num="6" id="326" />
+<TGConnectingPoint num="7" id="327" />
+<TGConnectingPoint num="8" id="328" />
+<TGConnectingPoint num="9" id="329" />
+<TGConnectingPoint num="10" id="330" />
+<TGConnectingPoint num="11" id="331" />
+<TGConnectingPoint num="12" id="332" />
+<TGConnectingPoint num="13" id="333" />
+<TGConnectingPoint num="14" id="334" />
+<TGConnectingPoint num="15" id="335" />
+<TGConnectingPoint num="16" id="336" />
+<TGConnectingPoint num="17" id="337" />
+<TGConnectingPoint num="18" id="338" />
+<TGConnectingPoint num="19" id="339" />
+<TGConnectingPoint num="20" id="340" />
+<TGConnectingPoint num="21" id="341" />
+<TGConnectingPoint num="22" id="342" />
+<TGConnectingPoint num="23" id="343" />
+<TGConnectingPoint num="24" id="344" />
+<TGConnectingPoint num="25" id="345" />
+<TGConnectingPoint num="26" id="346" />
+<TGConnectingPoint num="27" id="347" />
+<TGConnectingPoint num="28" id="348" />
+<TGConnectingPoint num="29" id="349" />
+<TGConnectingPoint num="30" id="350" />
+<TGConnectingPoint num="31" id="351" />
+<TGConnectingPoint num="32" id="352" />
+<TGConnectingPoint num="33" id="353" />
+<TGConnectingPoint num="34" id="354" />
+<TGConnectingPoint num="35" id="355" />
+<TGConnectingPoint num="36" id="356" />
+<TGConnectingPoint num="37" id="357" />
+<TGConnectingPoint num="38" id="358" />
+<TGConnectingPoint num="39" id="359" />
+<extraparam>
+</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="404" >
-<cdparam x="336" y="211" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="401" >
+<cdparam x="336" y="233" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" 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="364" />
-<TGConnectingPoint num="1" id="365" />
-<TGConnectingPoint num="2" id="366" />
-<TGConnectingPoint num="3" id="367" />
-<TGConnectingPoint num="4" id="368" />
-<TGConnectingPoint num="5" id="369" />
-<TGConnectingPoint num="6" id="370" />
-<TGConnectingPoint num="7" id="371" />
-<TGConnectingPoint num="8" id="372" />
-<TGConnectingPoint num="9" id="373" />
-<TGConnectingPoint num="10" id="374" />
-<TGConnectingPoint num="11" id="375" />
-<TGConnectingPoint num="12" id="376" />
-<TGConnectingPoint num="13" id="377" />
-<TGConnectingPoint num="14" id="378" />
-<TGConnectingPoint num="15" id="379" />
-<TGConnectingPoint num="16" id="380" />
-<TGConnectingPoint num="17" id="381" />
-<TGConnectingPoint num="18" id="382" />
-<TGConnectingPoint num="19" id="383" />
-<TGConnectingPoint num="20" id="384" />
-<TGConnectingPoint num="21" id="385" />
-<TGConnectingPoint num="22" id="386" />
-<TGConnectingPoint num="23" id="387" />
-<TGConnectingPoint num="24" id="388" />
-<TGConnectingPoint num="25" id="389" />
-<TGConnectingPoint num="26" id="390" />
-<TGConnectingPoint num="27" id="391" />
-<TGConnectingPoint num="28" id="392" />
-<TGConnectingPoint num="29" id="393" />
-<TGConnectingPoint num="30" id="394" />
-<TGConnectingPoint num="31" id="395" />
-<TGConnectingPoint num="32" id="396" />
-<TGConnectingPoint num="33" id="397" />
-<TGConnectingPoint num="34" id="398" />
-<TGConnectingPoint num="35" id="399" />
-<TGConnectingPoint num="36" id="400" />
-<TGConnectingPoint num="37" id="401" />
-<TGConnectingPoint num="38" id="402" />
-<TGConnectingPoint num="39" id="403" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="361" />
+<TGConnectingPoint num="1" id="362" />
+<TGConnectingPoint num="2" id="363" />
+<TGConnectingPoint num="3" id="364" />
+<TGConnectingPoint num="4" id="365" />
+<TGConnectingPoint num="5" id="366" />
+<TGConnectingPoint num="6" id="367" />
+<TGConnectingPoint num="7" id="368" />
+<TGConnectingPoint num="8" id="369" />
+<TGConnectingPoint num="9" id="370" />
+<TGConnectingPoint num="10" id="371" />
+<TGConnectingPoint num="11" id="372" />
+<TGConnectingPoint num="12" id="373" />
+<TGConnectingPoint num="13" id="374" />
+<TGConnectingPoint num="14" id="375" />
+<TGConnectingPoint num="15" id="376" />
+<TGConnectingPoint num="16" id="377" />
+<TGConnectingPoint num="17" id="378" />
+<TGConnectingPoint num="18" id="379" />
+<TGConnectingPoint num="19" id="380" />
+<TGConnectingPoint num="20" id="381" />
+<TGConnectingPoint num="21" id="382" />
+<TGConnectingPoint num="22" id="383" />
+<TGConnectingPoint num="23" id="384" />
+<TGConnectingPoint num="24" id="385" />
+<TGConnectingPoint num="25" id="386" />
+<TGConnectingPoint num="26" id="387" />
+<TGConnectingPoint num="27" id="388" />
+<TGConnectingPoint num="28" id="389" />
+<TGConnectingPoint num="29" id="390" />
+<TGConnectingPoint num="30" id="391" />
+<TGConnectingPoint num="31" id="392" />
+<TGConnectingPoint num="32" id="393" />
+<TGConnectingPoint num="33" id="394" />
+<TGConnectingPoint num="34" id="395" />
+<TGConnectingPoint num="35" id="396" />
+<TGConnectingPoint num="36" id="397" />
+<TGConnectingPoint num="37" id="398" />
+<TGConnectingPoint num="38" id="399" />
+<TGConnectingPoint num="39" id="400" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5106" id="445" >
-<cdparam x="340" y="92" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="412" >
+<cdparam x="372" y="176" />
+<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" 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="405" />
-<TGConnectingPoint num="1" id="406" />
-<TGConnectingPoint num="2" id="407" />
-<TGConnectingPoint num="3" id="408" />
-<TGConnectingPoint num="4" id="409" />
-<TGConnectingPoint num="5" id="410" />
-<TGConnectingPoint num="6" id="411" />
-<TGConnectingPoint num="7" id="412" />
-<TGConnectingPoint num="8" id="413" />
-<TGConnectingPoint num="9" id="414" />
-<TGConnectingPoint num="10" id="415" />
-<TGConnectingPoint num="11" id="416" />
-<TGConnectingPoint num="12" id="417" />
-<TGConnectingPoint num="13" id="418" />
-<TGConnectingPoint num="14" id="419" />
-<TGConnectingPoint num="15" id="420" />
-<TGConnectingPoint num="16" id="421" />
-<TGConnectingPoint num="17" id="422" />
-<TGConnectingPoint num="18" id="423" />
-<TGConnectingPoint num="19" id="424" />
-<TGConnectingPoint num="20" id="425" />
-<TGConnectingPoint num="21" id="426" />
-<TGConnectingPoint num="22" id="427" />
-<TGConnectingPoint num="23" id="428" />
-<TGConnectingPoint num="24" id="429" />
-<TGConnectingPoint num="25" id="430" />
-<TGConnectingPoint num="26" id="431" />
-<TGConnectingPoint num="27" id="432" />
-<TGConnectingPoint num="28" id="433" />
-<TGConnectingPoint num="29" id="434" />
-<TGConnectingPoint num="30" id="435" />
-<TGConnectingPoint num="31" id="436" />
-<TGConnectingPoint num="32" id="437" />
-<TGConnectingPoint num="33" id="438" />
-<TGConnectingPoint num="34" id="439" />
-<TGConnectingPoint num="35" id="440" />
-<TGConnectingPoint num="36" id="441" />
-<TGConnectingPoint num="37" id="442" />
-<TGConnectingPoint num="38" id="443" />
-<TGConnectingPoint num="39" id="444" />
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="402" />
+<TGConnectingPoint num="1" id="403" />
+<TGConnectingPoint num="2" id="404" />
+<TGConnectingPoint num="3" id="405" />
+<TGConnectingPoint num="4" id="406" />
+<TGConnectingPoint num="5" id="407" />
+<TGConnectingPoint num="6" id="408" />
+<TGConnectingPoint num="7" id="409" />
+<TGConnectingPoint num="8" id="410" />
+<TGConnectingPoint num="9" id="411" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="453" >
+<cdparam x="340" y="101" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" 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="413" />
+<TGConnectingPoint num="1" id="414" />
+<TGConnectingPoint num="2" id="415" />
+<TGConnectingPoint num="3" id="416" />
+<TGConnectingPoint num="4" id="417" />
+<TGConnectingPoint num="5" id="418" />
+<TGConnectingPoint num="6" id="419" />
+<TGConnectingPoint num="7" id="420" />
+<TGConnectingPoint num="8" id="421" />
+<TGConnectingPoint num="9" id="422" />
+<TGConnectingPoint num="10" id="423" />
+<TGConnectingPoint num="11" id="424" />
+<TGConnectingPoint num="12" id="425" />
+<TGConnectingPoint num="13" id="426" />
+<TGConnectingPoint num="14" id="427" />
+<TGConnectingPoint num="15" id="428" />
+<TGConnectingPoint num="16" id="429" />
+<TGConnectingPoint num="17" id="430" />
+<TGConnectingPoint num="18" id="431" />
+<TGConnectingPoint num="19" id="432" />
+<TGConnectingPoint num="20" id="433" />
+<TGConnectingPoint num="21" id="434" />
+<TGConnectingPoint num="22" id="435" />
+<TGConnectingPoint num="23" id="436" />
+<TGConnectingPoint num="24" id="437" />
+<TGConnectingPoint num="25" id="438" />
+<TGConnectingPoint num="26" id="439" />
+<TGConnectingPoint num="27" id="440" />
+<TGConnectingPoint num="28" id="441" />
+<TGConnectingPoint num="29" id="442" />
+<TGConnectingPoint num="30" id="443" />
+<TGConnectingPoint num="31" id="444" />
+<TGConnectingPoint num="32" id="445" />
+<TGConnectingPoint num="33" id="446" />
+<TGConnectingPoint num="34" id="447" />
+<TGConnectingPoint num="35" id="448" />
+<TGConnectingPoint num="36" id="449" />
+<TGConnectingPoint num="37" id="450" />
+<TGConnectingPoint num="38" id="451" />
+<TGConnectingPoint num="39" id="452" />
<extraparam>
</extraparam>
</COMPONENT>
-<COMPONENT type="5100" id="447" >
+<COMPONENT type="5100" id="455" >
<cdparam x="400" y="50" />
<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" 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="446" />
+<TGConnectingPoint num="0" id="454" />
</COMPONENT>
diff --git a/src/ui/avatarbd/AvatarBDBlock.java b/src/ui/avatarbd/AvatarBDBlock.java
index fcfdb6b52edc842f5b4ac12bfc8c92b002d9ea79..0e477ecde437348d56cff8ebc0acfe5771299ae4 100644
--- a/src/ui/avatarbd/AvatarBDBlock.java
+++ b/src/ui/avatarbd/AvatarBDBlock.java
@@ -477,6 +477,12 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
private void drawConfidentialityVerification(int confidentialityVerification, Graphics g, int _x, int _y) {
Color c = g.getColor();
Color c1;
+ int xc=(int)(6*tdp.getZoom());
+ int yc=(int)(10*tdp.getZoom());
+ int lockwidth=(int) (9*tdp.getZoom());
+ int lockheight=(int) (7*tdp.getZoom());
+ int ovalwidth=(int) (6*tdp.getZoom());
+ int ovalheight=(int) (9*tdp.getZoom());
switch(confidentialityVerification) {
case TAttribute.CONFIDENTIALITY_OK:
c1 = Color.green;
@@ -491,11 +497,11 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
return;
}
- g.drawOval(_x+6, _y-10, 6, 9);
+ g.drawOval(_x+xc, _y-yc, ovalwidth, ovalheight);
g.setColor(c1);
- g.fillRect(_x+4, _y-7, 9, 7);
+ g.fillRect(_x+xc*2/3, _y-yc*2/3, lockwidth, lockheight);
g.setColor(c);
- g.drawRect(_x+4, _y-7, 9, 7);
+ g.drawRect(_x+xc*2/3, _y-yc*2/3, lockwidth, lockheight);
}