diff --git a/modeling/SysMLSec/AliceAndBob.xml b/modeling/SysMLSec/AliceAndBob.xml
index 52e4a3e3d0b58ffa4851199f700773fa50158205..716187ba0ecb44e48bdb84d4b65f04490d0762c0 100644
--- a/modeling/SysMLSec/AliceAndBob.xml
+++ b/modeling/SysMLSec/AliceAndBob.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="4" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="3" LAST_SELECTED_SUB_TAB="0">
<Modeling type="AVATAR Design" nameTab="Example" tabs="Block Diagram$System$Alice$Bob" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
@@ -50,7 +50,7 @@
<COMPONENT type="302" id="23" index="1" uid="c0c42802-411e-41d6-b7f8-579b1ce07786" >
<cdparam x="517" y="154" />
-<sizeparam width="420" height="10" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="420" height="78" 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="#InitialSystemKnowledge Alice.sk Bob.sk
@@ -177,13 +177,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="82" index="7" uid="32384080-e86a-41de-b441-4f6ae88f1cbe" >
+<SUBCOMPONENT type="5000" id="82" index="7" uid="a1c44cc9-9334-4d03-8988-e402248c1447" >
<father id="164" num="0" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<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" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="42" />
<TGConnectingPoint num="1" id="43" />
@@ -228,10 +228,10 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<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)" />
@@ -256,13 +256,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="123" index="8" uid="a1c44cc9-9334-4d03-8988-e402248c1447" >
+<SUBCOMPONENT type="5000" id="123" index="8" uid="32384080-e86a-41de-b441-4f6ae88f1cbe" >
<father id="164" num="1" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<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" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
<new d="false" />
<TGConnectingPoint num="0" id="83" />
<TGConnectingPoint num="1" id="84" />
@@ -307,10 +307,10 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<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)" />
@@ -366,7 +366,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="171" index="11" uid="3d701899-b1e9-431d-92be-ec4bc673ea12" >
<father id="173" num="0" />
<cdparam x="449" y="353" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -401,7 +401,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="178" index="12" uid="c83ec9b7-9e1b-4ab5-8f6d-b58aab72bbc9" >
<father id="180" num="0" />
<cdparam x="449" y="440" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -436,7 +436,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="185" index="13" uid="0e640067-6326-4dbb-b423-db0b11e26852" >
<father id="187" num="0" />
<cdparam x="407" y="291" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -471,7 +471,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="192" index="14" uid="e1fb2459-4796-4e1e-9a3d-1dacdf8c39db" >
<father id="194" num="0" />
<cdparam x="465" y="153" />
-<sizeparam width="144" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="144" height="32" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -508,7 +508,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="199" index="15" uid="7a020041-2b53-4e95-8a91-1c697023355b" >
<father id="201" num="0" />
<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -839,7 +839,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="440" index="11" uid="75d1764e-2ae7-46ee-8e13-1c81c9a0181e" >
<father id="442" num="0" />
<cdparam x="431" y="403" />
-<sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="145" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -875,7 +875,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="447" index="12" uid="823f8cd9-7573-46a0-a5c1-6f8b02a3c4f8" >
<father id="449" num="0" />
<cdparam x="419" y="312" />
-<sizeparam width="134" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="134" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -911,7 +911,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="454" index="13" uid="33381352-6922-4950-86d7-66a46a4b1197" >
<father id="456" num="0" />
<cdparam x="406" y="241" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -946,7 +946,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="461" index="14" uid="d09f99de-45ea-4687-b46c-91b93d5c6278" >
<father id="463" num="0" />
<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -981,7 +981,7 @@
</CONNECTOR><SUBCOMPONENT type="-1" id="468" index="15" uid="69a7e54e-9f7d-499b-a185-686378485ecf" >
<father id="470" num="0" />
<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1555,13 +1555,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="857" index="7" uid="cc150a1e-1348-4fa4-98a9-3a612b6184cc" >
+<SUBCOMPONENT type="5000" id="857" index="7" uid="e802e723-57b4-4734-af20-cddadacc10e6" >
<father id="939" num="0" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<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" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
<new d="false" />
<TGConnectingPoint num="0" id="817" />
<TGConnectingPoint num="1" id="818" />
@@ -1606,13 +1606,13 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<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="" />
-<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="bobPubK" 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)" />
@@ -1637,13 +1637,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="898" index="8" uid="e802e723-57b4-4734-af20-cddadacc10e6" >
+<SUBCOMPONENT type="5000" id="898" index="8" uid="cc150a1e-1348-4fa4-98a9-3a612b6184cc" >
<father id="939" num="1" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<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" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="858" />
<TGConnectingPoint num="1" id="859" />
@@ -1688,13 +1688,13 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<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="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="alicePubK" 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)" />
@@ -3653,13 +3653,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="2024" index="7" uid="7a040a26-feb9-4e9a-a609-908679df2a0b" >
+<SUBCOMPONENT type="5000" id="2024" index="7" uid="f24348ab-6d4a-40e6-a942-342d6222b23f" >
<father id="2147" num="0" />
-<cdparam x="115" y="249" />
-<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="108" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
-<infoparam name="Block0" value="CA" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="1984" />
<TGConnectingPoint num="1" id="1985" />
@@ -3704,30 +3704,22 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<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="" />
<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="aliceID" value="" type="8" typeOther="" />
-<Attribute access="0" id="bobID" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="newK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="newCert" 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="newID" value="" type="8" typeOther="" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
+<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="certOK" value="" type="4" 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="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
<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)" />
@@ -3736,6 +3728,16 @@
<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)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
<SUBCOMPONENT type="5000" id="2065" index="8" uid="52a07889-a0b4-45e9-a97a-a5a5e144d49b" >
@@ -3825,13 +3827,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2106" index="9" uid="f24348ab-6d4a-40e6-a942-342d6222b23f" >
+<SUBCOMPONENT type="5000" id="2106" index="9" uid="7a040a26-feb9-4e9a-a609-908679df2a0b" >
<father id="2147" num="2" />
-<cdparam x="263" y="108" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="115" y="249" />
+<sizeparam width="261" height="83" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="218" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="177" minY="0" maxY="261" />
+<infoparam name="Block0" value="CA" />
<new d="false" />
<TGConnectingPoint num="0" id="2066" />
<TGConnectingPoint num="1" id="2067" />
@@ -3876,30 +3878,18 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<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="" />
<Attribute access="0" id="privK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="pubK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="alicePubK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CAPubK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="bobPubK" value="" type="5" typeOther="Key" />
<Attribute access="0" id="aliceID" value="" type="8" typeOther="" />
+<Attribute access="0" id="bobID" value="" type="8" typeOther="" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="newK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="newCert" value="" type="5" typeOther="Message" />
<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sig" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="certOK" value="" type="4" 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)" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="newID" value="" type="8" typeOther="" />
<Method value="Message aencrypt(Message msg, Key k)" />
<Method value="Message adecrypt(Message msg, Key k)" />
<Method value="Key pk(Key k)" />
@@ -3908,8 +3898,18 @@
<Method value="Message cert(Key k, Message msg)" />
<Method value="bool verifyCert(Message cert, Key k)" />
<Method value="Key getpk(Message cert)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
<Method value="Key DH(Key pubK, Key privK)" />
<Method value="Message hash(Message msg)" />
+<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>
@@ -6551,7 +6551,7 @@
-<Modeling type="AVATAR Design" nameTab="Example_NoSec" tabs="Block Diagram$System$Alice$Bob" >
+<Modeling type="AVATAR Design" nameTab="Example_NoSecurity" tabs="Block Diagram$System$Alice$Bob" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
@@ -6560,15 +6560,15 @@
<Validated value="" />
<Ignored value="" />
-<CONNECTOR type="5002" id="3566" index="0" uid="d9f3c060-b5c1-44f6-91f8-da272d92d2d0" >
+<CONNECTOR type="5002" id="4261" index="0" uid="5e9ea5bc-0eac-45c7-b468-24e6f5a65e1f" >
<cdparam x="568" y="220" />
<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="" />
-<TGConnectingPoint num="0" id="3563" />
-<TGConnectingPoint num="1" id="3564" />
-<TGConnectingPoint num="2" id="3565" />
-<P1 x="459" y="199" id="3695" />
-<P2 x="459" y="254" id="3688" />
+<TGConnectingPoint num="0" id="4258" />
+<TGConnectingPoint num="1" id="4259" />
+<TGConnectingPoint num="2" id="4260" />
+<P1 x="459" y="199" id="4390" />
+<P2 x="459" y="254" id="4383" />
<Point x="490" y="199" />
<Point x="490" y="254" />
<AutomaticDrawing data="true" />
@@ -6578,8 +6578,8 @@
<osd value="out chout(Message msg)" />
<FIFOType asynchronous="false" synchronousCH="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="3561" index="5" uid="ae2ee203-0eed-4c50-82bc-d2242d81e810" >
-<father id="3566" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4256" index="5" uid="c8213529-738a-46d4-bbf7-ea9e24c11f5a" >
+<father id="4261" num="0" />
<cdparam x="490" y="199" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6587,8 +6587,8 @@
<infoparam name="point " value="null" />
<new d="false" />
</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3562" index="6" uid="63158d4c-382c-421b-9cff-1c76ff08f66b" >
-<father id="3566" num="1" />
+<SUBCOMPONENT type="-1" id="4257" index="6" uid="2c2224b4-6c04-4d47-a0d9-466f88f4d68a" >
+<father id="4261" num="1" />
<cdparam x="490" y="254" />
<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
@@ -6597,128 +6597,124 @@
<new d="false" />
</SUBCOMPONENT>
-<COMPONENT type="302" id="3583" index="1" uid="eb3b7ec4-6ed0-42a7-8874-155b176d440b" >
-<cdparam x="529" y="163" />
-<sizeparam width="420" height="78" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="302" id="4278" index="1" uid="029b1805-5bd8-44cc-9fbd-9dfae02d8e94" >
+<cdparam x="535" y="149" />
+<sizeparam width="420" height="66" 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="#InitialSystemKnowledge Alice.sk Bob.sk
-
-#Confidentiality Alice.secretData
+<infoparam name="Proverif Pragma" value="#Confidentiality Alice.secretData
#Authenticity Alice.sendingMessage.m Bob.messageDecrypted.m
" />
<new d="false" />
-<TGConnectingPoint num="0" id="3567" />
-<TGConnectingPoint num="1" id="3568" />
-<TGConnectingPoint num="2" id="3569" />
-<TGConnectingPoint num="3" id="3570" />
-<TGConnectingPoint num="4" id="3571" />
-<TGConnectingPoint num="5" id="3572" />
-<TGConnectingPoint num="6" id="3573" />
-<TGConnectingPoint num="7" id="3574" />
-<TGConnectingPoint num="8" id="3575" />
-<TGConnectingPoint num="9" id="3576" />
-<TGConnectingPoint num="10" id="3577" />
-<TGConnectingPoint num="11" id="3578" />
-<TGConnectingPoint num="12" id="3579" />
-<TGConnectingPoint num="13" id="3580" />
-<TGConnectingPoint num="14" id="3581" />
-<TGConnectingPoint num="15" id="3582" />
+<TGConnectingPoint num="0" id="4262" />
+<TGConnectingPoint num="1" id="4263" />
+<TGConnectingPoint num="2" id="4264" />
+<TGConnectingPoint num="3" id="4265" />
+<TGConnectingPoint num="4" id="4266" />
+<TGConnectingPoint num="5" id="4267" />
+<TGConnectingPoint num="6" id="4268" />
+<TGConnectingPoint num="7" id="4269" />
+<TGConnectingPoint num="8" id="4270" />
+<TGConnectingPoint num="9" id="4271" />
+<TGConnectingPoint num="10" id="4272" />
+<TGConnectingPoint num="11" id="4273" />
+<TGConnectingPoint num="12" id="4274" />
+<TGConnectingPoint num="13" id="4275" />
+<TGConnectingPoint num="14" id="4276" />
+<TGConnectingPoint num="15" id="4277" />
<extraparam>
-<Line value="#InitialSystemKnowledge Alice.sk Bob.sk" />
-<Line value="" />
<Line value="#Confidentiality Alice.secretData" />
<Line value="#Authenticity Alice.sendingMessage.m Bob.messageDecrypted.m" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="3592" index="2" uid="a1ae4f30-4c27-4b27-97a9-cb4544d490ff" >
+<COMPONENT type="5003" id="4287" index="2" uid="6ff09061-6050-477e-9429-0ca0a94d0652" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3584" />
-<TGConnectingPoint num="1" id="3585" />
-<TGConnectingPoint num="2" id="3586" />
-<TGConnectingPoint num="3" id="3587" />
-<TGConnectingPoint num="4" id="3588" />
-<TGConnectingPoint num="5" id="3589" />
-<TGConnectingPoint num="6" id="3590" />
-<TGConnectingPoint num="7" id="3591" />
+<TGConnectingPoint num="0" id="4279" />
+<TGConnectingPoint num="1" id="4280" />
+<TGConnectingPoint num="2" id="4281" />
+<TGConnectingPoint num="3" id="4282" />
+<TGConnectingPoint num="4" id="4283" />
+<TGConnectingPoint num="5" id="4284" />
+<TGConnectingPoint num="6" id="4285" />
+<TGConnectingPoint num="7" id="4286" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5003" id="3601" index="3" uid="ed4f8270-02c9-4c71-b5b4-c25568ae3721" >
+<COMPONENT type="5003" id="4296" index="3" uid="abad1e2f-9763-48d1-b6fe-911c3f0c6cd6" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3593" />
-<TGConnectingPoint num="1" id="3594" />
-<TGConnectingPoint num="2" id="3595" />
-<TGConnectingPoint num="3" id="3596" />
-<TGConnectingPoint num="4" id="3597" />
-<TGConnectingPoint num="5" id="3598" />
-<TGConnectingPoint num="6" id="3599" />
-<TGConnectingPoint num="7" id="3600" />
+<TGConnectingPoint num="0" id="4288" />
+<TGConnectingPoint num="1" id="4289" />
+<TGConnectingPoint num="2" id="4290" />
+<TGConnectingPoint num="3" id="4291" />
+<TGConnectingPoint num="4" id="4292" />
+<TGConnectingPoint num="5" id="4293" />
+<TGConnectingPoint num="6" id="4294" />
+<TGConnectingPoint num="7" id="4295" />
<extraparam>
<Attribute access="0" id="data" value="" type="8" typeOther="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5000" id="3724" index="4" uid="cf0f7112-ab74-43be-9198-12502fa29e37" >
+<COMPONENT type="5000" id="4419" index="4" uid="a468054d-8335-41ee-8174-1e236a68c252" >
<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" />
<new d="false" />
-<TGConnectingPoint num="0" id="3684" />
-<TGConnectingPoint num="1" id="3685" />
-<TGConnectingPoint num="2" id="3686" />
-<TGConnectingPoint num="3" id="3687" />
-<TGConnectingPoint num="4" id="3688" />
-<TGConnectingPoint num="5" id="3689" />
-<TGConnectingPoint num="6" id="3690" />
-<TGConnectingPoint num="7" id="3691" />
-<TGConnectingPoint num="8" id="3692" />
-<TGConnectingPoint num="9" id="3693" />
-<TGConnectingPoint num="10" id="3694" />
-<TGConnectingPoint num="11" id="3695" />
-<TGConnectingPoint num="12" id="3696" />
-<TGConnectingPoint num="13" id="3697" />
-<TGConnectingPoint num="14" id="3698" />
-<TGConnectingPoint num="15" id="3699" />
-<TGConnectingPoint num="16" id="3700" />
-<TGConnectingPoint num="17" id="3701" />
-<TGConnectingPoint num="18" id="3702" />
-<TGConnectingPoint num="19" id="3703" />
-<TGConnectingPoint num="20" id="3704" />
-<TGConnectingPoint num="21" id="3705" />
-<TGConnectingPoint num="22" id="3706" />
-<TGConnectingPoint num="23" id="3707" />
-<TGConnectingPoint num="24" id="3708" />
-<TGConnectingPoint num="25" id="3709" />
-<TGConnectingPoint num="26" id="3710" />
-<TGConnectingPoint num="27" id="3711" />
-<TGConnectingPoint num="28" id="3712" />
-<TGConnectingPoint num="29" id="3713" />
-<TGConnectingPoint num="30" id="3714" />
-<TGConnectingPoint num="31" id="3715" />
-<TGConnectingPoint num="32" id="3716" />
-<TGConnectingPoint num="33" id="3717" />
-<TGConnectingPoint num="34" id="3718" />
-<TGConnectingPoint num="35" id="3719" />
-<TGConnectingPoint num="36" id="3720" />
-<TGConnectingPoint num="37" id="3721" />
-<TGConnectingPoint num="38" id="3722" />
-<TGConnectingPoint num="39" id="3723" />
+<TGConnectingPoint num="0" id="4379" />
+<TGConnectingPoint num="1" id="4380" />
+<TGConnectingPoint num="2" id="4381" />
+<TGConnectingPoint num="3" id="4382" />
+<TGConnectingPoint num="4" id="4383" />
+<TGConnectingPoint num="5" id="4384" />
+<TGConnectingPoint num="6" id="4385" />
+<TGConnectingPoint num="7" id="4386" />
+<TGConnectingPoint num="8" id="4387" />
+<TGConnectingPoint num="9" id="4388" />
+<TGConnectingPoint num="10" id="4389" />
+<TGConnectingPoint num="11" id="4390" />
+<TGConnectingPoint num="12" id="4391" />
+<TGConnectingPoint num="13" id="4392" />
+<TGConnectingPoint num="14" id="4393" />
+<TGConnectingPoint num="15" id="4394" />
+<TGConnectingPoint num="16" id="4395" />
+<TGConnectingPoint num="17" id="4396" />
+<TGConnectingPoint num="18" id="4397" />
+<TGConnectingPoint num="19" id="4398" />
+<TGConnectingPoint num="20" id="4399" />
+<TGConnectingPoint num="21" id="4400" />
+<TGConnectingPoint num="22" id="4401" />
+<TGConnectingPoint num="23" id="4402" />
+<TGConnectingPoint num="24" id="4403" />
+<TGConnectingPoint num="25" id="4404" />
+<TGConnectingPoint num="26" id="4405" />
+<TGConnectingPoint num="27" id="4406" />
+<TGConnectingPoint num="28" id="4407" />
+<TGConnectingPoint num="29" id="4408" />
+<TGConnectingPoint num="30" id="4409" />
+<TGConnectingPoint num="31" id="4410" />
+<TGConnectingPoint num="32" id="4411" />
+<TGConnectingPoint num="33" id="4412" />
+<TGConnectingPoint num="34" id="4413" />
+<TGConnectingPoint num="35" id="4414" />
+<TGConnectingPoint num="36" id="4415" />
+<TGConnectingPoint num="37" id="4416" />
+<TGConnectingPoint num="38" id="4417" />
+<TGConnectingPoint num="39" id="4418" />
<extraparam>
<blockType data="block" color="-4072719" />
<CryptoBlock value="false" />
@@ -6726,1262 +6722,13 @@
<Signal value="out chout(Message msg)" attached="true" />
</extraparam>
</COMPONENT>
-<SUBCOMPONENT type="5000" id="3642" index="7" uid="61aa0d90-6194-4828-956d-3ecc91856068" >
-<father id="3724" num="0" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" 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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3602" />
-<TGConnectingPoint num="1" id="3603" />
-<TGConnectingPoint num="2" id="3604" />
-<TGConnectingPoint num="3" id="3605" />
-<TGConnectingPoint num="4" id="3606" />
-<TGConnectingPoint num="5" id="3607" />
-<TGConnectingPoint num="6" id="3608" />
-<TGConnectingPoint num="7" id="3609" />
-<TGConnectingPoint num="8" id="3610" />
-<TGConnectingPoint num="9" id="3611" />
-<TGConnectingPoint num="10" id="3612" />
-<TGConnectingPoint num="11" id="3613" />
-<TGConnectingPoint num="12" id="3614" />
-<TGConnectingPoint num="13" id="3615" />
-<TGConnectingPoint num="14" id="3616" />
-<TGConnectingPoint num="15" id="3617" />
-<TGConnectingPoint num="16" id="3618" />
-<TGConnectingPoint num="17" id="3619" />
-<TGConnectingPoint num="18" id="3620" />
-<TGConnectingPoint num="19" id="3621" />
-<TGConnectingPoint num="20" id="3622" />
-<TGConnectingPoint num="21" id="3623" />
-<TGConnectingPoint num="22" id="3624" />
-<TGConnectingPoint num="23" id="3625" />
-<TGConnectingPoint num="24" id="3626" />
-<TGConnectingPoint num="25" id="3627" />
-<TGConnectingPoint num="26" id="3628" />
-<TGConnectingPoint num="27" id="3629" />
-<TGConnectingPoint num="28" id="3630" />
-<TGConnectingPoint num="29" id="3631" />
-<TGConnectingPoint num="30" id="3632" />
-<TGConnectingPoint num="31" id="3633" />
-<TGConnectingPoint num="32" id="3634" />
-<TGConnectingPoint num="33" id="3635" />
-<TGConnectingPoint num="34" id="3636" />
-<TGConnectingPoint num="35" id="3637" />
-<TGConnectingPoint num="36" id="3638" />
-<TGConnectingPoint num="37" id="3639" />
-<TGConnectingPoint num="38" id="3640" />
-<TGConnectingPoint num="39" id="3641" />
-<extraparam>
-<blockType data="cryptoblock" color="-4072719" />
-<CryptoBlock value="true" />
-<Attribute access="0" id="m" 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)" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="3683" index="8" uid="42592ed6-4003-4841-9123-4b8f7c9bd357" >
-<father id="3724" num="1" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" 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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3643" />
-<TGConnectingPoint num="1" id="3644" />
-<TGConnectingPoint num="2" id="3645" />
-<TGConnectingPoint num="3" id="3646" />
-<TGConnectingPoint num="4" id="3647" />
-<TGConnectingPoint num="5" id="3648" />
-<TGConnectingPoint num="6" id="3649" />
-<TGConnectingPoint num="7" id="3650" />
-<TGConnectingPoint num="8" id="3651" />
-<TGConnectingPoint num="9" id="3652" />
-<TGConnectingPoint num="10" id="3653" />
-<TGConnectingPoint num="11" id="3654" />
-<TGConnectingPoint num="12" id="3655" />
-<TGConnectingPoint num="13" id="3656" />
-<TGConnectingPoint num="14" id="3657" />
-<TGConnectingPoint num="15" id="3658" />
-<TGConnectingPoint num="16" id="3659" />
-<TGConnectingPoint num="17" id="3660" />
-<TGConnectingPoint num="18" id="3661" />
-<TGConnectingPoint num="19" id="3662" />
-<TGConnectingPoint num="20" id="3663" />
-<TGConnectingPoint num="21" id="3664" />
-<TGConnectingPoint num="22" id="3665" />
-<TGConnectingPoint num="23" id="3666" />
-<TGConnectingPoint num="24" id="3667" />
-<TGConnectingPoint num="25" id="3668" />
-<TGConnectingPoint num="26" id="3669" />
-<TGConnectingPoint num="27" id="3670" />
-<TGConnectingPoint num="28" id="3671" />
-<TGConnectingPoint num="29" id="3672" />
-<TGConnectingPoint num="30" id="3673" />
-<TGConnectingPoint num="31" id="3674" />
-<TGConnectingPoint num="32" id="3675" />
-<TGConnectingPoint num="33" id="3676" />
-<TGConnectingPoint num="34" id="3677" />
-<TGConnectingPoint num="35" id="3678" />
-<TGConnectingPoint num="36" id="3679" />
-<TGConnectingPoint num="37" id="3680" />
-<TGConnectingPoint num="38" id="3681" />
-<TGConnectingPoint num="39" id="3682" />
-<extraparam>
-<blockType data="cryptoblock" color="-4072719" />
-<CryptoBlock value="true" />
-<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" />
-<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)" />
-<Method value="Message aencrypt(Message msg, Key k)" />
-<Method value="Message adecrypt(Message msg, Key k)" />
-<Method value="Key pk(Key k)" />
-<Method value="Message sign(Message msg, Key k)" />
-<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
-<Method value="Message cert(Key k, Message msg)" />
-<Method value="bool verifyCert(Message cert, Key k)" />
-<Method value="Key getpk(Message cert)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</AVATARBlockDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="5100" id="3726" index="0" uid="f1879d78-b04e-462d-ad35-51299e96625b" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3725" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="5102" id="3733" index="0" uid="3f7b38d9-1501-4f58-8af2-f8d165d2cb4c" >
-<cdparam x="407" y="310" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3732" />
-<P1 x="407" y="310" id="3836" />
-<P2 x="407" y="341" id="3763" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3731" index="11" uid="85999ee9-7e7c-4784-b841-b153822a02f2" >
-<father id="3733" num="0" />
-<cdparam x="449" y="353" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3727" />
-<TGConnectingPoint num="1" id="3728" />
-<TGConnectingPoint num="2" id="3729" />
-<TGConnectingPoint num="3" id="3730" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3740" index="1" uid="9ddd8eb6-9971-44e6-98d4-1764006d2b34" >
-<cdparam x="492" y="446" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3739" />
-<P1 x="407" y="391" id="3768" />
-<P2 x="413" y="423" id="3846" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3738" index="12" uid="5b6909f3-9955-4294-bc85-7ad0fc8ca091" >
-<father id="3740" num="0" />
-<cdparam x="449" y="440" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3734" />
-<TGConnectingPoint num="1" id="3735" />
-<TGConnectingPoint num="2" id="3736" />
-<TGConnectingPoint num="3" id="3737" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3747" index="2" uid="15e73877-bd36-4294-a2b7-6ab6231cea58" >
-<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 state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="3746" />
-<P1 x="406" y="229" id="3854" />
-<P2 x="407" y="280" id="3835" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3745" index="13" uid="aa9a77b4-41fb-45ca-beda-567198d149ff" >
-<father id="3747" num="0" />
-<cdparam x="407" y="291" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3741" />
-<TGConnectingPoint num="1" id="3742" />
-<TGConnectingPoint num="2" id="3743" />
-<TGConnectingPoint num="3" id="3744" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3754" index="3" uid="d1bf430c-339e-4d6d-8692-2f8d59c8dcac" >
-<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 state0" value="null" />
-<TGConnectingPoint num="0" id="3753" />
-<P1 x="407" y="132" id="3927" />
-<P2 x="406" y="189" id="3849" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3752" index="14" uid="37e28ea0-41dd-4155-9884-89dd30bd89a1" >
-<father id="3754" num="0" />
-<cdparam x="465" y="153" />
-<sizeparam width="144" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3748" />
-<TGConnectingPoint num="1" id="3749" />
-<TGConnectingPoint num="2" id="3750" />
-<TGConnectingPoint num="3" id="3751" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="m.data = secretData" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3761" index="4" uid="2b95b3a7-d966-4825-b69d-ca639d39f4a1" >
-<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="3760" />
-<P1 x="407" y="70" id="3994" />
-<P2 x="407" y="92" id="3922" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3759" index="15" uid="cd7e928d-fcfb-4bb6-92df-e77313f1c879" >
-<father id="3761" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3755" />
-<TGConnectingPoint num="1" id="3756" />
-<TGConnectingPoint num="2" id="3757" />
-<TGConnectingPoint num="3" id="3758" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5106" id="3834" index="5" uid="8731835d-8f41-4b39-917e-1e8e5bb8d14a" >
-<cdparam x="357" y="341" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="State" value="beforeFinish" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3762" />
-<TGConnectingPoint num="1" id="3763" />
-<TGConnectingPoint num="2" id="3764" />
-<TGConnectingPoint num="3" id="3765" />
-<TGConnectingPoint num="4" id="3766" />
-<TGConnectingPoint num="5" id="3767" />
-<TGConnectingPoint num="6" id="3768" />
-<TGConnectingPoint num="7" id="3769" />
-<TGConnectingPoint num="8" id="3770" />
-<TGConnectingPoint num="9" id="3771" />
-<TGConnectingPoint num="10" id="3772" />
-<TGConnectingPoint num="11" id="3773" />
-<TGConnectingPoint num="12" id="3774" />
-<TGConnectingPoint num="13" id="3775" />
-<TGConnectingPoint num="14" id="3776" />
-<TGConnectingPoint num="15" id="3777" />
-<TGConnectingPoint num="16" id="3778" />
-<TGConnectingPoint num="17" id="3779" />
-<TGConnectingPoint num="18" id="3780" />
-<TGConnectingPoint num="19" id="3781" />
-<TGConnectingPoint num="20" id="3782" />
-<TGConnectingPoint num="21" id="3783" />
-<TGConnectingPoint num="22" id="3784" />
-<TGConnectingPoint num="23" id="3785" />
-<TGConnectingPoint num="24" id="3786" />
-<TGConnectingPoint num="25" id="3787" />
-<TGConnectingPoint num="26" id="3788" />
-<TGConnectingPoint num="27" id="3789" />
-<TGConnectingPoint num="28" id="3790" />
-<TGConnectingPoint num="29" id="3791" />
-<TGConnectingPoint num="30" id="3792" />
-<TGConnectingPoint num="31" id="3793" />
-<TGConnectingPoint num="32" id="3794" />
-<TGConnectingPoint num="33" id="3795" />
-<TGConnectingPoint num="34" id="3796" />
-<TGConnectingPoint num="35" id="3797" />
-<TGConnectingPoint num="36" id="3798" />
-<TGConnectingPoint num="37" id="3799" />
-<TGConnectingPoint num="38" id="3800" />
-<TGConnectingPoint num="39" id="3801" />
-<TGConnectingPoint num="40" id="3802" />
-<TGConnectingPoint num="41" id="3803" />
-<TGConnectingPoint num="42" id="3804" />
-<TGConnectingPoint num="43" id="3805" />
-<TGConnectingPoint num="44" id="3806" />
-<TGConnectingPoint num="45" id="3807" />
-<TGConnectingPoint num="46" id="3808" />
-<TGConnectingPoint num="47" id="3809" />
-<TGConnectingPoint num="48" id="3810" />
-<TGConnectingPoint num="49" id="3811" />
-<TGConnectingPoint num="50" id="3812" />
-<TGConnectingPoint num="51" id="3813" />
-<TGConnectingPoint num="52" id="3814" />
-<TGConnectingPoint num="53" id="3815" />
-<TGConnectingPoint num="54" id="3816" />
-<TGConnectingPoint num="55" id="3817" />
-<TGConnectingPoint num="56" id="3818" />
-<TGConnectingPoint num="57" id="3819" />
-<TGConnectingPoint num="58" id="3820" />
-<TGConnectingPoint num="59" id="3821" />
-<TGConnectingPoint num="60" id="3822" />
-<TGConnectingPoint num="61" id="3823" />
-<TGConnectingPoint num="62" id="3824" />
-<TGConnectingPoint num="63" id="3825" />
-<TGConnectingPoint num="64" id="3826" />
-<TGConnectingPoint num="65" id="3827" />
-<TGConnectingPoint num="66" id="3828" />
-<TGConnectingPoint num="67" id="3829" />
-<TGConnectingPoint num="68" id="3830" />
-<TGConnectingPoint num="69" id="3831" />
-<TGConnectingPoint num="70" id="3832" />
-<TGConnectingPoint num="71" id="3833" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3845" index="6" uid="1e003ea2-8ffa-4132-8507-859453c4c28a" >
-<cdparam x="377" y="285" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m)" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3835" />
-<TGConnectingPoint num="1" id="3836" />
-<TGConnectingPoint num="2" id="3837" />
-<TGConnectingPoint num="3" id="3838" />
-<TGConnectingPoint num="4" id="3839" />
-<TGConnectingPoint num="5" id="3840" />
-<TGConnectingPoint num="6" id="3841" />
-<TGConnectingPoint num="7" id="3842" />
-<TGConnectingPoint num="8" id="3843" />
-<TGConnectingPoint num="9" id="3844" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="3847" index="7" uid="fa722005-45e9-4863-b541-e82c48fb8dc1" >
-<cdparam x="403" y="428" />
-<sizeparam width="20" height="20" minWidth="1" minHeight="1" 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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3846" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3920" index="8" uid="b0349b84-0ef7-4afe-90ea-835715a44dc0" >
-<cdparam x="335" y="189" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3848" />
-<TGConnectingPoint num="1" id="3849" />
-<TGConnectingPoint num="2" id="3850" />
-<TGConnectingPoint num="3" id="3851" />
-<TGConnectingPoint num="4" id="3852" />
-<TGConnectingPoint num="5" id="3853" />
-<TGConnectingPoint num="6" id="3854" />
-<TGConnectingPoint num="7" id="3855" />
-<TGConnectingPoint num="8" id="3856" />
-<TGConnectingPoint num="9" id="3857" />
-<TGConnectingPoint num="10" id="3858" />
-<TGConnectingPoint num="11" id="3859" />
-<TGConnectingPoint num="12" id="3860" />
-<TGConnectingPoint num="13" id="3861" />
-<TGConnectingPoint num="14" id="3862" />
-<TGConnectingPoint num="15" id="3863" />
-<TGConnectingPoint num="16" id="3864" />
-<TGConnectingPoint num="17" id="3865" />
-<TGConnectingPoint num="18" id="3866" />
-<TGConnectingPoint num="19" id="3867" />
-<TGConnectingPoint num="20" id="3868" />
-<TGConnectingPoint num="21" id="3869" />
-<TGConnectingPoint num="22" id="3870" />
-<TGConnectingPoint num="23" id="3871" />
-<TGConnectingPoint num="24" id="3872" />
-<TGConnectingPoint num="25" id="3873" />
-<TGConnectingPoint num="26" id="3874" />
-<TGConnectingPoint num="27" id="3875" />
-<TGConnectingPoint num="28" id="3876" />
-<TGConnectingPoint num="29" id="3877" />
-<TGConnectingPoint num="30" id="3878" />
-<TGConnectingPoint num="31" id="3879" />
-<TGConnectingPoint num="32" id="3880" />
-<TGConnectingPoint num="33" id="3881" />
-<TGConnectingPoint num="34" id="3882" />
-<TGConnectingPoint num="35" id="3883" />
-<TGConnectingPoint num="36" id="3884" />
-<TGConnectingPoint num="37" id="3885" />
-<TGConnectingPoint num="38" id="3886" />
-<TGConnectingPoint num="39" id="3887" />
-<TGConnectingPoint num="40" id="3888" />
-<TGConnectingPoint num="41" id="3889" />
-<TGConnectingPoint num="42" id="3890" />
-<TGConnectingPoint num="43" id="3891" />
-<TGConnectingPoint num="44" id="3892" />
-<TGConnectingPoint num="45" id="3893" />
-<TGConnectingPoint num="46" id="3894" />
-<TGConnectingPoint num="47" id="3895" />
-<TGConnectingPoint num="48" id="3896" />
-<TGConnectingPoint num="49" id="3897" />
-<TGConnectingPoint num="50" id="3898" />
-<TGConnectingPoint num="51" id="3899" />
-<TGConnectingPoint num="52" id="3900" />
-<TGConnectingPoint num="53" id="3901" />
-<TGConnectingPoint num="54" id="3902" />
-<TGConnectingPoint num="55" id="3903" />
-<TGConnectingPoint num="56" id="3904" />
-<TGConnectingPoint num="57" id="3905" />
-<TGConnectingPoint num="58" id="3906" />
-<TGConnectingPoint num="59" id="3907" />
-<TGConnectingPoint num="60" id="3908" />
-<TGConnectingPoint num="61" id="3909" />
-<TGConnectingPoint num="62" id="3910" />
-<TGConnectingPoint num="63" id="3911" />
-<TGConnectingPoint num="64" id="3912" />
-<TGConnectingPoint num="65" id="3913" />
-<TGConnectingPoint num="66" id="3914" />
-<TGConnectingPoint num="67" id="3915" />
-<TGConnectingPoint num="68" id="3916" />
-<TGConnectingPoint num="69" id="3917" />
-<TGConnectingPoint num="70" id="3918" />
-<TGConnectingPoint num="71" id="3919" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3993" index="9" uid="539aaad4-0201-4f5f-abae-2a13d21257fc" >
-<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" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3921" />
-<TGConnectingPoint num="1" id="3922" />
-<TGConnectingPoint num="2" id="3923" />
-<TGConnectingPoint num="3" id="3924" />
-<TGConnectingPoint num="4" id="3925" />
-<TGConnectingPoint num="5" id="3926" />
-<TGConnectingPoint num="6" id="3927" />
-<TGConnectingPoint num="7" id="3928" />
-<TGConnectingPoint num="8" id="3929" />
-<TGConnectingPoint num="9" id="3930" />
-<TGConnectingPoint num="10" id="3931" />
-<TGConnectingPoint num="11" id="3932" />
-<TGConnectingPoint num="12" id="3933" />
-<TGConnectingPoint num="13" id="3934" />
-<TGConnectingPoint num="14" id="3935" />
-<TGConnectingPoint num="15" id="3936" />
-<TGConnectingPoint num="16" id="3937" />
-<TGConnectingPoint num="17" id="3938" />
-<TGConnectingPoint num="18" id="3939" />
-<TGConnectingPoint num="19" id="3940" />
-<TGConnectingPoint num="20" id="3941" />
-<TGConnectingPoint num="21" id="3942" />
-<TGConnectingPoint num="22" id="3943" />
-<TGConnectingPoint num="23" id="3944" />
-<TGConnectingPoint num="24" id="3945" />
-<TGConnectingPoint num="25" id="3946" />
-<TGConnectingPoint num="26" id="3947" />
-<TGConnectingPoint num="27" id="3948" />
-<TGConnectingPoint num="28" id="3949" />
-<TGConnectingPoint num="29" id="3950" />
-<TGConnectingPoint num="30" id="3951" />
-<TGConnectingPoint num="31" id="3952" />
-<TGConnectingPoint num="32" id="3953" />
-<TGConnectingPoint num="33" id="3954" />
-<TGConnectingPoint num="34" id="3955" />
-<TGConnectingPoint num="35" id="3956" />
-<TGConnectingPoint num="36" id="3957" />
-<TGConnectingPoint num="37" id="3958" />
-<TGConnectingPoint num="38" id="3959" />
-<TGConnectingPoint num="39" id="3960" />
-<TGConnectingPoint num="40" id="3961" />
-<TGConnectingPoint num="41" id="3962" />
-<TGConnectingPoint num="42" id="3963" />
-<TGConnectingPoint num="43" id="3964" />
-<TGConnectingPoint num="44" id="3965" />
-<TGConnectingPoint num="45" id="3966" />
-<TGConnectingPoint num="46" id="3967" />
-<TGConnectingPoint num="47" id="3968" />
-<TGConnectingPoint num="48" id="3969" />
-<TGConnectingPoint num="49" id="3970" />
-<TGConnectingPoint num="50" id="3971" />
-<TGConnectingPoint num="51" id="3972" />
-<TGConnectingPoint num="52" id="3973" />
-<TGConnectingPoint num="53" id="3974" />
-<TGConnectingPoint num="54" id="3975" />
-<TGConnectingPoint num="55" id="3976" />
-<TGConnectingPoint num="56" id="3977" />
-<TGConnectingPoint num="57" id="3978" />
-<TGConnectingPoint num="58" id="3979" />
-<TGConnectingPoint num="59" id="3980" />
-<TGConnectingPoint num="60" id="3981" />
-<TGConnectingPoint num="61" id="3982" />
-<TGConnectingPoint num="62" id="3983" />
-<TGConnectingPoint num="63" id="3984" />
-<TGConnectingPoint num="64" id="3985" />
-<TGConnectingPoint num="65" id="3986" />
-<TGConnectingPoint num="66" id="3987" />
-<TGConnectingPoint num="67" id="3988" />
-<TGConnectingPoint num="68" id="3989" />
-<TGConnectingPoint num="69" id="3990" />
-<TGConnectingPoint num="70" id="3991" />
-<TGConnectingPoint num="71" id="3992" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3995" index="10" uid="101d4e83-4272-48f4-9117-6fb7b13011d3" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3994" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="5102" id="4002" index="0" uid="c5544de9-f340-4a18-b9ae-d5f727401aca" >
-<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="4001" />
-<P1 x="416" y="379" id="4030" />
-<P2 x="420" y="424" id="4098" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4000" index="9" uid="245e0701-2f1a-4723-b5a1-20cd02d28266" >
-<father id="4002" num="0" />
-<cdparam x="434" y="410" />
-<sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="3996" />
-<TGConnectingPoint num="1" id="3997" />
-<TGConnectingPoint num="2" id="3998" />
-<TGConnectingPoint num="3" id="3999" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="receivedData = m.data" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4009" index="1" uid="b1e4d5f5-9e06-4dff-ab63-2feac80311f2" >
-<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="4008" />
-<P1 x="406" y="201" id="4171" />
-<P2 x="416" y="339" id="4025" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4007" index="10" uid="d41acdd5-9798-4717-8781-3c0419b7a5c7" >
-<father id="4009" num="0" />
-<cdparam x="406" y="241" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4003" />
-<TGConnectingPoint num="1" id="4004" />
-<TGConnectingPoint num="2" id="4005" />
-<TGConnectingPoint num="3" id="4006" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4016" index="2" uid="024dbd87-f188-4a08-b290-ff4b3506cefd" >
-<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 Send signal" value="null" />
-<TGConnectingPoint num="0" id="4015" />
-<P1 x="406" y="141" id="4187" />
-<P2 x="406" y="171" id="4170" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4014" index="11" uid="5f96d8ea-ec9d-4745-81a4-84bc8df52821" >
-<father id="4016" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4010" />
-<TGConnectingPoint num="1" id="4011" />
-<TGConnectingPoint num="2" id="4012" />
-<TGConnectingPoint num="3" id="4013" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4023" index="3" uid="b1486a73-e834-4ccc-83b5-9d2753d20f76" >
-<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="4022" />
-<P1 x="407" y="70" id="4254" />
-<P2 x="406" y="101" id="4182" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4021" index="12" uid="658ff5ae-8b7f-4c05-93ee-8e73cac2855e" >
-<father id="4023" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4017" />
-<TGConnectingPoint num="1" id="4018" />
-<TGConnectingPoint num="2" id="4019" />
-<TGConnectingPoint num="3" id="4020" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<extraDelay1 value="" enabled="true"/>
-<extraDelay2 value="" enabled="true"/>
-<delayDistributionLaw value="0" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5106" id="4096" index="4" uid="c637d3d7-2909-42c8-b04a-42767a4de360" >
-<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" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4024" />
-<TGConnectingPoint num="1" id="4025" />
-<TGConnectingPoint num="2" id="4026" />
-<TGConnectingPoint num="3" id="4027" />
-<TGConnectingPoint num="4" id="4028" />
-<TGConnectingPoint num="5" id="4029" />
-<TGConnectingPoint num="6" id="4030" />
-<TGConnectingPoint num="7" id="4031" />
-<TGConnectingPoint num="8" id="4032" />
-<TGConnectingPoint num="9" id="4033" />
-<TGConnectingPoint num="10" id="4034" />
-<TGConnectingPoint num="11" id="4035" />
-<TGConnectingPoint num="12" id="4036" />
-<TGConnectingPoint num="13" id="4037" />
-<TGConnectingPoint num="14" id="4038" />
-<TGConnectingPoint num="15" id="4039" />
-<TGConnectingPoint num="16" id="4040" />
-<TGConnectingPoint num="17" id="4041" />
-<TGConnectingPoint num="18" id="4042" />
-<TGConnectingPoint num="19" id="4043" />
-<TGConnectingPoint num="20" id="4044" />
-<TGConnectingPoint num="21" id="4045" />
-<TGConnectingPoint num="22" id="4046" />
-<TGConnectingPoint num="23" id="4047" />
-<TGConnectingPoint num="24" id="4048" />
-<TGConnectingPoint num="25" id="4049" />
-<TGConnectingPoint num="26" id="4050" />
-<TGConnectingPoint num="27" id="4051" />
-<TGConnectingPoint num="28" id="4052" />
-<TGConnectingPoint num="29" id="4053" />
-<TGConnectingPoint num="30" id="4054" />
-<TGConnectingPoint num="31" id="4055" />
-<TGConnectingPoint num="32" id="4056" />
-<TGConnectingPoint num="33" id="4057" />
-<TGConnectingPoint num="34" id="4058" />
-<TGConnectingPoint num="35" id="4059" />
-<TGConnectingPoint num="36" id="4060" />
-<TGConnectingPoint num="37" id="4061" />
-<TGConnectingPoint num="38" id="4062" />
-<TGConnectingPoint num="39" id="4063" />
-<TGConnectingPoint num="40" id="4064" />
-<TGConnectingPoint num="41" id="4065" />
-<TGConnectingPoint num="42" id="4066" />
-<TGConnectingPoint num="43" id="4067" />
-<TGConnectingPoint num="44" id="4068" />
-<TGConnectingPoint num="45" id="4069" />
-<TGConnectingPoint num="46" id="4070" />
-<TGConnectingPoint num="47" id="4071" />
-<TGConnectingPoint num="48" id="4072" />
-<TGConnectingPoint num="49" id="4073" />
-<TGConnectingPoint num="50" id="4074" />
-<TGConnectingPoint num="51" id="4075" />
-<TGConnectingPoint num="52" id="4076" />
-<TGConnectingPoint num="53" id="4077" />
-<TGConnectingPoint num="54" id="4078" />
-<TGConnectingPoint num="55" id="4079" />
-<TGConnectingPoint num="56" id="4080" />
-<TGConnectingPoint num="57" id="4081" />
-<TGConnectingPoint num="58" id="4082" />
-<TGConnectingPoint num="59" id="4083" />
-<TGConnectingPoint num="60" id="4084" />
-<TGConnectingPoint num="61" id="4085" />
-<TGConnectingPoint num="62" id="4086" />
-<TGConnectingPoint num="63" id="4087" />
-<TGConnectingPoint num="64" id="4088" />
-<TGConnectingPoint num="65" id="4089" />
-<TGConnectingPoint num="66" id="4090" />
-<TGConnectingPoint num="67" id="4091" />
-<TGConnectingPoint num="68" id="4092" />
-<TGConnectingPoint num="69" id="4093" />
-<TGConnectingPoint num="70" id="4094" />
-<TGConnectingPoint num="71" id="4095" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4169" index="5" uid="4bbade53-0d15-4322-8b37-b9ada5dc59ab" >
-<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" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4097" />
-<TGConnectingPoint num="1" id="4098" />
-<TGConnectingPoint num="2" id="4099" />
-<TGConnectingPoint num="3" id="4100" />
-<TGConnectingPoint num="4" id="4101" />
-<TGConnectingPoint num="5" id="4102" />
-<TGConnectingPoint num="6" id="4103" />
-<TGConnectingPoint num="7" id="4104" />
-<TGConnectingPoint num="8" id="4105" />
-<TGConnectingPoint num="9" id="4106" />
-<TGConnectingPoint num="10" id="4107" />
-<TGConnectingPoint num="11" id="4108" />
-<TGConnectingPoint num="12" id="4109" />
-<TGConnectingPoint num="13" id="4110" />
-<TGConnectingPoint num="14" id="4111" />
-<TGConnectingPoint num="15" id="4112" />
-<TGConnectingPoint num="16" id="4113" />
-<TGConnectingPoint num="17" id="4114" />
-<TGConnectingPoint num="18" id="4115" />
-<TGConnectingPoint num="19" id="4116" />
-<TGConnectingPoint num="20" id="4117" />
-<TGConnectingPoint num="21" id="4118" />
-<TGConnectingPoint num="22" id="4119" />
-<TGConnectingPoint num="23" id="4120" />
-<TGConnectingPoint num="24" id="4121" />
-<TGConnectingPoint num="25" id="4122" />
-<TGConnectingPoint num="26" id="4123" />
-<TGConnectingPoint num="27" id="4124" />
-<TGConnectingPoint num="28" id="4125" />
-<TGConnectingPoint num="29" id="4126" />
-<TGConnectingPoint num="30" id="4127" />
-<TGConnectingPoint num="31" id="4128" />
-<TGConnectingPoint num="32" id="4129" />
-<TGConnectingPoint num="33" id="4130" />
-<TGConnectingPoint num="34" id="4131" />
-<TGConnectingPoint num="35" id="4132" />
-<TGConnectingPoint num="36" id="4133" />
-<TGConnectingPoint num="37" id="4134" />
-<TGConnectingPoint num="38" id="4135" />
-<TGConnectingPoint num="39" id="4136" />
-<TGConnectingPoint num="40" id="4137" />
-<TGConnectingPoint num="41" id="4138" />
-<TGConnectingPoint num="42" id="4139" />
-<TGConnectingPoint num="43" id="4140" />
-<TGConnectingPoint num="44" id="4141" />
-<TGConnectingPoint num="45" id="4142" />
-<TGConnectingPoint num="46" id="4143" />
-<TGConnectingPoint num="47" id="4144" />
-<TGConnectingPoint num="48" id="4145" />
-<TGConnectingPoint num="49" id="4146" />
-<TGConnectingPoint num="50" id="4147" />
-<TGConnectingPoint num="51" id="4148" />
-<TGConnectingPoint num="52" id="4149" />
-<TGConnectingPoint num="53" id="4150" />
-<TGConnectingPoint num="54" id="4151" />
-<TGConnectingPoint num="55" id="4152" />
-<TGConnectingPoint num="56" id="4153" />
-<TGConnectingPoint num="57" id="4154" />
-<TGConnectingPoint num="58" id="4155" />
-<TGConnectingPoint num="59" id="4156" />
-<TGConnectingPoint num="60" id="4157" />
-<TGConnectingPoint num="61" id="4158" />
-<TGConnectingPoint num="62" id="4159" />
-<TGConnectingPoint num="63" id="4160" />
-<TGConnectingPoint num="64" id="4161" />
-<TGConnectingPoint num="65" id="4162" />
-<TGConnectingPoint num="66" id="4163" />
-<TGConnectingPoint num="67" id="4164" />
-<TGConnectingPoint num="68" id="4165" />
-<TGConnectingPoint num="69" id="4166" />
-<TGConnectingPoint num="70" id="4167" />
-<TGConnectingPoint num="71" id="4168" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="4180" index="6" uid="2f9fe1da-e546-4a31-b6b4-ca56b3ec758c" >
-<cdparam x="376" y="176" />
-<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m)" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4170" />
-<TGConnectingPoint num="1" id="4171" />
-<TGConnectingPoint num="2" id="4172" />
-<TGConnectingPoint num="3" id="4173" />
-<TGConnectingPoint num="4" id="4174" />
-<TGConnectingPoint num="5" id="4175" />
-<TGConnectingPoint num="6" id="4176" />
-<TGConnectingPoint num="7" id="4177" />
-<TGConnectingPoint num="8" id="4178" />
-<TGConnectingPoint num="9" id="4179" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4253" index="7" uid="d9e2d1f7-fa1c-498c-9e02-ac9a8fc19e28" >
-<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" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4181" />
-<TGConnectingPoint num="1" id="4182" />
-<TGConnectingPoint num="2" id="4183" />
-<TGConnectingPoint num="3" id="4184" />
-<TGConnectingPoint num="4" id="4185" />
-<TGConnectingPoint num="5" id="4186" />
-<TGConnectingPoint num="6" id="4187" />
-<TGConnectingPoint num="7" id="4188" />
-<TGConnectingPoint num="8" id="4189" />
-<TGConnectingPoint num="9" id="4190" />
-<TGConnectingPoint num="10" id="4191" />
-<TGConnectingPoint num="11" id="4192" />
-<TGConnectingPoint num="12" id="4193" />
-<TGConnectingPoint num="13" id="4194" />
-<TGConnectingPoint num="14" id="4195" />
-<TGConnectingPoint num="15" id="4196" />
-<TGConnectingPoint num="16" id="4197" />
-<TGConnectingPoint num="17" id="4198" />
-<TGConnectingPoint num="18" id="4199" />
-<TGConnectingPoint num="19" id="4200" />
-<TGConnectingPoint num="20" id="4201" />
-<TGConnectingPoint num="21" id="4202" />
-<TGConnectingPoint num="22" id="4203" />
-<TGConnectingPoint num="23" id="4204" />
-<TGConnectingPoint num="24" id="4205" />
-<TGConnectingPoint num="25" id="4206" />
-<TGConnectingPoint num="26" id="4207" />
-<TGConnectingPoint num="27" id="4208" />
-<TGConnectingPoint num="28" id="4209" />
-<TGConnectingPoint num="29" id="4210" />
-<TGConnectingPoint num="30" id="4211" />
-<TGConnectingPoint num="31" id="4212" />
-<TGConnectingPoint num="32" id="4213" />
-<TGConnectingPoint num="33" id="4214" />
-<TGConnectingPoint num="34" id="4215" />
-<TGConnectingPoint num="35" id="4216" />
-<TGConnectingPoint num="36" id="4217" />
-<TGConnectingPoint num="37" id="4218" />
-<TGConnectingPoint num="38" id="4219" />
-<TGConnectingPoint num="39" id="4220" />
-<TGConnectingPoint num="40" id="4221" />
-<TGConnectingPoint num="41" id="4222" />
-<TGConnectingPoint num="42" id="4223" />
-<TGConnectingPoint num="43" id="4224" />
-<TGConnectingPoint num="44" id="4225" />
-<TGConnectingPoint num="45" id="4226" />
-<TGConnectingPoint num="46" id="4227" />
-<TGConnectingPoint num="47" id="4228" />
-<TGConnectingPoint num="48" id="4229" />
-<TGConnectingPoint num="49" id="4230" />
-<TGConnectingPoint num="50" id="4231" />
-<TGConnectingPoint num="51" id="4232" />
-<TGConnectingPoint num="52" id="4233" />
-<TGConnectingPoint num="53" id="4234" />
-<TGConnectingPoint num="54" id="4235" />
-<TGConnectingPoint num="55" id="4236" />
-<TGConnectingPoint num="56" id="4237" />
-<TGConnectingPoint num="57" id="4238" />
-<TGConnectingPoint num="58" id="4239" />
-<TGConnectingPoint num="59" id="4240" />
-<TGConnectingPoint num="60" id="4241" />
-<TGConnectingPoint num="61" id="4242" />
-<TGConnectingPoint num="62" id="4243" />
-<TGConnectingPoint num="63" id="4244" />
-<TGConnectingPoint num="64" id="4245" />
-<TGConnectingPoint num="65" id="4246" />
-<TGConnectingPoint num="66" id="4247" />
-<TGConnectingPoint num="67" id="4248" />
-<TGConnectingPoint num="68" id="4249" />
-<TGConnectingPoint num="69" id="4250" />
-<TGConnectingPoint num="70" id="4251" />
-<TGConnectingPoint num="71" id="4252" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="4255" index="8" uid="24a59166-6e8a-4850-abde-8f8cac5a5410" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4254" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="AVATAR Design" nameTab="Example_NoSec_cloned" tabs="Block Diagram$System$Alice$Bob" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<MainCode value="void __user_init() {"/>
-<MainCode value="}"/>
-<Optimized value="true" />
-<considerTimingOperators value="true" />
-<Validated value="" />
-<Ignored value="" />
-
-<CONNECTOR type="5002" id="4261" index="0" uid="5e9ea5bc-0eac-45c7-b468-24e6f5a65e1f" >
-<cdparam x="568" y="220" />
-<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="" />
-<TGConnectingPoint num="0" id="4258" />
-<TGConnectingPoint num="1" id="4259" />
-<TGConnectingPoint num="2" id="4260" />
-<P1 x="459" y="199" id="4390" />
-<P2 x="459" y="254" id="4383" />
-<Point x="490" y="199" />
-<Point x="490" y="254" />
-<AutomaticDrawing data="true" />
-<new d="false" />
-<extraparam>
-<iso value="in chin(Message msg)" />
-<osd value="out chout(Message msg)" />
-<FIFOType asynchronous="false" synchronousCH="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
-</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="4256" index="5" uid="c8213529-738a-46d4-bbf7-ea9e24c11f5a" >
-<father id="4261" num="0" />
-<cdparam x="490" y="199" />
-<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-<new d="false" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4257" index="6" uid="2c2224b4-6c04-4d47-a0d9-466f88f4d68a" >
-<father id="4261" num="1" />
-<cdparam x="490" y="254" />
-<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-<new d="false" />
-</SUBCOMPONENT>
-
-<COMPONENT type="302" id="4278" index="1" uid="029b1805-5bd8-44cc-9fbd-9dfae02d8e94" >
-<cdparam x="535" y="149" />
-<sizeparam width="420" height="66" 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="#Confidentiality Alice.secretData
-#Authenticity Alice.sendingMessage.m Bob.messageDecrypted.m
-" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4262" />
-<TGConnectingPoint num="1" id="4263" />
-<TGConnectingPoint num="2" id="4264" />
-<TGConnectingPoint num="3" id="4265" />
-<TGConnectingPoint num="4" id="4266" />
-<TGConnectingPoint num="5" id="4267" />
-<TGConnectingPoint num="6" id="4268" />
-<TGConnectingPoint num="7" id="4269" />
-<TGConnectingPoint num="8" id="4270" />
-<TGConnectingPoint num="9" id="4271" />
-<TGConnectingPoint num="10" id="4272" />
-<TGConnectingPoint num="11" id="4273" />
-<TGConnectingPoint num="12" id="4274" />
-<TGConnectingPoint num="13" id="4275" />
-<TGConnectingPoint num="14" id="4276" />
-<TGConnectingPoint num="15" id="4277" />
-<extraparam>
-<Line value="#Confidentiality Alice.secretData" />
-<Line value="#Authenticity Alice.sendingMessage.m Bob.messageDecrypted.m" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="4287" index="2" uid="6ff09061-6050-477e-9429-0ca0a94d0652" >
-<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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4279" />
-<TGConnectingPoint num="1" id="4280" />
-<TGConnectingPoint num="2" id="4281" />
-<TGConnectingPoint num="3" id="4282" />
-<TGConnectingPoint num="4" id="4283" />
-<TGConnectingPoint num="5" id="4284" />
-<TGConnectingPoint num="6" id="4285" />
-<TGConnectingPoint num="7" id="4286" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="4296" index="3" uid="abad1e2f-9763-48d1-b6fe-911c3f0c6cd6" >
-<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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4288" />
-<TGConnectingPoint num="1" id="4289" />
-<TGConnectingPoint num="2" id="4290" />
-<TGConnectingPoint num="3" id="4291" />
-<TGConnectingPoint num="4" id="4292" />
-<TGConnectingPoint num="5" id="4293" />
-<TGConnectingPoint num="6" id="4294" />
-<TGConnectingPoint num="7" id="4295" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5000" id="4419" index="4" uid="a468054d-8335-41ee-8174-1e236a68c252" >
-<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" />
-<new d="false" />
-<TGConnectingPoint num="0" id="4379" />
-<TGConnectingPoint num="1" id="4380" />
-<TGConnectingPoint num="2" id="4381" />
-<TGConnectingPoint num="3" id="4382" />
-<TGConnectingPoint num="4" id="4383" />
-<TGConnectingPoint num="5" id="4384" />
-<TGConnectingPoint num="6" id="4385" />
-<TGConnectingPoint num="7" id="4386" />
-<TGConnectingPoint num="8" id="4387" />
-<TGConnectingPoint num="9" id="4388" />
-<TGConnectingPoint num="10" id="4389" />
-<TGConnectingPoint num="11" id="4390" />
-<TGConnectingPoint num="12" id="4391" />
-<TGConnectingPoint num="13" id="4392" />
-<TGConnectingPoint num="14" id="4393" />
-<TGConnectingPoint num="15" id="4394" />
-<TGConnectingPoint num="16" id="4395" />
-<TGConnectingPoint num="17" id="4396" />
-<TGConnectingPoint num="18" id="4397" />
-<TGConnectingPoint num="19" id="4398" />
-<TGConnectingPoint num="20" id="4399" />
-<TGConnectingPoint num="21" id="4400" />
-<TGConnectingPoint num="22" id="4401" />
-<TGConnectingPoint num="23" id="4402" />
-<TGConnectingPoint num="24" id="4403" />
-<TGConnectingPoint num="25" id="4404" />
-<TGConnectingPoint num="26" id="4405" />
-<TGConnectingPoint num="27" id="4406" />
-<TGConnectingPoint num="28" id="4407" />
-<TGConnectingPoint num="29" id="4408" />
-<TGConnectingPoint num="30" id="4409" />
-<TGConnectingPoint num="31" id="4410" />
-<TGConnectingPoint num="32" id="4411" />
-<TGConnectingPoint num="33" id="4412" />
-<TGConnectingPoint num="34" id="4413" />
-<TGConnectingPoint num="35" id="4414" />
-<TGConnectingPoint num="36" id="4415" />
-<TGConnectingPoint num="37" id="4416" />
-<TGConnectingPoint num="38" id="4417" />
-<TGConnectingPoint num="39" id="4418" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" attached="true" />
-<Signal value="out chout(Message msg)" attached="true" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5000" id="4337" index="7" uid="58e32c17-1811-4588-ab32-863569a17a48" >
+<SUBCOMPONENT type="5000" id="4337" index="7" uid="7bb99390-2a74-452a-8601-e344bd028850" >
<father id="4419" num="0" />
-<cdparam x="36" y="233" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="263" y="233" />
+<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" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
<new d="false" />
<TGConnectingPoint num="0" id="4297" />
<TGConnectingPoint num="1" id="4298" />
@@ -8026,8 +6773,8 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<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)" />
@@ -8052,13 +6799,13 @@
<Method value="Message hash(Message msg)" />
</extraparam>
</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4378" index="8" uid="7bb99390-2a74-452a-8601-e344bd028850" >
+<SUBCOMPONENT type="5000" id="4378" index="8" uid="58e32c17-1811-4588-ab32-863569a17a48" >
<father id="4419" num="1" />
-<cdparam x="263" y="233" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="36" y="233" />
+<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" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="Alice" />
<new d="false" />
<TGConnectingPoint num="0" id="4338" />
<TGConnectingPoint num="1" id="4339" />
@@ -8103,8 +6850,8 @@
<extraparam>
<blockType data="cryptoblock" color="-4072719" />
<CryptoBlock value="true" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<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)" />
diff --git a/src/main/java/avatartranslator/AvatarSyntaxChecker.java b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
index c031caa2905bc957d4ff53aa3cde439912d965f8..ffe8825b2e3755a3250c0c1ebbfce738f278a334 100644
--- a/src/main/java/avatartranslator/AvatarSyntaxChecker.java
+++ b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
@@ -140,7 +140,7 @@ public class AvatarSyntaxChecker {
ArrayList<AvatarError> warnings = new ArrayList<>();
// Checking block name
- TraceManager.addDev("Checking name: " + _ne.getName());
+ //TraceManager.addDev("Checking name: " + _ne.getName());
if (_ne instanceof NameChecker.NameStartWithUpperCase) {
if (!NameChecker.checkName(_ne)) {
newError(_avspec, warnings, (AvatarElement) _ne, null, FIRST_UPPER_CASE);
diff --git a/src/main/java/myutil/NameChecker.java b/src/main/java/myutil/NameChecker.java
index a3b2609e5f0f235c6dbab6ef529fd61863aa9524..89262ef40388fe92f1a0063532900be9c72d0e52 100644
--- a/src/main/java/myutil/NameChecker.java
+++ b/src/main/java/myutil/NameChecker.java
@@ -53,19 +53,19 @@ import java.util.List;
public class NameChecker {
public static boolean checkName(NamedElement _ne) {
if (_ne instanceof NameStartWithUpperCase) {
- TraceManager.addDev("Must start with upper case or exception");
+ //TraceManager.addDev("Must start with upper case or exception");
return Conversion.startsWithUpperCase(_ne.getName()) || inException(_ne);
} else if (_ne instanceof NameStartWithLowerCase) {
- TraceManager.addDev("Must start with lower case or exception");
+ //TraceManager.addDev("Must start with lower case or exception");
return Conversion.startsWithLowerCase(_ne.getName()) || inException(_ne);
}
- TraceManager.addDev("Not concerned");
+ //TraceManager.addDev("Not concerned");
return true;
}
public static boolean inException(NamedElement _ne) {
- TraceManager.addDev("Working on exception");
+ //TraceManager.addDev("Working on exception");
String[] exceptions = _ne.getNameExceptions();
if (exceptions == null) {
TraceManager.addDev("Null excep");
@@ -73,11 +73,11 @@ public class NameChecker {
}
for(int i=0; i<exceptions.length; i++) {
if (exceptions[i].equals(_ne.getName())) {
- TraceManager.addDev("Found exception");
+ //TraceManager.addDev("Found exception");
return true;
}
}
- TraceManager.addDev("No exception found");
+ //TraceManager.addDev("No exception found");
return false;
}
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 29dd5f2058a0b322bbb3470fbffed7bc3662bbe0..b4c913f203469967d8fcb6ea63a4128102523944 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -1882,9 +1882,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
Date date = new Date();
String dateAndTime = dateFormat.format(date);
String tabName = "Design_" + dateAndTime;
+ TraceManager.addDev("Drawing Avatar Spec in " + tabName);
TraceManager.addDev("Draw Spec 1");
int index = createAvatarDesign(tabName);
- TraceManager.addDev("Draw Spec 2");
+ TraceManager.addDev("Draw Spec 2, in tab index=" + index);
AvatarDesignPanel adp = (AvatarDesignPanel) (tabs.elementAt(index));
TraceManager.addDev("Draw Spec 3");
gtm.drawPanel(av, adp);
diff --git a/src/main/java/ui/avatarbd/AvatarBDPragma.java b/src/main/java/ui/avatarbd/AvatarBDPragma.java
index ba3e1d16d1cfe34734a1e23a04e8c4ace5e4146c..1d8dbf7d660aed93ce445bfed270d6e1ec2cc40a 100755
--- a/src/main/java/ui/avatarbd/AvatarBDPragma.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPragma.java
@@ -382,7 +382,7 @@ public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
String oldValue = value;
JDialogPragma jdn = new JDialogPragma(frame, "Setting the security pragmas", value);
- //jdn.setLocation(200, 150);
+ jdn.setSize(500, 700);
AvatarBDPanel abdp = (AvatarBDPanel) tdp;
jdn.blockAttributeMap = abdp.getBlockStrings(true, false, false);
jdn.blockStateMap = abdp.getBlockStrings(false, true, false);