diff --git a/AliceAndBob.xml~ b/AliceAndBob.xml~
deleted file mode 100644
index 4364c4a8cf0bcd2ea866d60fc895cdc84c162250..0000000000000000000000000000000000000000
--- a/AliceAndBob.xml~
+++ /dev/null
@@ -1,900 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<TURTLEGMODELING version="0.98-beta3">
-
-<Modeling type="AVATAR Design" nameTab="Example" >
-<AVATARBlockDiagramPanel name="AVATAR Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
-<MainCode value="void __user_init() {"/>
-<MainCode value="}"/>
-<Optimized value="true" />
-<Validated value="System;Bob;Alice;" />
-<Ignored value="" />
-
-<CONNECTOR type="5002" id="6" >
-<cdparam x="568" y="220" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="3" />
-<TGConnectingPoint num="1" id="4" />
-<TGConnectingPoint num="2" id="5" />
-<P1 x="459" y="199" id="95" />
-<P2 x="459" y="254" id="88" />
-<Point x="490" y="199" />
-<Point x="490" y="254" />
-<AutomaticDrawing data="true" />
-<extraparam>
-<iso value="in chin(Message msg)" />
-<osd value="out chout(Message msg)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="false" broadcast="false" lossy="false" />
-</extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="1" >
-<father id="6" num="0" />
-<cdparam x="490" y="199" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2" >
-<father id="6" num="1" />
-<cdparam x="490" y="254" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
-<COMPONENT type="301" id="15" >
-<cdparam x="40" y="64" />
-<sizeparam width="492" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="#InitialSessionKnowledge Alice.sk Bob.sk Bob.blb
-
-#Confidentiality Alice.secretData
-#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2
-" />
-<TGConnectingPoint num="0" id="7" />
-<TGConnectingPoint num="1" id="8" />
-<TGConnectingPoint num="2" id="9" />
-<TGConnectingPoint num="3" id="10" />
-<TGConnectingPoint num="4" id="11" />
-<TGConnectingPoint num="5" id="12" />
-<TGConnectingPoint num="6" id="13" />
-<TGConnectingPoint num="7" id="14" />
-<extraparam>
-<Line value="#InitialSessionKnowledge Alice.sk Bob.sk Bob.blb" />
-<Line value="" />
-<Line value="#Confidentiality Alice.secretData" />
-<Line value="#Authenticity Alice.sendingMessage.m1 Bob.messageDecrypted.m2" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="24" >
-<cdparam x="260" y="373" />
-<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Message" />
-<TGConnectingPoint num="0" id="16" />
-<TGConnectingPoint num="1" id="17" />
-<TGConnectingPoint num="2" id="18" />
-<TGConnectingPoint num="3" id="19" />
-<TGConnectingPoint num="4" id="20" />
-<TGConnectingPoint num="5" id="21" />
-<TGConnectingPoint num="6" id="22" />
-<TGConnectingPoint num="7" id="23" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="33" >
-<cdparam x="68" y="372" />
-<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="DataType0" value="Key" />
-<TGConnectingPoint num="0" id="25" />
-<TGConnectingPoint num="1" id="26" />
-<TGConnectingPoint num="2" id="27" />
-<TGConnectingPoint num="3" id="28" />
-<TGConnectingPoint num="4" id="29" />
-<TGConnectingPoint num="5" id="30" />
-<TGConnectingPoint num="6" id="31" />
-<TGConnectingPoint num="7" id="32" />
-<extraparam>
-<Attribute access="0" id="data" value="" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5000" id="108" >
-<cdparam x="21" y="145" />
-<sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="System" />
-<TGConnectingPoint num="0" id="84" />
-<TGConnectingPoint num="1" id="85" />
-<TGConnectingPoint num="2" id="86" />
-<TGConnectingPoint num="3" id="87" />
-<TGConnectingPoint num="4" id="88" />
-<TGConnectingPoint num="5" id="89" />
-<TGConnectingPoint num="6" id="90" />
-<TGConnectingPoint num="7" id="91" />
-<TGConnectingPoint num="8" id="92" />
-<TGConnectingPoint num="9" id="93" />
-<TGConnectingPoint num="10" id="94" />
-<TGConnectingPoint num="11" id="95" />
-<TGConnectingPoint num="12" id="96" />
-<TGConnectingPoint num="13" id="97" />
-<TGConnectingPoint num="14" id="98" />
-<TGConnectingPoint num="15" id="99" />
-<TGConnectingPoint num="16" id="100" />
-<TGConnectingPoint num="17" id="101" />
-<TGConnectingPoint num="18" id="102" />
-<TGConnectingPoint num="19" id="103" />
-<TGConnectingPoint num="20" id="104" />
-<TGConnectingPoint num="21" id="105" />
-<TGConnectingPoint num="22" id="106" />
-<TGConnectingPoint num="23" id="107" />
-<extraparam>
-<CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5000" id="58" >
-<father id="108" num="0" />
-<cdparam x="257" y="214" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
-<TGConnectingPoint num="0" id="34" />
-<TGConnectingPoint num="1" id="35" />
-<TGConnectingPoint num="2" id="36" />
-<TGConnectingPoint num="3" id="37" />
-<TGConnectingPoint num="4" id="38" />
-<TGConnectingPoint num="5" id="39" />
-<TGConnectingPoint num="6" id="40" />
-<TGConnectingPoint num="7" id="41" />
-<TGConnectingPoint num="8" id="42" />
-<TGConnectingPoint num="9" id="43" />
-<TGConnectingPoint num="10" id="44" />
-<TGConnectingPoint num="11" id="45" />
-<TGConnectingPoint num="12" id="46" />
-<TGConnectingPoint num="13" id="47" />
-<TGConnectingPoint num="14" id="48" />
-<TGConnectingPoint num="15" id="49" />
-<TGConnectingPoint num="16" id="50" />
-<TGConnectingPoint num="17" id="51" />
-<TGConnectingPoint num="18" id="52" />
-<TGConnectingPoint num="19" id="53" />
-<TGConnectingPoint num="20" id="54" />
-<TGConnectingPoint num="21" id="55" />
-<TGConnectingPoint num="22" id="56" />
-<TGConnectingPoint num="23" id="57" />
-<extraparam>
-<CryptoBlock value="false" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="83" >
-<father id="108" num="1" />
-<cdparam x="30" y="213" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="Alice" />
-<TGConnectingPoint num="0" id="59" />
-<TGConnectingPoint num="1" id="60" />
-<TGConnectingPoint num="2" id="61" />
-<TGConnectingPoint num="3" id="62" />
-<TGConnectingPoint num="4" id="63" />
-<TGConnectingPoint num="5" id="64" />
-<TGConnectingPoint num="6" id="65" />
-<TGConnectingPoint num="7" id="66" />
-<TGConnectingPoint num="8" id="67" />
-<TGConnectingPoint num="9" id="68" />
-<TGConnectingPoint num="10" id="69" />
-<TGConnectingPoint num="11" id="70" />
-<TGConnectingPoint num="12" id="71" />
-<TGConnectingPoint num="13" id="72" />
-<TGConnectingPoint num="14" id="73" />
-<TGConnectingPoint num="15" id="74" />
-<TGConnectingPoint num="16" id="75" />
-<TGConnectingPoint num="17" id="76" />
-<TGConnectingPoint num="18" id="77" />
-<TGConnectingPoint num="19" id="78" />
-<TGConnectingPoint num="20" id="79" />
-<TGConnectingPoint num="21" id="80" />
-<TGConnectingPoint num="22" id="81" />
-<TGConnectingPoint num="23" id="82" />
-<extraparam>
-<CryptoBlock value="false" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="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)" />
-</extraparam>
-</SUBCOMPONENT>
-
-
-</AVATARBlockDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="5100" id="110" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="109" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="117" >
-<cdparam x="407" y="310" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="116" />
-<P1 x="407" y="310" id="140" />
-<P2 x="408" y="341" id="150" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="115" >
-<father id="117" num="0" />
-<cdparam x="407" y="350" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="111" />
-<TGConnectingPoint num="1" id="112" />
-<TGConnectingPoint num="2" id="113" />
-<TGConnectingPoint num="3" id="114" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="124" >
-<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="123" />
-<P1 x="407" y="251" id="158" />
-<P2 x="407" y="280" id="139" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="122" >
-<father id="124" num="0" />
-<cdparam x="407" y="291" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="118" />
-<TGConnectingPoint num="1" id="119" />
-<TGConnectingPoint num="2" id="120" />
-<TGConnectingPoint num="3" id="121" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="131" >
-<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="130" />
-<P1 x="407" y="132" id="199" />
-<P2 x="407" y="211" id="153" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="129" >
-<father id="131" num="0" />
-<cdparam x="415" y="162" />
-<sizeparam width="132" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="125" />
-<TGConnectingPoint num="1" id="126" />
-<TGConnectingPoint num="2" id="127" />
-<TGConnectingPoint num="3" id="128" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="m.data = secretData" />
-<actions value="sencrypt(m, sk)" />
-<filesToIncludeLine value="" />
-<codeToIncludeLine value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="138" >
-<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="137" />
-<P1 x="407" y="70" id="234" />
-<P2 x="407" y="92" id="194" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="136" >
-<father id="138" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="132" />
-<TGConnectingPoint num="1" id="133" />
-<TGConnectingPoint num="2" id="134" />
-<TGConnectingPoint num="3" id="135" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5103" id="149" >
-<cdparam x="370" y="285" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="139" />
-<TGConnectingPoint num="1" id="140" />
-<TGConnectingPoint num="2" id="141" />
-<TGConnectingPoint num="3" id="142" />
-<TGConnectingPoint num="4" id="143" />
-<TGConnectingPoint num="5" id="144" />
-<TGConnectingPoint num="6" id="145" />
-<TGConnectingPoint num="7" id="146" />
-<TGConnectingPoint num="8" id="147" />
-<TGConnectingPoint num="9" id="148" />
-</COMPONENT>
-
-<COMPONENT type="5101" id="151" >
-<cdparam x="398" y="346" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="150" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="192" >
-<cdparam x="336" y="211" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="152" />
-<TGConnectingPoint num="1" id="153" />
-<TGConnectingPoint num="2" id="154" />
-<TGConnectingPoint num="3" id="155" />
-<TGConnectingPoint num="4" id="156" />
-<TGConnectingPoint num="5" id="157" />
-<TGConnectingPoint num="6" id="158" />
-<TGConnectingPoint num="7" id="159" />
-<TGConnectingPoint num="8" id="160" />
-<TGConnectingPoint num="9" id="161" />
-<TGConnectingPoint num="10" id="162" />
-<TGConnectingPoint num="11" id="163" />
-<TGConnectingPoint num="12" id="164" />
-<TGConnectingPoint num="13" id="165" />
-<TGConnectingPoint num="14" id="166" />
-<TGConnectingPoint num="15" id="167" />
-<TGConnectingPoint num="16" id="168" />
-<TGConnectingPoint num="17" id="169" />
-<TGConnectingPoint num="18" id="170" />
-<TGConnectingPoint num="19" id="171" />
-<TGConnectingPoint num="20" id="172" />
-<TGConnectingPoint num="21" id="173" />
-<TGConnectingPoint num="22" id="174" />
-<TGConnectingPoint num="23" id="175" />
-<TGConnectingPoint num="24" id="176" />
-<TGConnectingPoint num="25" id="177" />
-<TGConnectingPoint num="26" id="178" />
-<TGConnectingPoint num="27" id="179" />
-<TGConnectingPoint num="28" id="180" />
-<TGConnectingPoint num="29" id="181" />
-<TGConnectingPoint num="30" id="182" />
-<TGConnectingPoint num="31" id="183" />
-<TGConnectingPoint num="32" id="184" />
-<TGConnectingPoint num="33" id="185" />
-<TGConnectingPoint num="34" id="186" />
-<TGConnectingPoint num="35" id="187" />
-<TGConnectingPoint num="36" id="188" />
-<TGConnectingPoint num="37" id="189" />
-<TGConnectingPoint num="38" id="190" />
-<TGConnectingPoint num="39" id="191" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="233" >
-<cdparam x="340" y="92" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="193" />
-<TGConnectingPoint num="1" id="194" />
-<TGConnectingPoint num="2" id="195" />
-<TGConnectingPoint num="3" id="196" />
-<TGConnectingPoint num="4" id="197" />
-<TGConnectingPoint num="5" id="198" />
-<TGConnectingPoint num="6" id="199" />
-<TGConnectingPoint num="7" id="200" />
-<TGConnectingPoint num="8" id="201" />
-<TGConnectingPoint num="9" id="202" />
-<TGConnectingPoint num="10" id="203" />
-<TGConnectingPoint num="11" id="204" />
-<TGConnectingPoint num="12" id="205" />
-<TGConnectingPoint num="13" id="206" />
-<TGConnectingPoint num="14" id="207" />
-<TGConnectingPoint num="15" id="208" />
-<TGConnectingPoint num="16" id="209" />
-<TGConnectingPoint num="17" id="210" />
-<TGConnectingPoint num="18" id="211" />
-<TGConnectingPoint num="19" id="212" />
-<TGConnectingPoint num="20" id="213" />
-<TGConnectingPoint num="21" id="214" />
-<TGConnectingPoint num="22" id="215" />
-<TGConnectingPoint num="23" id="216" />
-<TGConnectingPoint num="24" id="217" />
-<TGConnectingPoint num="25" id="218" />
-<TGConnectingPoint num="26" id="219" />
-<TGConnectingPoint num="27" id="220" />
-<TGConnectingPoint num="28" id="221" />
-<TGConnectingPoint num="29" id="222" />
-<TGConnectingPoint num="30" id="223" />
-<TGConnectingPoint num="31" id="224" />
-<TGConnectingPoint num="32" id="225" />
-<TGConnectingPoint num="33" id="226" />
-<TGConnectingPoint num="34" id="227" />
-<TGConnectingPoint num="35" id="228" />
-<TGConnectingPoint num="36" id="229" />
-<TGConnectingPoint num="37" id="230" />
-<TGConnectingPoint num="38" id="231" />
-<TGConnectingPoint num="39" id="232" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="235" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="234" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="242" >
-<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="241" />
-<P1 x="416" y="379" id="277" />
-<P2 x="420" y="424" id="313" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="240" >
-<father id="242" num="0" />
-<cdparam x="431" y="403" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="236" />
-<TGConnectingPoint num="1" id="237" />
-<TGConnectingPoint num="2" id="238" />
-<TGConnectingPoint num="3" id="239" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="receivedData = m.data" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="249" >
-<cdparam x="407" y="273" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="248" />
-<P1 x="407" y="273" id="359" />
-<P2 x="416" y="339" id="272" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="247" >
-<father id="249" num="0" />
-<cdparam x="419" y="312" />
-<sizeparam width="134" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="243" />
-<TGConnectingPoint num="1" id="244" />
-<TGConnectingPoint num="2" id="245" />
-<TGConnectingPoint num="3" id="246" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="m = sdecrypt(m2, sk)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="256" >
-<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="255" />
-<P1 x="406" y="201" id="395" />
-<P2 x="407" y="233" id="354" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="254" >
-<father id="256" num="0" />
-<cdparam x="406" y="241" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="250" />
-<TGConnectingPoint num="1" id="251" />
-<TGConnectingPoint num="2" id="252" />
-<TGConnectingPoint num="3" id="253" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="263" >
-<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="262" />
-<P1 x="406" y="141" id="411" />
-<P2 x="406" y="171" id="394" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="261" >
-<father id="263" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="257" />
-<TGConnectingPoint num="1" id="258" />
-<TGConnectingPoint num="2" id="259" />
-<TGConnectingPoint num="3" id="260" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="270" >
-<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="269" />
-<P1 x="407" y="70" id="446" />
-<P2 x="406" y="101" id="406" />
-<AutomaticDrawing data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="268" >
-<father id="270" num="0" />
-<cdparam x="407" y="110" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="264" />
-<TGConnectingPoint num="1" id="265" />
-<TGConnectingPoint num="2" id="266" />
-<TGConnectingPoint num="3" id="267" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5106" id="311" >
-<cdparam x="327" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="271" />
-<TGConnectingPoint num="1" id="272" />
-<TGConnectingPoint num="2" id="273" />
-<TGConnectingPoint num="3" id="274" />
-<TGConnectingPoint num="4" id="275" />
-<TGConnectingPoint num="5" id="276" />
-<TGConnectingPoint num="6" id="277" />
-<TGConnectingPoint num="7" id="278" />
-<TGConnectingPoint num="8" id="279" />
-<TGConnectingPoint num="9" id="280" />
-<TGConnectingPoint num="10" id="281" />
-<TGConnectingPoint num="11" id="282" />
-<TGConnectingPoint num="12" id="283" />
-<TGConnectingPoint num="13" id="284" />
-<TGConnectingPoint num="14" id="285" />
-<TGConnectingPoint num="15" id="286" />
-<TGConnectingPoint num="16" id="287" />
-<TGConnectingPoint num="17" id="288" />
-<TGConnectingPoint num="18" id="289" />
-<TGConnectingPoint num="19" id="290" />
-<TGConnectingPoint num="20" id="291" />
-<TGConnectingPoint num="21" id="292" />
-<TGConnectingPoint num="22" id="293" />
-<TGConnectingPoint num="23" id="294" />
-<TGConnectingPoint num="24" id="295" />
-<TGConnectingPoint num="25" id="296" />
-<TGConnectingPoint num="26" id="297" />
-<TGConnectingPoint num="27" id="298" />
-<TGConnectingPoint num="28" id="299" />
-<TGConnectingPoint num="29" id="300" />
-<TGConnectingPoint num="30" id="301" />
-<TGConnectingPoint num="31" id="302" />
-<TGConnectingPoint num="32" id="303" />
-<TGConnectingPoint num="33" id="304" />
-<TGConnectingPoint num="34" id="305" />
-<TGConnectingPoint num="35" id="306" />
-<TGConnectingPoint num="36" id="307" />
-<TGConnectingPoint num="37" id="308" />
-<TGConnectingPoint num="38" id="309" />
-<TGConnectingPoint num="39" id="310" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="352" >
-<cdparam x="350" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="312" />
-<TGConnectingPoint num="1" id="313" />
-<TGConnectingPoint num="2" id="314" />
-<TGConnectingPoint num="3" id="315" />
-<TGConnectingPoint num="4" id="316" />
-<TGConnectingPoint num="5" id="317" />
-<TGConnectingPoint num="6" id="318" />
-<TGConnectingPoint num="7" id="319" />
-<TGConnectingPoint num="8" id="320" />
-<TGConnectingPoint num="9" id="321" />
-<TGConnectingPoint num="10" id="322" />
-<TGConnectingPoint num="11" id="323" />
-<TGConnectingPoint num="12" id="324" />
-<TGConnectingPoint num="13" id="325" />
-<TGConnectingPoint num="14" id="326" />
-<TGConnectingPoint num="15" id="327" />
-<TGConnectingPoint num="16" id="328" />
-<TGConnectingPoint num="17" id="329" />
-<TGConnectingPoint num="18" id="330" />
-<TGConnectingPoint num="19" id="331" />
-<TGConnectingPoint num="20" id="332" />
-<TGConnectingPoint num="21" id="333" />
-<TGConnectingPoint num="22" id="334" />
-<TGConnectingPoint num="23" id="335" />
-<TGConnectingPoint num="24" id="336" />
-<TGConnectingPoint num="25" id="337" />
-<TGConnectingPoint num="26" id="338" />
-<TGConnectingPoint num="27" id="339" />
-<TGConnectingPoint num="28" id="340" />
-<TGConnectingPoint num="29" id="341" />
-<TGConnectingPoint num="30" id="342" />
-<TGConnectingPoint num="31" id="343" />
-<TGConnectingPoint num="32" id="344" />
-<TGConnectingPoint num="33" id="345" />
-<TGConnectingPoint num="34" id="346" />
-<TGConnectingPoint num="35" id="347" />
-<TGConnectingPoint num="36" id="348" />
-<TGConnectingPoint num="37" id="349" />
-<TGConnectingPoint num="38" id="350" />
-<TGConnectingPoint num="39" id="351" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="393" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="353" />
-<TGConnectingPoint num="1" id="354" />
-<TGConnectingPoint num="2" id="355" />
-<TGConnectingPoint num="3" id="356" />
-<TGConnectingPoint num="4" id="357" />
-<TGConnectingPoint num="5" id="358" />
-<TGConnectingPoint num="6" id="359" />
-<TGConnectingPoint num="7" id="360" />
-<TGConnectingPoint num="8" id="361" />
-<TGConnectingPoint num="9" id="362" />
-<TGConnectingPoint num="10" id="363" />
-<TGConnectingPoint num="11" id="364" />
-<TGConnectingPoint num="12" id="365" />
-<TGConnectingPoint num="13" id="366" />
-<TGConnectingPoint num="14" id="367" />
-<TGConnectingPoint num="15" id="368" />
-<TGConnectingPoint num="16" id="369" />
-<TGConnectingPoint num="17" id="370" />
-<TGConnectingPoint num="18" id="371" />
-<TGConnectingPoint num="19" id="372" />
-<TGConnectingPoint num="20" id="373" />
-<TGConnectingPoint num="21" id="374" />
-<TGConnectingPoint num="22" id="375" />
-<TGConnectingPoint num="23" id="376" />
-<TGConnectingPoint num="24" id="377" />
-<TGConnectingPoint num="25" id="378" />
-<TGConnectingPoint num="26" id="379" />
-<TGConnectingPoint num="27" id="380" />
-<TGConnectingPoint num="28" id="381" />
-<TGConnectingPoint num="29" id="382" />
-<TGConnectingPoint num="30" id="383" />
-<TGConnectingPoint num="31" id="384" />
-<TGConnectingPoint num="32" id="385" />
-<TGConnectingPoint num="33" id="386" />
-<TGConnectingPoint num="34" id="387" />
-<TGConnectingPoint num="35" id="388" />
-<TGConnectingPoint num="36" id="389" />
-<TGConnectingPoint num="37" id="390" />
-<TGConnectingPoint num="38" id="391" />
-<TGConnectingPoint num="39" id="392" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="404" >
-<cdparam x="370" y="176" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="394" />
-<TGConnectingPoint num="1" id="395" />
-<TGConnectingPoint num="2" id="396" />
-<TGConnectingPoint num="3" id="397" />
-<TGConnectingPoint num="4" id="398" />
-<TGConnectingPoint num="5" id="399" />
-<TGConnectingPoint num="6" id="400" />
-<TGConnectingPoint num="7" id="401" />
-<TGConnectingPoint num="8" id="402" />
-<TGConnectingPoint num="9" id="403" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="445" >
-<cdparam x="340" y="101" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="405" />
-<TGConnectingPoint num="1" id="406" />
-<TGConnectingPoint num="2" id="407" />
-<TGConnectingPoint num="3" id="408" />
-<TGConnectingPoint num="4" id="409" />
-<TGConnectingPoint num="5" id="410" />
-<TGConnectingPoint num="6" id="411" />
-<TGConnectingPoint num="7" id="412" />
-<TGConnectingPoint num="8" id="413" />
-<TGConnectingPoint num="9" id="414" />
-<TGConnectingPoint num="10" id="415" />
-<TGConnectingPoint num="11" id="416" />
-<TGConnectingPoint num="12" id="417" />
-<TGConnectingPoint num="13" id="418" />
-<TGConnectingPoint num="14" id="419" />
-<TGConnectingPoint num="15" id="420" />
-<TGConnectingPoint num="16" id="421" />
-<TGConnectingPoint num="17" id="422" />
-<TGConnectingPoint num="18" id="423" />
-<TGConnectingPoint num="19" id="424" />
-<TGConnectingPoint num="20" id="425" />
-<TGConnectingPoint num="21" id="426" />
-<TGConnectingPoint num="22" id="427" />
-<TGConnectingPoint num="23" id="428" />
-<TGConnectingPoint num="24" id="429" />
-<TGConnectingPoint num="25" id="430" />
-<TGConnectingPoint num="26" id="431" />
-<TGConnectingPoint num="27" id="432" />
-<TGConnectingPoint num="28" id="433" />
-<TGConnectingPoint num="29" id="434" />
-<TGConnectingPoint num="30" id="435" />
-<TGConnectingPoint num="31" id="436" />
-<TGConnectingPoint num="32" id="437" />
-<TGConnectingPoint num="33" id="438" />
-<TGConnectingPoint num="34" id="439" />
-<TGConnectingPoint num="35" id="440" />
-<TGConnectingPoint num="36" id="441" />
-<TGConnectingPoint num="37" id="442" />
-<TGConnectingPoint num="38" id="443" />
-<TGConnectingPoint num="39" id="444" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="447" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="446" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-</Modeling>
-
-
-
-
-</TURTLEGMODELING>
\ No newline at end of file
diff --git a/bin/config.xml b/bin/config.xml
deleted file mode 100755
index a0eb263799d010256f6c1c88e35edf479216cf58..0000000000000000000000000000000000000000
--- a/bin/config.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<TURTLECONFIGURATION>
-<RTLHost data="localhost" />
-<RTLPath data="/packages/RT-LOTOS.0.12/bin/rtl" />
-<DTA2DOTPath data="/packages/RT-LOTOS.0.12/bin/dta2dot" />
-<RG2TLSAPath data="/packages/RT-LOTOS.0.12/bin/rg2tlsa" />
-<RGSTRAPPath data="/packages/RT-LOTOS.0.12/bin/rgstrap" />
-<!--DOTTYPath data="/usr/bin/dot" /-->
-<DOTTYPath data="/bin/dotty" />
-<DOTTYHost data="localhost" />
-<AldebaranHost data="localhost" />
-<AldebaranPath data="/home/enrici/cadp/com/aldebaran" />
-<BcgioPath data="/home/enrici/cadp/bin.iX86/bcg_io" />
-<BcgminPath data="/home/enrici/cadp/bin.iX86/bcg_min" />
-<BisimulatorPath data="/home/enrici/cadp/com/bcg_open" />
-<BcgmergePath data="/home/enrici/cadp/com/bcg_merge" />
-<CaesarPath data="/home/enrici/cadp/bin.iX86/caesar" />
-<CaesarOpenPath data="/home/enrici/cadp/com/caesar.open" />
-<FILEPath data="/home/enrici/TURTLE/modeling" />
-<LIBPath data="/home/enrici/TURTLE/lib" />
-<IMGPath data="/home/enrici/TURTLE/figure" />
-<LOTOSPath data="/home/enrici/TURTLE/lotos" />
-<GGraphPath data="/home/enrici/TURTLE/graphs" />
-<TGraphPath data="/home/enrici/TURTLE/graphs" />
-<TToolUpdateURL data="" data1="http://labsoc.comelec.enst.fr/turtle/ttoolversion.html" />
-<TToolUpdateProxy data="false" />
-<TToolUpdateProxyPort data="8080" />
-<TToolUpdateProxyHost data="To Be Completed" />
-<JavaCodeDirectory data="/home/enrici/TURTLE/javacode" />
-<JavaCompilerPath data="/usr/bin/javac" />
-<TToolClassPath data="/home/enrici/TURTLE/javacode" />
-<JavaExecutePath data="/usr/bin/java" />
-<JavaHeader data="import java.sql.*;" />
-<SystemCCodeDirectory data="/home/enrici/TURTLE/simulators/c++2/" />
-<SystemCHost data="localhost"/>
-<SystemCCodeCompileCommand data="make -C /home/enrici/TURTLE/simulators/c++2/" />
-<SystemCCodeExecuteCommand data="/home/enrici/TURTLE/simulators/c++2/run.x -ovcd /home/enrici/TURTLE/simulators/c++2/vcddump.vcd" />
-<SystemCCodeInteractiveExecuteCommand data="/home/enrici/TURTLE/simulators/c++2/run.x -server" />
-<TMLCodeDirectory data="/home/enrici/TURTLE/tmlcode" />
-<CcodeDirectory data="/home/enrici/TURTLE/Ccode" />
-<GTKWavePath data="/usr/bin/gtkwave" />
-<VCDPath data="/home/enrici/TURTLE/vcd/" />
-<UPPAALCodeDirectory data="/home/enrici/TURTLE/uppaal/" />
-<UPPAALVerifierPath data="/home/enrici/TURTLE/uppaal/bin-Linux/verifyta" />
-<UPPAALVerifierHost data="localhost" />
-<ProVerifCodeDirectory data="/home/enrici/TURTLE/proverif/" />
-<ProVerifVerifierPath data="/packages/proverif/proverif" />
-<ProVerifVerifierHost data="localhost" />
-<AVATARExecutableCodeDirectory data="/home/enrici/TURTLE/executablecode/" />
-<AVATARExecutableCodeHost data="localhost"/>
-<AVATARExecutableCodeCompileCommand data="make -C /home/enrici/TURTLE/executablecode" />
-<AVATARExecutableCodeExecuteCommand data="/home/enrici/TURTLE/executablecode/run.x" />
-<AVATARExecutableSoclibCodeCompileCommand data="make -C /home/enrici/TURTLE/executablecode updategeneratedcode compilesoclib" />
-<AVATARExecutableSoclibCodeExecuteCommand data="make -C /home/enrici/TURTLE/executablecode runsoclib" />
-<AVATARExecutableSoclibTraceFile data="/home/enrici/TURTLE/Prog/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/vcitty" />
-
-
-<ExternalCommand1Host data="localhost"/>
-<ExternalCommand1 data="/usr/bin/gtkwave /home/enrici/TURTLE/simulators/c++2/vcddump.vcd"/>
-<ExternalCommand2Host data="localhost"/>
-<ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal /home/enrici/TURTLE/uppaal/spec.xml"/>
-
-<LastOpenFile data="/home/trhuy/Downloads/SemesterFinalResult/StuxnetModel/stuxnet_6_12_split (1).xml"/>
-
-<ExternalServer data="10.188.65.215:12345"/>
-
-<LastWindowAttributes x="90" y="25" width="1219" height="597" max="false" />
-
-
-</TURTLECONFIGURATION>
diff --git a/src/android/bin/classes/project/alwaystry/R$attr.class b/src/android/bin/classes/project/alwaystry/R$attr.class
deleted file mode 100644
index cb730fe4e22b28f37744533e3c106b10d4bd7134..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/R$attr.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/R$drawable.class b/src/android/bin/classes/project/alwaystry/R$drawable.class
deleted file mode 100644
index b526c6dc59c325e3d2c031005f726bd853085407..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/R$drawable.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/R$id.class b/src/android/bin/classes/project/alwaystry/R$id.class
deleted file mode 100644
index 29f467f5e324c31ab81d161d8025f6cefc9f55ee..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/R$id.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/R$layout.class b/src/android/bin/classes/project/alwaystry/R$layout.class
deleted file mode 100644
index 98f3493042476eed6c4792be9fac8d37f2ecb350..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/R$layout.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/R$string.class b/src/android/bin/classes/project/alwaystry/R$string.class
deleted file mode 100644
index 9857283c646b44948132f7be1053e04cd16dcaa3..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/R$string.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/R$styleable.class b/src/android/bin/classes/project/alwaystry/R$styleable.class
deleted file mode 100644
index 3d0f1a20349ae5847de6bb2b314aed0f53046aff..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/R$styleable.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/drageventblock$1.class b/src/android/bin/classes/project/alwaystry/drageventblock$1.class
deleted file mode 100644
index 7d61bb18c19d21091db303bd9de1b04a3bbf9065..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/drageventblock$1.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/drageventblock$2.class b/src/android/bin/classes/project/alwaystry/drageventblock$2.class
deleted file mode 100644
index 4a8da2c4a1c3b3e5ac40e8ca7b9279f44954c601..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/drageventblock$2.class and /dev/null differ
diff --git a/src/android/bin/classes/project/alwaystry/drageventblock$MyShadowBuilder.class b/src/android/bin/classes/project/alwaystry/drageventblock$MyShadowBuilder.class
deleted file mode 100644
index 49b3248eabf4708933cdd9bf3513eb277f03977f..0000000000000000000000000000000000000000
Binary files a/src/android/bin/classes/project/alwaystry/drageventblock$MyShadowBuilder.class and /dev/null differ
diff --git a/src/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
index 246257bb87ee4967e4a4cef66333957d8371d668..b7f9987372cdd93ad767bfb8252cfdd73e797c9c 100755
--- a/src/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -126,7 +126,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
this.avspec.removeCompositeStates();
this.avspec.removeTimers();
// TODO: Why remove Else guards ?
- this.avspec.removeElseGuards();
+ // this.avspec.removeElseGuards();
this.makeHeader(_stateReachability);
@@ -260,10 +260,10 @@ public class AVATAR2ProVerif implements AvatarTranslator {
if (attrA != null && attrB != null) {
String sA = this.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), attrA.getState ().getName ());
String sB = this.makeAttrName (attrB.getAttribute ().getBlock ().getName (), attrB.getAttribute ().getName (), attrB.getState ().getName ());
- TraceManager.addDev("| authenticity__" + sA + " (dummyM) ==> authenticity__" + sB + " (dummyM)");
+ TraceManager.addDev("| authenticity__" + sB + " (dummyM) ==> authenticity__" + sA + " (dummyM)");
spec.addDeclaration (new ProVerifEvDecl ("authenticity__" + sA, new String[] {"bitstring"}));
spec.addDeclaration (new ProVerifEvDecl ("authenticity__" + sB, new String[] {"bitstring"}));
- spec.addDeclaration (new ProVerifQueryEvinj (new ProVerifVar[] {new ProVerifVar ("dummyM", "bitstring")}, "authenticity__" + sA + " (dummyM)", "authenticity__" + sB + " (dummyM)"));
+ spec.addDeclaration (new ProVerifQueryEvinj (new ProVerifVar[] {new ProVerifVar ("dummyM", "bitstring")}, "authenticity__" + sB + " (dummyM)", "authenticity__" + sA + " (dummyM)"));
}
}
}
diff --git a/src/proverifspec/ProVerifPiSyntaxer.java b/src/proverifspec/ProVerifPiSyntaxer.java
index 1ed85d6aa0ab30dfe770bb06f4252ca7bbf281a4..fa18f4327da49a1f6a832038e60666da3f4d2ce5 100644
--- a/src/proverifspec/ProVerifPiSyntaxer.java
+++ b/src/proverifspec/ProVerifPiSyntaxer.java
@@ -56,22 +56,30 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
this.fullSpec += "\n" + this.printAlinea (_alinea);
if (_node.priv)
this.fullSpec += "private ";
- this.fullSpec += "fun " + _node.name + "/" + _node.types.length + ".";
+ if (_node.reduc == null)
+ this.fullSpec += "fun " + _node.name + "/" + _node.types.length;
+ else
+ this.translateReducAux (_node.reduc, _alinea);
+ this.fullSpec += ".";
}
- protected void translateReduc (ProVerifReduc _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
- if (_node.priv)
- this.fullSpec += "private ";
+ private void translateReducAux (ProVerifReduc _node, int _alinea) {
this.fullSpec += "reduc " + _node.formula;
ProVerifReduc otherwise = _node.otherwise;
while (otherwise != null) {
- this.fullSpec += ";\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + this.printAlinea (_alinea);
if (_node.priv)
this.fullSpec += " ";
- this.fullSpec += " " + otherwise.formula;
+ this.fullSpec += " otherwise " + otherwise.formula;
otherwise = otherwise.otherwise;
}
+ }
+
+ protected void translateReduc (ProVerifReduc _node, int _alinea) {
+ this.fullSpec += "\n" + this.printAlinea (_alinea);
+ if (_node.priv)
+ this.fullSpec += "private ";
+ this.translateReducAux (_node, _alinea);
this.fullSpec += ".";
}
diff --git a/src/proverifspec/ProVerifReduc.java b/src/proverifspec/ProVerifReduc.java
index e9713258fb6be8a83005e29ce3d781adc2737536..138e9e90d758ddbc0a51f32e8f6ec775aa0727a8 100644
--- a/src/proverifspec/ProVerifReduc.java
+++ b/src/proverifspec/ProVerifReduc.java
@@ -51,19 +51,23 @@ public class ProVerifReduc implements ProVerifDeclaration {
protected String formula;
protected boolean priv;
- public ProVerifReduc (ProVerifVar[] _vars, String _formula, ProVerifReduc _otherwise) {
+ public ProVerifReduc (ProVerifVar[] _vars, String _formula, ProVerifReduc _otherwise, boolean _priv) {
this.vars = _vars;
this.formula = _formula;
this.otherwise = _otherwise;
+ this.priv = _priv;
}
- public ProVerifReduc (ProVerifVar[] _vars, String _formula) {
- this (_vars, _formula, null);
+ public ProVerifReduc (ProVerifVar[] _vars, String _formula, boolean _priv) {
+ this (_vars, _formula, null, _priv);
}
- public ProVerifReduc (ProVerifVar[] _vars, String _formula, boolean _priv) {
- this (_vars, _formula);
- this.priv = _priv;
+ public ProVerifReduc (ProVerifVar[] _vars, String _formula, ProVerifReduc _otherwise) {
+ this (_vars, _formula, _otherwise, false);
+ }
+
+ public ProVerifReduc (ProVerifVar[] _vars, String _formula) {
+ this (_vars, _formula, null, false);
}
public void translate (ProVerifSyntaxer _syntaxer, int _alinea) {