This commit is contained in:
parent
8adf9c6205
commit
f8a7aa0147
@ -1,566 +0,0 @@
|
|||||||
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36" version="26.1.3" pages="2">
|
|
||||||
<diagram id="C5RBs43oDa-KdzZeNtuy" name="Logique">
|
|
||||||
<mxGraphModel dx="735" dy="407" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
|
|
||||||
<root>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-2" value="" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-3" target="WIyWlLk6GJQsqaUBKTNV-6" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-3" value="Alice appelle Bob" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=3;shadow=0;strokeColor=light-dark(#000000,#370FFF);" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="300" y="90" width="120" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-4" value="Yes" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-0" target="WIyWlLk6GJQsqaUBKTNV-10" edge="1">
|
|
||||||
<mxGeometry y="20" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-5" value="No" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-6" target="WIyWlLk6GJQsqaUBKTNV-7" edge="1">
|
|
||||||
<mxGeometry y="10" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-6" value="Bob répond ?" style="rhombus;whiteSpace=wrap;html=1;shadow=0;fontFamily=Helvetica;fontSize=12;align=center;strokeWidth=1;spacing=6;spacingTop=-4;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="310" y="180" width="100" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-7" value="Rien ne se passe" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="460" y="200" width="120" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-8" value="Négativement" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
|
|
||||||
<mxGeometry y="40" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-9" value="Positivement" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="WIyWlLk6GJQsqaUBKTNV-12" edge="1">
|
|
||||||
<mxGeometry y="10" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-10" value="Bob ping..." style="whiteSpace=wrap;html=1;shadow=0;fontFamily=Helvetica;fontSize=12;align=center;strokeWidth=1;spacing=6;spacingTop=-4;shape=hexagon;perimeter=hexagonPerimeter2;fixedSize=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="310" y="390" width="100" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-11" value="Protocole échoué<div>-</div><div>Passage en clair</div>" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=3;shadow=0;strokeColor=light-dark(#000000,#FF1414);" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="300" y="520" width="120" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-12" target="FXGPDhTRSO2FZSW48CnP-8" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="599.9999999999998" y="500" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="WIyWlLk6GJQsqaUBKTNV-12" value="Alice envoi son<span style="background-color: transparent; color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));">&nbsp;handshake a Bob</span>" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="540" y="410" width="120" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-1" value="" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-6" target="FXGPDhTRSO2FZSW48CnP-0" edge="1">
|
|
||||||
<mxGeometry y="20" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
<mxPoint x="360" y="260" as="sourcePoint" />
|
|
||||||
<mxPoint x="360" y="390" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-0" value="Le dialer d'Alice envoi un PING a Bob" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="300" y="300" width="120" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-2" value="" style="endArrow=block;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;endFill=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="FXGPDhTRSO2FZSW48CnP-4" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="480" y="450" as="sourcePoint" />
|
|
||||||
<mxPoint x="190" y="430" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="280" y="430" />
|
|
||||||
<mxPoint x="280" y="460" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-3" value="Ne ping pas" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-2" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.2695" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-16" y="-10" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-4" target="FXGPDhTRSO2FZSW48CnP-0" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="130" y="320" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-6" value="Reping" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-5" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="0.0817" relative="1" as="geometry">
|
|
||||||
<mxPoint x="23" y="-10" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-4" value="Attendre 1s ? 0.5s ?" style="rounded=1;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="70" y="440" width="120" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-12" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-8" target="FXGPDhTRSO2FZSW48CnP-11" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="530.0380952380951" y="585.0038095238094" as="sourcePoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-13" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-12" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.4964" y="-1" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-43" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endArrow=block;endFill=0;strokeColor=light-dark(#000000,#FF0000);" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-8" target="FXGPDhTRSO2FZSW48CnP-27" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="600" y="800" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="600" y="660" />
|
|
||||||
<mxPoint x="570" y="660" />
|
|
||||||
<mxPoint x="570" y="700" />
|
|
||||||
<mxPoint x="210" y="700" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-44" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-43" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.8049" y="1" relative="1" as="geometry">
|
|
||||||
<mxPoint x="8" y="-25" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-8" value="Bob reconnait la clé publique d'Alice ?" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="540" y="545" width="120" height="75" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-11" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="360" y="600" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-17" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-16" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.1233" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-20" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-11" target="FXGPDhTRSO2FZSW48CnP-19" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-21" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-20" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.275" y="1" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-11" value="Bob accepte la clé d'Alice?" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="354" y="620" width="120" height="75" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-23" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-19" target="FXGPDhTRSO2FZSW48CnP-22" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-19" value="Bob envoi sa clé publique en handshake" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="160" y="636.25" width="120" height="42.5" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-22" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="70" y="545" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-25" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-24" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.7543" y="3" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-28" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-22" target="FXGPDhTRSO2FZSW48CnP-27" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="70" y="750" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-22" value="Alice accepte la clé publique de Bob<span style="background-color: transparent; color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));">&nbsp;?</span>" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;rounded=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="30" y="617.5" width="80" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-47" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-26" target="FXGPDhTRSO2FZSW48CnP-46" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-26" value="Alice et Bob sont d'accord sur la clé symmétrique a utiliser" style="rounded=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="340" y="820" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-27" target="FXGPDhTRSO2FZSW48CnP-30" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=light-dark(#000000,#FF1616);endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-27" target="FXGPDhTRSO2FZSW48CnP-26" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="210" y="850" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-27" value="Alice et Bob calculent le secret partagé de leur côté" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="150" y="720" width="120" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-33" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;jumpStyle=sharp;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-29" target="FXGPDhTRSO2FZSW48CnP-34" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="640" y="680" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="700" y="745" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-36" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-33" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.1536" y="1" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-29" target="FXGPDhTRSO2FZSW48CnP-26" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="525" y="798" />
|
|
||||||
<mxPoint x="510" y="798" />
|
|
||||||
<mxPoint x="510" y="850" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-42" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-41" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.7774" y="1" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-29" value="Ils sont d'accord ?" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="460" y="715" width="130" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-30" target="FXGPDhTRSO2FZSW48CnP-29" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-30" value="Alice et Bob lisent à haute voix la phrase de sécurité" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="300" y="720" width="120" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-34" target="WIyWlLk6GJQsqaUBKTNV-12" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-38" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-37" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.3086" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;jumpStyle=sharp;jumpSize=8;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-34" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="530" y="690" />
|
|
||||||
<mxPoint x="530" y="545" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-40" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-39" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.7617" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-34" value="Ré-essayer ?" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="660" y="650" width="80" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-49" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-46" target="FXGPDhTRSO2FZSW48CnP-48" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-46" value="Alice et Bob utilisent la clé symmétrique pour chiffrer leurs transmissions" style="whiteSpace=wrap;html=1;rounded=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="340" y="920" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="FXGPDhTRSO2FZSW48CnP-48" value="" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
|
||||||
<mxGeometry x="360" y="1020" width="80" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
</root>
|
|
||||||
</mxGraphModel>
|
|
||||||
</diagram>
|
|
||||||
<diagram id="4Sb7mgJDpsadGym-U4wz" name="Echanges">
|
|
||||||
<mxGraphModel dx="1195" dy="683" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
|
|
||||||
<root>
|
|
||||||
<mxCell id="0" />
|
|
||||||
<mxCell id="1" parent="0" />
|
|
||||||
<mxCell id="b_xV4iUWIxmdZCAYY4YR-1" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="160" y="120" width="440" height="120" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="O_eM33N56VtHnDaMz1H4-1" value="ALICE" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={"curved":0,"rounded":0};participant=umlEntity;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="120" y="40" width="40" height="3110" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="O_eM33N56VtHnDaMz1H4-2" value="BOB" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={"curved":0,"rounded":0};participant=umlEntity;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="690" y="40" width="40" height="3110" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="b_xV4iUWIxmdZCAYY4YR-2" value="PING" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="385" y="65" width="80" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="n3lF8vaYaHAhAfaeaFZn-1" value="Nonce" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="180" y="130" width="105" height="80" as="geometry">
|
|
||||||
<mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="n3lF8vaYaHAhAfaeaFZn-6" value="<div>sha256 (</div><div>numéro alice +</div><div>numéro bob +</div><div>timestamp +</div><div>random<br></div><div>) / ~2 (left part)<br></div>" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=7;" parent="n3lF8vaYaHAhAfaeaFZn-1" vertex="1">
|
|
||||||
<mxGeometry y="25" width="100" height="55" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="n3lF8vaYaHAhAfaeaFZn-2" value="Version" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="305" y="130" width="58.75" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-1" value="(0-128)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="n3lF8vaYaHAhAfaeaFZn-2">
|
|
||||||
<mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="n3lF8vaYaHAhAfaeaFZn-4" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="455" y="130" width="90" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="n3lF8vaYaHAhAfaeaFZn-7" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="n3lF8vaYaHAhAfaeaFZn-4" vertex="1">
|
|
||||||
<mxGeometry x="15" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-1" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="280" y="280" width="410" height="190" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-2" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="300" y="290" width="90" height="60" as="geometry">
|
|
||||||
<mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-3" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="XvZTtdEB18xY6m2a5fJO-2" vertex="1">
|
|
||||||
<mxGeometry x="11.25" y="27.5" width="67.5" height="25" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-4" value="Version" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="405.63" y="290" width="58.75" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-11" value="0" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-4" vertex="1">
|
|
||||||
<mxGeometry y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-5" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="590" y="380" width="85" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-6" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-5" vertex="1">
|
|
||||||
<mxGeometry x="12.5" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-9" value="Answer" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="482.5" y="290" width="57.5" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-10" value="<div>YES</div><div>NO<br></div>" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="484.38" y="315" width="53.75" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-13" value="HANDSHAKE" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="350" y="510" width="170" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-14" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="160" y="570" width="410" height="220" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-15" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="170" y="580" width="105" height="80" as="geometry">
|
|
||||||
<mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-13" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" parent="XvZTtdEB18xY6m2a5fJO-15" vertex="1">
|
|
||||||
<mxGeometry y="30" width="100" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-17" value="Signature" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="285" y="580" width="105" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-14" value="PubkeyFixe. sign(clé éphémère)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-17" vertex="1">
|
|
||||||
<mxGeometry y="20" width="100" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-18" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="486.25" y="580" width="65" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="XvZTtdEB18xY6m2a5fJO-19" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-18" vertex="1">
|
|
||||||
<mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-15" value="PFS" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="402.81" y="580" width="71.88" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-16" value="hash( preuve de convo précédente)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;" parent="pP7SjZfcCiBg3d1TCkzP-15" vertex="1">
|
|
||||||
<mxGeometry x="6.57" y="30" width="60" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-17" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="285" y="830" width="410" height="180" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-43" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="305" y="840" width="105" height="80" as="geometry">
|
|
||||||
<mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-44" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" parent="pP7SjZfcCiBg3d1TCkzP-43" vertex="1">
|
|
||||||
<mxGeometry y="30" width="100" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-45" value="Signature" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="420" y="840" width="105" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-46" value="PubkeyFixe. sign(clé éphémère)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pP7SjZfcCiBg3d1TCkzP-45" vertex="1">
|
|
||||||
<mxGeometry y="20" width="100" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-47" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="621.25" y="840" width="65" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-48" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pP7SjZfcCiBg3d1TCkzP-47" vertex="1">
|
|
||||||
<mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-49" value="PFS" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="537.81" y="840" width="71.88" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-50" value="hash( preuve de convo précédente )" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;" parent="pP7SjZfcCiBg3d1TCkzP-49" vertex="1">
|
|
||||||
<mxGeometry x="6.57" y="30" width="60" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-54" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="182.5" y="690" width="80" height="70" as="geometry">
|
|
||||||
<mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-55" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="pP7SjZfcCiBg3d1TCkzP-54" vertex="1">
|
|
||||||
<mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-56" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="606.25" y="930" width="80" height="70" as="geometry">
|
|
||||||
<mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-57" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="pP7SjZfcCiBg3d1TCkzP-56" vertex="1">
|
|
||||||
<mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-58" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="160" y="1160" width="450" height="200" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-59" value="ENCRYPTED COMS" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="305" y="1100" width="240" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-60" value="129b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="200" y="210" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-61" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="303.75" y="210" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-62" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="470" y="210" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-63" value="= 172b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="530" y="210" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-66" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="313" y="350" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-67" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="406.75" y="350" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-68" value="1b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="479.25" y="350" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-69" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="600.5" y="440" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-70" value="= 76b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="426.25" y="420" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-71" value="264b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="193" y="660" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-72" value="512b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="307.5" y="660" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-73" value="256b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="409.38" y="660" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-74" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="488.75" y="660" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-75" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="192.5" y="760" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-76" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="315" y="750" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pP7SjZfcCiBg3d1TCkzP-77" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="327.5" y="970" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-1" value="CRC ?" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="375" y="1270" width="63.25" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-2" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-1" vertex="1">
|
|
||||||
<mxGeometry x="1.6199999999999992" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-3" value="Flag" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="180" y="1170" width="65" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-4" value="To determine" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-3" vertex="1">
|
|
||||||
<mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-5" value="nbretry" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="344.38" y="1170" width="65" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-6" value="y" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-5" vertex="1">
|
|
||||||
<mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-7" value="msg_len" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="262.5" y="1170" width="65" height="60" as="geometry">
|
|
||||||
<mxRectangle x="262.5" y="1170" width="90" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-8" value="XXX" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-7" vertex="1">
|
|
||||||
<mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-9" value="msg" style="swimlane;whiteSpace=wrap;html=1;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="187.5" y="1270" width="65" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-10" value="BBB" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-9" vertex="1">
|
|
||||||
<mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-11" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="180" y="1230" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-12" value="8b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="349.38" y="1230" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-13" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="267.5" y="1230" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-14" value="96b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="510" y="1230" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-15" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="379.12" y="1330" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="_H5URFloX_BVB2BL7kO6-16" value="= (180b ~ 212b) + yyy" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="465" y="1285" width="130" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-2" value="Cypher" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="375" y="130" width="58.75" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-3" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-2">
|
|
||||||
<mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-4" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="375" y="210" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-5" value="Cypher" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="600" y="290" width="58.75" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-6" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-5">
|
|
||||||
<mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-7" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="601.88" y="350" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-8" value="status" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="425" y="1170" width="65" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-9" value="CRC ?" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-8">
|
|
||||||
<mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-10" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="428.75" y="1230" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-11" value="iv" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="505" y="1170" width="65" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-12" value="random<div>(+Z)</div>" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-11">
|
|
||||||
<mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-13" value="BBB b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="193" y="1330" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-14" value="MAC" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="286.13" y="1270" width="63.25" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-15" value="AEAD" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-14">
|
|
||||||
<mxGeometry x="1.6199999999999992" y="25" width="60" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-16" value="128b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="290.25" y="1330" width="55" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-17" value="Green = clear data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="10" y="1170" width="110" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-18" value="<font style="color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));">White = additional data</font>" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=none;strokeColor=light-dark(#6C8EBF,#FFFFFF);" vertex="1" parent="1">
|
|
||||||
<mxGeometry y="1220" width="130" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="pWkGvNQAXuiST1IiWYlx-19" value="Blue = encrypted data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="10" y="1270" width="110" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
</root>
|
|
||||||
</mxGraphModel>
|
|
||||||
</diagram>
|
|
||||||
</mxfile>
|
|
@ -1,119 +0,0 @@
|
|||||||
# Voice-over-GSM Protocol Implementation
|
|
||||||
|
|
||||||
This implementation provides encrypted voice communication over standard GSM voice channels without requiring CSD/HSCSD.
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
### 1. Voice Codec (`voice_codec.py`)
|
|
||||||
- **Codec2Wrapper**: Simulates Codec2 compression
|
|
||||||
- Supports multiple bitrates (700-3200 bps)
|
|
||||||
- Default: 1200 bps for GSM robustness
|
|
||||||
- 40ms frames (48 bits/frame at 1200 bps)
|
|
||||||
|
|
||||||
- **FSKModem**: 4-FSK modulation for voice channels
|
|
||||||
- Frequency band: 300-3400 Hz (GSM compatible)
|
|
||||||
- Symbol rate: 600 baud
|
|
||||||
- 4 frequencies: 600, 1200, 1800, 2400 Hz
|
|
||||||
- Preamble: 800 Hz for 100ms
|
|
||||||
|
|
||||||
- **VoiceProtocol**: Integration layer
|
|
||||||
- Manages codec and modem
|
|
||||||
- Handles encryption with ChaCha20-CTR
|
|
||||||
- Frame-based processing
|
|
||||||
|
|
||||||
### 2. Protocol Messages (`messages.py`)
|
|
||||||
- **VoiceStart** (20 bytes): Initiates voice call
|
|
||||||
- Version, codec mode, FEC type
|
|
||||||
- Session ID (64 bits)
|
|
||||||
- Initial sequence number
|
|
||||||
|
|
||||||
- **VoiceAck** (16 bytes): Accepts/rejects call
|
|
||||||
- Status (accept/reject)
|
|
||||||
- Negotiated codec and FEC
|
|
||||||
|
|
||||||
- **VoiceEnd** (12 bytes): Terminates call
|
|
||||||
- Session ID for confirmation
|
|
||||||
|
|
||||||
- **VoiceSync** (20 bytes): Synchronization
|
|
||||||
- Sequence number and timestamp
|
|
||||||
- For jitter buffer management
|
|
||||||
|
|
||||||
### 3. Encryption (`encryption.py`)
|
|
||||||
- **ChaCha20-CTR**: Stream cipher for voice
|
|
||||||
- No authentication overhead (HMAC per second)
|
|
||||||
- 12-byte nonce with frame counter
|
|
||||||
- Uses HKDF-derived key from main protocol
|
|
||||||
|
|
||||||
### 4. Protocol Integration (`protocol.py`)
|
|
||||||
- Voice session management
|
|
||||||
- Message handlers for all voice messages
|
|
||||||
- Methods:
|
|
||||||
- `start_voice_call()`: Initiate call
|
|
||||||
- `accept_voice_call()`: Accept incoming
|
|
||||||
- `end_voice_call()`: Terminate
|
|
||||||
- `send_voice_audio()`: Process audio
|
|
||||||
|
|
||||||
## Usage Example
|
|
||||||
|
|
||||||
```python
|
|
||||||
# After key exchange is complete
|
|
||||||
alice.start_voice_call(codec_mode=5, fec_type=0)
|
|
||||||
|
|
||||||
# Bob automatically accepts if in auto mode
|
|
||||||
# Or manually: bob.accept_voice_call(session_id, codec_mode, fec_type)
|
|
||||||
|
|
||||||
# Send audio
|
|
||||||
audio_samples = generate_audio() # 8kHz, 16-bit PCM
|
|
||||||
alice.send_voice_audio(audio_samples)
|
|
||||||
|
|
||||||
# End call
|
|
||||||
alice.end_voice_call()
|
|
||||||
```
|
|
||||||
|
|
||||||
## Key Features
|
|
||||||
|
|
||||||
1. **Codec2 @ 1200 bps**
|
|
||||||
- Optimal for GSM vocoder survival
|
|
||||||
- Intelligible but "robotic" quality
|
|
||||||
|
|
||||||
2. **4-FSK Modulation**
|
|
||||||
- Survives GSM/AMR/EVS vocoders
|
|
||||||
- 2400 baud with FEC
|
|
||||||
|
|
||||||
3. **ChaCha20-CTR Encryption**
|
|
||||||
- Low latency stream cipher
|
|
||||||
- Frame-based IV management
|
|
||||||
|
|
||||||
4. **Forward Error Correction**
|
|
||||||
- Repetition code (3x)
|
|
||||||
- Future: Convolutional or LDPC
|
|
||||||
|
|
||||||
5. **No Special Requirements**
|
|
||||||
- Works over standard voice calls
|
|
||||||
- Compatible with any phone
|
|
||||||
- Software-only solution
|
|
||||||
|
|
||||||
## Testing
|
|
||||||
|
|
||||||
Run the test scripts:
|
|
||||||
- `test_voice_simple.py`: Basic voice call setup
|
|
||||||
- `test_voice_protocol.py`: Full test with audio simulation (requires numpy)
|
|
||||||
|
|
||||||
## Implementation Notes
|
|
||||||
|
|
||||||
1. Message disambiguation: VoiceStart sets high bit in flags field to distinguish from VoiceSync (both 20 bytes)
|
|
||||||
|
|
||||||
2. The actual Codec2 library would need to be integrated for production use
|
|
||||||
|
|
||||||
3. FEC implementation is simplified (repetition code) - production would use convolutional codes
|
|
||||||
|
|
||||||
4. Audio I/O integration needed for real voice calls
|
|
||||||
|
|
||||||
5. Jitter buffer and timing recovery needed for production
|
|
||||||
|
|
||||||
## Security Considerations
|
|
||||||
|
|
||||||
- Voice frames use ChaCha20-CTR without per-frame authentication
|
|
||||||
- HMAC computed over 1-second blocks for efficiency
|
|
||||||
- Session binding through encrypted session ID
|
|
||||||
- PFS maintained through main protocol key rotation
|
|
@ -1,430 +0,0 @@
|
|||||||
import time
|
|
||||||
import threading
|
|
||||||
import queue
|
|
||||||
from typing import Optional, Dict, Any, List, Callable, Tuple
|
|
||||||
|
|
||||||
# ANSI colors for logging
|
|
||||||
RED = "\033[91m"
|
|
||||||
GREEN = "\033[92m"
|
|
||||||
YELLOW = "\033[93m"
|
|
||||||
BLUE = "\033[94m"
|
|
||||||
RESET = "\033[0m"
|
|
||||||
|
|
||||||
class AutoModeConfig:
|
|
||||||
"""Configuration parameters for the automatic mode behavior."""
|
|
||||||
def __init__(self):
|
|
||||||
# Ping behavior
|
|
||||||
self.ping_response_accept = True # Whether to accept incoming pings
|
|
||||||
self.ping_auto_initiate = False # Whether to initiate pings when connected
|
|
||||||
self.ping_retry_count = 3 # Number of ping retries
|
|
||||||
self.ping_retry_delay = 5.0 # Seconds between ping retries
|
|
||||||
self.ping_timeout = 10.0 # Seconds to wait for ping response
|
|
||||||
self.preferred_cipher = 0 # 0=AES-GCM, 1=ChaCha20-Poly1305
|
|
||||||
|
|
||||||
# Handshake behavior
|
|
||||||
self.handshake_retry_count = 3 # Number of handshake retries
|
|
||||||
self.handshake_retry_delay = 5.0 # Seconds between handshake retries
|
|
||||||
self.handshake_timeout = 10.0 # Seconds to wait for handshake
|
|
||||||
|
|
||||||
# Messaging behavior
|
|
||||||
self.auto_message_enabled = False # Whether to auto-send messages
|
|
||||||
self.message_interval = 10.0 # Seconds between auto messages
|
|
||||||
self.message_content = "Hello, secure world!" # Default message
|
|
||||||
|
|
||||||
# General behavior
|
|
||||||
self.active_mode = False # If true, initiates protocol instead of waiting
|
|
||||||
|
|
||||||
|
|
||||||
class AutoMode:
|
|
||||||
"""
|
|
||||||
Manages automated behavior for the Icing protocol.
|
|
||||||
Handles automatic progression through the protocol stages:
|
|
||||||
1. Connection setup
|
|
||||||
2. Ping/discovery
|
|
||||||
3. Key exchange
|
|
||||||
4. Encrypted communication
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, protocol_interface):
|
|
||||||
"""
|
|
||||||
Initialize the AutoMode manager.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
protocol_interface: An object implementing the required protocol methods
|
|
||||||
"""
|
|
||||||
self.protocol = protocol_interface
|
|
||||||
self.config = AutoModeConfig()
|
|
||||||
self.active = False
|
|
||||||
self.state = "idle"
|
|
||||||
|
|
||||||
# Message queue for automated sending
|
|
||||||
self.message_queue = queue.Queue()
|
|
||||||
|
|
||||||
# Tracking variables
|
|
||||||
self.ping_attempts = 0
|
|
||||||
self.handshake_attempts = 0
|
|
||||||
self.last_action_time = 0
|
|
||||||
self.timer_tasks = [] # List of active timer tasks (for cleanup)
|
|
||||||
|
|
||||||
def start(self):
|
|
||||||
"""Start the automatic mode."""
|
|
||||||
if self.active:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.active = True
|
|
||||||
self.state = "idle"
|
|
||||||
self.ping_attempts = 0
|
|
||||||
self.handshake_attempts = 0
|
|
||||||
self.last_action_time = time.time()
|
|
||||||
|
|
||||||
self._log_info("Automatic mode started")
|
|
||||||
|
|
||||||
# Start in active mode if configured
|
|
||||||
if self.config.active_mode and self.protocol.connections:
|
|
||||||
self._start_ping_sequence()
|
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
"""Stop the automatic mode and clean up any pending tasks."""
|
|
||||||
if not self.active:
|
|
||||||
return
|
|
||||||
|
|
||||||
# Cancel any pending timers
|
|
||||||
for timer in self.timer_tasks:
|
|
||||||
if timer.is_alive():
|
|
||||||
timer.cancel()
|
|
||||||
self.timer_tasks = []
|
|
||||||
|
|
||||||
self.active = False
|
|
||||||
self.state = "idle"
|
|
||||||
self._log_info("Automatic mode stopped")
|
|
||||||
|
|
||||||
def handle_connection_established(self):
|
|
||||||
"""Called when a new connection is established."""
|
|
||||||
if not self.active:
|
|
||||||
return
|
|
||||||
|
|
||||||
self._log_info("Connection established")
|
|
||||||
|
|
||||||
# If in active mode, start pinging
|
|
||||||
if self.config.active_mode:
|
|
||||||
self._start_ping_sequence()
|
|
||||||
|
|
||||||
def handle_ping_received(self, index: int):
|
|
||||||
"""
|
|
||||||
Handle a received ping request.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
index: Index of the ping request in the protocol's inbound message queue
|
|
||||||
"""
|
|
||||||
if not self.active or not self._is_valid_message_index(index):
|
|
||||||
return
|
|
||||||
|
|
||||||
self._log_info(f"Ping request received (index={index})")
|
|
||||||
|
|
||||||
# Automatically respond to ping if configured to accept
|
|
||||||
if self.config.ping_response_accept:
|
|
||||||
self._log_info(f"Auto-responding to ping with accept={self.config.ping_response_accept}")
|
|
||||||
try:
|
|
||||||
# Schedule the response with a small delay to simulate real behavior
|
|
||||||
timer = threading.Timer(0.5, self._respond_to_ping, args=[index])
|
|
||||||
timer.daemon = True
|
|
||||||
timer.start()
|
|
||||||
self.timer_tasks.append(timer)
|
|
||||||
except Exception as e:
|
|
||||||
self._log_error(f"Failed to auto-respond to ping: {e}")
|
|
||||||
|
|
||||||
def handle_ping_response_received(self, accepted: bool):
|
|
||||||
"""
|
|
||||||
Handle a received ping response.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
accepted: Whether the ping was accepted
|
|
||||||
"""
|
|
||||||
if not self.active:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.ping_attempts = 0 # Reset ping attempts counter
|
|
||||||
|
|
||||||
if accepted:
|
|
||||||
self._log_info("Ping accepted! Proceeding with handshake")
|
|
||||||
# Send handshake if not already done
|
|
||||||
if self.state != "handshake_sent":
|
|
||||||
self._ensure_ephemeral_keys()
|
|
||||||
self._start_handshake_sequence()
|
|
||||||
else:
|
|
||||||
self._log_info("Ping rejected by peer. Stopping auto-protocol sequence.")
|
|
||||||
self.state = "idle"
|
|
||||||
|
|
||||||
def handle_handshake_received(self, index: int):
|
|
||||||
"""
|
|
||||||
Handle a received handshake.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
index: Index of the handshake in the protocol's inbound message queue
|
|
||||||
"""
|
|
||||||
if not self.active or not self._is_valid_message_index(index):
|
|
||||||
return
|
|
||||||
|
|
||||||
self._log_info(f"Handshake received (index={index})")
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Ensure we have ephemeral keys
|
|
||||||
self._ensure_ephemeral_keys()
|
|
||||||
|
|
||||||
# Process the handshake (compute ECDH)
|
|
||||||
self.protocol.generate_ecdhe(index)
|
|
||||||
|
|
||||||
# Derive HKDF key
|
|
||||||
self.protocol.derive_hkdf()
|
|
||||||
|
|
||||||
# If we haven't sent our handshake yet, send it
|
|
||||||
if self.state != "handshake_sent":
|
|
||||||
timer = threading.Timer(0.5, self.protocol.send_handshake)
|
|
||||||
timer.daemon = True
|
|
||||||
timer.start()
|
|
||||||
self.timer_tasks.append(timer)
|
|
||||||
self.state = "handshake_sent"
|
|
||||||
else:
|
|
||||||
self.state = "key_exchange_complete"
|
|
||||||
|
|
||||||
# Start sending queued messages if auto messaging is enabled
|
|
||||||
if self.config.auto_message_enabled:
|
|
||||||
self._start_message_sequence()
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
self._log_error(f"Failed to process handshake: {e}")
|
|
||||||
|
|
||||||
def handle_encrypted_received(self, index: int):
|
|
||||||
"""
|
|
||||||
Handle a received encrypted message.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
index: Index of the encrypted message in the protocol's inbound message queue
|
|
||||||
"""
|
|
||||||
if not self.active or not self._is_valid_message_index(index):
|
|
||||||
return
|
|
||||||
|
|
||||||
# Try to decrypt automatically
|
|
||||||
try:
|
|
||||||
plaintext = self.protocol.decrypt_received_message(index)
|
|
||||||
self._log_info(f"Auto-decrypted message: {plaintext}")
|
|
||||||
except Exception as e:
|
|
||||||
self._log_error(f"Failed to auto-decrypt message: {e}")
|
|
||||||
|
|
||||||
def queue_message(self, message: str):
|
|
||||||
"""
|
|
||||||
Add a message to the auto-send queue.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
message: Message text to send
|
|
||||||
"""
|
|
||||||
self.message_queue.put(message)
|
|
||||||
self._log_info(f"Message queued for sending: {message}")
|
|
||||||
|
|
||||||
# If we're in the right state, start sending messages
|
|
||||||
if self.active and self.state == "key_exchange_complete" and self.config.auto_message_enabled:
|
|
||||||
self._process_message_queue()
|
|
||||||
|
|
||||||
def _start_ping_sequence(self):
|
|
||||||
"""Start the ping sequence to discover the peer."""
|
|
||||||
if self.ping_attempts >= self.config.ping_retry_count:
|
|
||||||
self._log_warning(f"Maximum ping attempts ({self.config.ping_retry_count}) reached")
|
|
||||||
self.state = "idle"
|
|
||||||
return
|
|
||||||
|
|
||||||
self.state = "pinging"
|
|
||||||
self.ping_attempts += 1
|
|
||||||
|
|
||||||
self._log_info(f"Sending ping request (attempt {self.ping_attempts}/{self.config.ping_retry_count})")
|
|
||||||
try:
|
|
||||||
self.protocol.send_ping_request(self.config.preferred_cipher)
|
|
||||||
self.last_action_time = time.time()
|
|
||||||
|
|
||||||
# Schedule next ping attempt if needed
|
|
||||||
timer = threading.Timer(
|
|
||||||
self.config.ping_retry_delay,
|
|
||||||
self._check_ping_response
|
|
||||||
)
|
|
||||||
timer.daemon = True
|
|
||||||
timer.start()
|
|
||||||
self.timer_tasks.append(timer)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
self._log_error(f"Failed to send ping: {e}")
|
|
||||||
|
|
||||||
def _check_ping_response(self):
|
|
||||||
"""Check if we got a ping response, retry if not."""
|
|
||||||
if not self.active or self.state != "pinging":
|
|
||||||
return
|
|
||||||
|
|
||||||
# If we've waited long enough for a response, retry
|
|
||||||
if time.time() - self.last_action_time >= self.config.ping_timeout:
|
|
||||||
self._log_warning("No ping response received, retrying")
|
|
||||||
self._start_ping_sequence()
|
|
||||||
|
|
||||||
def _respond_to_ping(self, index: int):
|
|
||||||
"""
|
|
||||||
Respond to a ping request.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
index: Index of the ping request in the inbound messages
|
|
||||||
"""
|
|
||||||
if not self.active or not self._is_valid_message_index(index):
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
answer = 1 if self.config.ping_response_accept else 0
|
|
||||||
self.protocol.respond_to_ping(index, answer)
|
|
||||||
|
|
||||||
if answer == 1:
|
|
||||||
# If we accepted, we should expect a handshake
|
|
||||||
self.state = "accepted_ping"
|
|
||||||
self._ensure_ephemeral_keys()
|
|
||||||
|
|
||||||
# Set a timer to send our handshake if we don't receive one
|
|
||||||
timer = threading.Timer(
|
|
||||||
self.config.handshake_timeout,
|
|
||||||
self._check_handshake_received
|
|
||||||
)
|
|
||||||
timer.daemon = True
|
|
||||||
timer.start()
|
|
||||||
self.timer_tasks.append(timer)
|
|
||||||
self.last_action_time = time.time()
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
self._log_error(f"Failed to respond to ping: {e}")
|
|
||||||
|
|
||||||
def _check_handshake_received(self):
|
|
||||||
"""Check if we've received a handshake after accepting a ping."""
|
|
||||||
if not self.active or self.state != "accepted_ping":
|
|
||||||
return
|
|
||||||
|
|
||||||
# If we've waited long enough and haven't received a handshake, initiate one
|
|
||||||
if time.time() - self.last_action_time >= self.config.handshake_timeout:
|
|
||||||
self._log_warning("No handshake received after accepting ping, initiating handshake")
|
|
||||||
self._start_handshake_sequence()
|
|
||||||
|
|
||||||
def _start_handshake_sequence(self):
|
|
||||||
"""Start the handshake sequence."""
|
|
||||||
if self.handshake_attempts >= self.config.handshake_retry_count:
|
|
||||||
self._log_warning(f"Maximum handshake attempts ({self.config.handshake_retry_count}) reached")
|
|
||||||
self.state = "idle"
|
|
||||||
return
|
|
||||||
|
|
||||||
self.state = "handshake_sent"
|
|
||||||
self.handshake_attempts += 1
|
|
||||||
|
|
||||||
self._log_info(f"Sending handshake (attempt {self.handshake_attempts}/{self.config.handshake_retry_count})")
|
|
||||||
try:
|
|
||||||
self.protocol.send_handshake()
|
|
||||||
self.last_action_time = time.time()
|
|
||||||
|
|
||||||
# Schedule handshake retry check
|
|
||||||
timer = threading.Timer(
|
|
||||||
self.config.handshake_retry_delay,
|
|
||||||
self._check_handshake_response
|
|
||||||
)
|
|
||||||
timer.daemon = True
|
|
||||||
timer.start()
|
|
||||||
self.timer_tasks.append(timer)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
self._log_error(f"Failed to send handshake: {e}")
|
|
||||||
|
|
||||||
def _check_handshake_response(self):
|
|
||||||
"""Check if we've completed the key exchange, retry handshake if not."""
|
|
||||||
if not self.active or self.state != "handshake_sent":
|
|
||||||
return
|
|
||||||
|
|
||||||
# If we've waited long enough for a response, retry
|
|
||||||
if time.time() - self.last_action_time >= self.config.handshake_timeout:
|
|
||||||
self._log_warning("No handshake response received, retrying")
|
|
||||||
self._start_handshake_sequence()
|
|
||||||
|
|
||||||
def _start_message_sequence(self):
|
|
||||||
"""Start the automated message sending sequence."""
|
|
||||||
if not self.config.auto_message_enabled:
|
|
||||||
return
|
|
||||||
|
|
||||||
self._log_info("Starting automated message sequence")
|
|
||||||
|
|
||||||
# Add the default message if queue is empty
|
|
||||||
if self.message_queue.empty():
|
|
||||||
self.message_queue.put(self.config.message_content)
|
|
||||||
|
|
||||||
# Start processing the queue
|
|
||||||
self._process_message_queue()
|
|
||||||
|
|
||||||
def _process_message_queue(self):
|
|
||||||
"""Process messages in the queue and send them."""
|
|
||||||
if not self.active or self.state != "key_exchange_complete" or not self.config.auto_message_enabled:
|
|
||||||
return
|
|
||||||
|
|
||||||
if not self.message_queue.empty():
|
|
||||||
message = self.message_queue.get()
|
|
||||||
self._log_info(f"Sending queued message: {message}")
|
|
||||||
|
|
||||||
try:
|
|
||||||
self.protocol.send_encrypted_message(message)
|
|
||||||
|
|
||||||
# Schedule next message send
|
|
||||||
timer = threading.Timer(
|
|
||||||
self.config.message_interval,
|
|
||||||
self._process_message_queue
|
|
||||||
)
|
|
||||||
timer.daemon = True
|
|
||||||
timer.start()
|
|
||||||
self.timer_tasks.append(timer)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
self._log_error(f"Failed to send queued message: {e}")
|
|
||||||
# Put the message back in the queue
|
|
||||||
self.message_queue.put(message)
|
|
||||||
|
|
||||||
def _ensure_ephemeral_keys(self):
|
|
||||||
"""Ensure ephemeral keys are generated if needed."""
|
|
||||||
if not hasattr(self.protocol, 'ephemeral_pubkey') or self.protocol.ephemeral_pubkey is None:
|
|
||||||
self._log_info("Generating ephemeral keys")
|
|
||||||
self.protocol.generate_ephemeral_keys()
|
|
||||||
|
|
||||||
def _is_valid_message_index(self, index: int) -> bool:
|
|
||||||
"""
|
|
||||||
Check if a message index is valid in the protocol's inbound_messages queue.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
index: The index to check
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool: True if the index is valid, False otherwise
|
|
||||||
"""
|
|
||||||
if not hasattr(self.protocol, 'inbound_messages'):
|
|
||||||
self._log_error("Protocol has no inbound_messages attribute")
|
|
||||||
return False
|
|
||||||
|
|
||||||
if index < 0 or index >= len(self.protocol.inbound_messages):
|
|
||||||
self._log_error(f"Invalid message index: {index}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
# Helper methods for logging
|
|
||||||
def _log_info(self, message: str):
|
|
||||||
print(f"{BLUE}[AUTO]{RESET} {message}")
|
|
||||||
if hasattr(self, 'verbose_logging') and self.verbose_logging:
|
|
||||||
state_info = f"(state={self.state})"
|
|
||||||
if 'pinging' in self.state and hasattr(self, 'ping_attempts'):
|
|
||||||
state_info += f", attempts={self.ping_attempts}/{self.config.ping_retry_count}"
|
|
||||||
elif 'handshake' in self.state and hasattr(self, 'handshake_attempts'):
|
|
||||||
state_info += f", attempts={self.handshake_attempts}/{self.config.handshake_retry_count}"
|
|
||||||
print(f"{BLUE}[AUTO-DETAIL]{RESET} {state_info}")
|
|
||||||
|
|
||||||
def _log_warning(self, message: str):
|
|
||||||
print(f"{YELLOW}[AUTO-WARN]{RESET} {message}")
|
|
||||||
if hasattr(self, 'verbose_logging') and self.verbose_logging:
|
|
||||||
timer_info = f"Active timers: {len(self.timer_tasks)}"
|
|
||||||
print(f"{YELLOW}[AUTO-WARN-DETAIL]{RESET} {timer_info}")
|
|
||||||
|
|
||||||
def _log_error(self, message: str):
|
|
||||||
print(f"{RED}[AUTO-ERROR]{RESET} {message}")
|
|
||||||
if hasattr(self, 'verbose_logging') and self.verbose_logging:
|
|
||||||
print(f"{RED}[AUTO-ERROR-DETAIL]{RESET} Current state: {self.state}, Active: {self.active}")
|
|
@ -1,328 +0,0 @@
|
|||||||
import sys
|
|
||||||
import argparse
|
|
||||||
import shlex
|
|
||||||
from protocol import IcingProtocol
|
|
||||||
|
|
||||||
RED = "\033[91m"
|
|
||||||
GREEN = "\033[92m"
|
|
||||||
YELLOW = "\033[93m"
|
|
||||||
BLUE = "\033[94m"
|
|
||||||
MAGENTA = "\033[95m"
|
|
||||||
CYAN = "\033[96m"
|
|
||||||
RESET = "\033[0m"
|
|
||||||
|
|
||||||
def print_help():
|
|
||||||
"""Display all available commands."""
|
|
||||||
print(f"\n{YELLOW}=== Available Commands ==={RESET}")
|
|
||||||
print(f"\n{CYAN}Basic Protocol Commands:{RESET}")
|
|
||||||
print(" help - Show this help message")
|
|
||||||
print(" peer_id <hex_pubkey> - Set peer identity public key")
|
|
||||||
print(" connect <port> - Connect to a peer at the specified port")
|
|
||||||
print(" show_state - Display current protocol state")
|
|
||||||
print(" exit - Exit the program")
|
|
||||||
|
|
||||||
print(f"\n{CYAN}Manual Protocol Operation:{RESET}")
|
|
||||||
print(" generate_ephemeral_keys - Generate ephemeral ECDH keys")
|
|
||||||
print(" send_ping [cipher] - Send PING request (cipher: 0=AES-GCM, 1=ChaCha20-Poly1305, default: 0)")
|
|
||||||
print(" respond_ping <index> <0|1> - Respond to a PING (0=reject, 1=accept)")
|
|
||||||
print(" send_handshake - Send handshake with ephemeral keys")
|
|
||||||
print(" generate_ecdhe <index> - Process handshake at specified index")
|
|
||||||
print(" derive_hkdf - Derive encryption key using HKDF")
|
|
||||||
print(" send_encrypted <plaintext> - Encrypt and send a message")
|
|
||||||
print(" decrypt <index> - Decrypt received message at index")
|
|
||||||
|
|
||||||
print(f"\n{CYAN}Automatic Mode Commands:{RESET}")
|
|
||||||
print(" auto start - Start automatic mode")
|
|
||||||
print(" auto stop - Stop automatic mode")
|
|
||||||
print(" auto status - Show current auto mode status and configuration")
|
|
||||||
print(" auto config <param> <value> - Configure auto mode parameters")
|
|
||||||
print(" auto config list - Show all configurable parameters")
|
|
||||||
print(" auto message <text> - Queue message for automatic sending")
|
|
||||||
print(" auto passive - Configure as passive peer (responds to pings but doesn't initiate)")
|
|
||||||
print(" auto active - Configure as active peer (initiates protocol)")
|
|
||||||
print(" auto log - Toggle detailed logging for auto mode")
|
|
||||||
|
|
||||||
print(f"\n{CYAN}Debugging Commands:{RESET}")
|
|
||||||
print(" debug_message <index> - Display detailed information about a message in the queue")
|
|
||||||
|
|
||||||
print(f"\n{CYAN}Legacy Commands:{RESET}")
|
|
||||||
print(" auto_responder <on|off> - Enable/disable legacy auto responder (deprecated)")
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
protocol = IcingProtocol()
|
|
||||||
|
|
||||||
print(f"{YELLOW}\n======================================")
|
|
||||||
print(" Icing Protocol - Secure Communication ")
|
|
||||||
print("======================================\n" + RESET)
|
|
||||||
print(f"Listening on port: {protocol.local_port}")
|
|
||||||
print(f"Your identity public key (hex): {protocol.identity_pubkey.hex()}")
|
|
||||||
print_help()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
try:
|
|
||||||
line = input(f"{MAGENTA}Cmd>{RESET} ").strip()
|
|
||||||
except EOFError:
|
|
||||||
break
|
|
||||||
if not line:
|
|
||||||
continue
|
|
||||||
|
|
||||||
parts = shlex.split(line) # Handle quoted arguments properly
|
|
||||||
cmd = parts[0].lower()
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Basic commands
|
|
||||||
if cmd == "exit":
|
|
||||||
protocol.stop()
|
|
||||||
break
|
|
||||||
|
|
||||||
elif cmd == "help":
|
|
||||||
print_help()
|
|
||||||
|
|
||||||
elif cmd == "show_state":
|
|
||||||
protocol.show_state()
|
|
||||||
|
|
||||||
elif cmd == "peer_id":
|
|
||||||
if len(parts) != 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: peer_id <hex_pubkey>")
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
protocol.set_peer_identity(parts[1])
|
|
||||||
except ValueError as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Invalid public key: {e}")
|
|
||||||
|
|
||||||
elif cmd == "connect":
|
|
||||||
if len(parts) != 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: connect <port>")
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
port = int(parts[1])
|
|
||||||
protocol.connect_to_peer(port)
|
|
||||||
except ValueError:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Invalid port number.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Connection failed: {e}")
|
|
||||||
|
|
||||||
# Manual protocol operation
|
|
||||||
elif cmd == "generate_ephemeral_keys":
|
|
||||||
protocol.generate_ephemeral_keys()
|
|
||||||
|
|
||||||
elif cmd == "send_ping":
|
|
||||||
# Optional cipher parameter (0 = AES-GCM, 1 = ChaCha20-Poly1305)
|
|
||||||
cipher = 0 # Default to AES-GCM
|
|
||||||
if len(parts) >= 2:
|
|
||||||
try:
|
|
||||||
cipher = int(parts[1])
|
|
||||||
if cipher not in (0, 1):
|
|
||||||
print(f"{YELLOW}[WARNING]{RESET} Unsupported cipher code {cipher}. Using AES-GCM (0).")
|
|
||||||
cipher = 0
|
|
||||||
except ValueError:
|
|
||||||
print(f"{YELLOW}[WARNING]{RESET} Invalid cipher code. Using AES-GCM (0).")
|
|
||||||
protocol.send_ping_request(cipher)
|
|
||||||
|
|
||||||
elif cmd == "send_handshake":
|
|
||||||
protocol.send_handshake()
|
|
||||||
|
|
||||||
elif cmd == "respond_ping":
|
|
||||||
if len(parts) != 3:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: respond_ping <index> <0|1>")
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
idx = int(parts[1])
|
|
||||||
answer = int(parts[2])
|
|
||||||
if answer not in (0, 1):
|
|
||||||
print(f"{RED}[ERROR]{RESET} Answer must be 0 (reject) or 1 (accept).")
|
|
||||||
continue
|
|
||||||
protocol.respond_to_ping(idx, answer)
|
|
||||||
except ValueError:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Index and answer must be integers.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Failed to respond to ping: {e}")
|
|
||||||
|
|
||||||
elif cmd == "generate_ecdhe":
|
|
||||||
if len(parts) != 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: generate_ecdhe <index>")
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
idx = int(parts[1])
|
|
||||||
protocol.generate_ecdhe(idx)
|
|
||||||
except ValueError:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Index must be an integer.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Failed to process handshake: {e}")
|
|
||||||
|
|
||||||
elif cmd == "derive_hkdf":
|
|
||||||
try:
|
|
||||||
protocol.derive_hkdf()
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Failed to derive HKDF key: {e}")
|
|
||||||
|
|
||||||
elif cmd == "send_encrypted":
|
|
||||||
if len(parts) < 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: send_encrypted <plaintext>")
|
|
||||||
continue
|
|
||||||
plaintext = " ".join(parts[1:])
|
|
||||||
try:
|
|
||||||
protocol.send_encrypted_message(plaintext)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Failed to send encrypted message: {e}")
|
|
||||||
|
|
||||||
elif cmd == "decrypt":
|
|
||||||
if len(parts) != 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: decrypt <index>")
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
idx = int(parts[1])
|
|
||||||
protocol.decrypt_received_message(idx)
|
|
||||||
except ValueError:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Index must be an integer.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Failed to decrypt message: {e}")
|
|
||||||
|
|
||||||
# Debugging commands
|
|
||||||
elif cmd == "debug_message":
|
|
||||||
if len(parts) != 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: debug_message <index>")
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
idx = int(parts[1])
|
|
||||||
protocol.debug_message(idx)
|
|
||||||
except ValueError:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Index must be an integer.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Failed to debug message: {e}")
|
|
||||||
|
|
||||||
# Automatic mode commands
|
|
||||||
elif cmd == "auto":
|
|
||||||
if len(parts) < 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: auto <command> [options]")
|
|
||||||
print("Available commands: start, stop, status, config, message, passive, active")
|
|
||||||
continue
|
|
||||||
|
|
||||||
subcmd = parts[1].lower()
|
|
||||||
|
|
||||||
if subcmd == "start":
|
|
||||||
protocol.start_auto_mode()
|
|
||||||
print(f"{GREEN}[AUTO]{RESET} Automatic mode started")
|
|
||||||
|
|
||||||
elif subcmd == "stop":
|
|
||||||
protocol.stop_auto_mode()
|
|
||||||
print(f"{GREEN}[AUTO]{RESET} Automatic mode stopped")
|
|
||||||
|
|
||||||
elif subcmd == "status":
|
|
||||||
config = protocol.get_auto_mode_config()
|
|
||||||
print(f"{YELLOW}=== Auto Mode Status ==={RESET}")
|
|
||||||
print(f"Active: {protocol.auto_mode.active}")
|
|
||||||
print(f"State: {protocol.auto_mode.state}")
|
|
||||||
print(f"\n{YELLOW}--- Configuration ---{RESET}")
|
|
||||||
for key, value in vars(config).items():
|
|
||||||
print(f" {key}: {value}")
|
|
||||||
|
|
||||||
elif subcmd == "config":
|
|
||||||
if len(parts) < 3:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: auto config <param> <value> or auto config list")
|
|
||||||
continue
|
|
||||||
|
|
||||||
if parts[2].lower() == "list":
|
|
||||||
config = protocol.get_auto_mode_config()
|
|
||||||
print(f"{YELLOW}=== Auto Mode Configuration Parameters ==={RESET}")
|
|
||||||
for key, value in vars(config).items():
|
|
||||||
print(f" {key} ({type(value).__name__}): {value}")
|
|
||||||
continue
|
|
||||||
|
|
||||||
if len(parts) != 4:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: auto config <param> <value>")
|
|
||||||
continue
|
|
||||||
|
|
||||||
param = parts[2]
|
|
||||||
value_str = parts[3]
|
|
||||||
|
|
||||||
# Convert the string value to the appropriate type
|
|
||||||
config = protocol.get_auto_mode_config()
|
|
||||||
if not hasattr(config, param):
|
|
||||||
print(f"{RED}[ERROR]{RESET} Unknown parameter: {param}")
|
|
||||||
print("Use 'auto config list' to see all available parameters")
|
|
||||||
continue
|
|
||||||
|
|
||||||
current_value = getattr(config, param)
|
|
||||||
try:
|
|
||||||
if isinstance(current_value, bool):
|
|
||||||
if value_str.lower() in ("true", "yes", "on", "1"):
|
|
||||||
value = True
|
|
||||||
elif value_str.lower() in ("false", "no", "off", "0"):
|
|
||||||
value = False
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Boolean value must be true/false/yes/no/on/off/1/0")
|
|
||||||
elif isinstance(current_value, int):
|
|
||||||
value = int(value_str)
|
|
||||||
elif isinstance(current_value, float):
|
|
||||||
value = float(value_str)
|
|
||||||
elif isinstance(current_value, str):
|
|
||||||
value = value_str
|
|
||||||
else:
|
|
||||||
value = value_str # Default to string
|
|
||||||
|
|
||||||
protocol.configure_auto_mode(**{param: value})
|
|
||||||
print(f"{GREEN}[AUTO]{RESET} Set {param} = {value}")
|
|
||||||
|
|
||||||
except ValueError as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Invalid value for {param}: {e}")
|
|
||||||
|
|
||||||
elif subcmd == "message":
|
|
||||||
if len(parts) < 3:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: auto message <text>")
|
|
||||||
continue
|
|
||||||
|
|
||||||
message = " ".join(parts[2:])
|
|
||||||
protocol.queue_auto_message(message)
|
|
||||||
print(f"{GREEN}[AUTO]{RESET} Message queued for sending: {message}")
|
|
||||||
|
|
||||||
elif subcmd == "passive":
|
|
||||||
# Configure as passive peer (responds but doesn't initiate)
|
|
||||||
protocol.configure_auto_mode(
|
|
||||||
ping_response_accept=True,
|
|
||||||
ping_auto_initiate=False,
|
|
||||||
active_mode=False
|
|
||||||
)
|
|
||||||
print(f"{GREEN}[AUTO]{RESET} Configured as passive peer")
|
|
||||||
|
|
||||||
elif subcmd == "active":
|
|
||||||
# Configure as active peer (initiates protocol)
|
|
||||||
protocol.configure_auto_mode(
|
|
||||||
ping_response_accept=True,
|
|
||||||
ping_auto_initiate=True,
|
|
||||||
active_mode=True
|
|
||||||
)
|
|
||||||
print(f"{GREEN}[AUTO]{RESET} Configured as active peer")
|
|
||||||
|
|
||||||
else:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Unknown auto mode command: {subcmd}")
|
|
||||||
print("Available commands: start, stop, status, config, message, passive, active")
|
|
||||||
|
|
||||||
# Legacy commands
|
|
||||||
elif cmd == "auto_responder":
|
|
||||||
if len(parts) != 2:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Usage: auto_responder <on|off>")
|
|
||||||
continue
|
|
||||||
val = parts[1].lower()
|
|
||||||
if val not in ("on", "off"):
|
|
||||||
print(f"{RED}[ERROR]{RESET} Value must be 'on' or 'off'.")
|
|
||||||
continue
|
|
||||||
protocol.enable_auto_responder(val == "on")
|
|
||||||
print(f"{YELLOW}[WARNING]{RESET} Using legacy auto responder. Consider using 'auto' commands instead.")
|
|
||||||
|
|
||||||
else:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Unknown command: {cmd}")
|
|
||||||
print("Type 'help' for a list of available commands.")
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[ERROR]{RESET} Command failed: {e}")
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
try:
|
|
||||||
main()
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
print("\nExiting...")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[FATAL ERROR]{RESET} {e}")
|
|
||||||
sys.exit(1)
|
|
@ -1,165 +0,0 @@
|
|||||||
import os
|
|
||||||
from typing import Tuple
|
|
||||||
from cryptography.exceptions import InvalidSignature
|
|
||||||
from cryptography.hazmat.primitives import hashes, serialization
|
|
||||||
from cryptography.hazmat.primitives.asymmetric import ec, utils
|
|
||||||
from cryptography.hazmat.primitives.asymmetric.utils import decode_dss_signature, encode_dss_signature
|
|
||||||
|
|
||||||
def generate_identity_keys() -> Tuple[ec.EllipticCurvePrivateKey, bytes]:
|
|
||||||
"""
|
|
||||||
Generate an ECDSA (P-256) identity key pair.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tuple containing:
|
|
||||||
- private_key: EllipticCurvePrivateKey object
|
|
||||||
- public_key_bytes: Raw x||y format (64 bytes, 512 bits)
|
|
||||||
"""
|
|
||||||
private_key = ec.generate_private_key(ec.SECP256R1())
|
|
||||||
public_numbers = private_key.public_key().public_numbers()
|
|
||||||
|
|
||||||
x_bytes = public_numbers.x.to_bytes(32, byteorder='big')
|
|
||||||
y_bytes = public_numbers.y.to_bytes(32, byteorder='big')
|
|
||||||
pubkey_bytes = x_bytes + y_bytes # 64 bytes total
|
|
||||||
|
|
||||||
return private_key, pubkey_bytes
|
|
||||||
|
|
||||||
|
|
||||||
def load_peer_identity_key(pubkey_bytes: bytes) -> ec.EllipticCurvePublicKey:
|
|
||||||
"""
|
|
||||||
Convert a raw public key (64 bytes, x||y format) to a cryptography public key object.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
pubkey_bytes: Raw 64-byte public key (x||y format)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
EllipticCurvePublicKey object
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: If the pubkey_bytes is not exactly 64 bytes
|
|
||||||
"""
|
|
||||||
if len(pubkey_bytes) != 64:
|
|
||||||
raise ValueError("Peer identity pubkey must be exactly 64 bytes (x||y).")
|
|
||||||
|
|
||||||
x_int = int.from_bytes(pubkey_bytes[:32], byteorder='big')
|
|
||||||
y_int = int.from_bytes(pubkey_bytes[32:], byteorder='big')
|
|
||||||
|
|
||||||
public_numbers = ec.EllipticCurvePublicNumbers(x_int, y_int, ec.SECP256R1())
|
|
||||||
return public_numbers.public_key()
|
|
||||||
|
|
||||||
|
|
||||||
def sign_data(private_key: ec.EllipticCurvePrivateKey, data: bytes) -> bytes:
|
|
||||||
"""
|
|
||||||
Sign data with ECDSA using a P-256 private key.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
private_key: EllipticCurvePrivateKey for signing
|
|
||||||
data: Bytes to sign
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
DER-encoded signature (variable length, up to ~70-72 bytes)
|
|
||||||
"""
|
|
||||||
signature = private_key.sign(data, ec.ECDSA(hashes.SHA256()))
|
|
||||||
return signature
|
|
||||||
|
|
||||||
|
|
||||||
def verify_signature(public_key: ec.EllipticCurvePublicKey, signature: bytes, data: bytes) -> bool:
|
|
||||||
"""
|
|
||||||
Verify a DER-encoded ECDSA signature.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
public_key: EllipticCurvePublicKey for verification
|
|
||||||
signature: DER-encoded signature
|
|
||||||
data: Original signed data
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
True if signature is valid, False otherwise
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
public_key.verify(signature, data, ec.ECDSA(hashes.SHA256()))
|
|
||||||
return True
|
|
||||||
except InvalidSignature:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def get_ephemeral_keypair() -> Tuple[ec.EllipticCurvePrivateKey, bytes]:
|
|
||||||
"""
|
|
||||||
Generate an ephemeral ECDH key pair (P-256).
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tuple containing:
|
|
||||||
- private_key: EllipticCurvePrivateKey object
|
|
||||||
- pubkey_bytes: Raw x||y format (64 bytes, 512 bits)
|
|
||||||
"""
|
|
||||||
private_key = ec.generate_private_key(ec.SECP256R1())
|
|
||||||
numbers = private_key.public_key().public_numbers()
|
|
||||||
|
|
||||||
x_bytes = numbers.x.to_bytes(32, 'big')
|
|
||||||
y_bytes = numbers.y.to_bytes(32, 'big')
|
|
||||||
|
|
||||||
return private_key, x_bytes + y_bytes # 64 bytes total
|
|
||||||
|
|
||||||
|
|
||||||
def compute_ecdh_shared_key(private_key: ec.EllipticCurvePrivateKey, peer_pubkey_bytes: bytes) -> bytes:
|
|
||||||
"""
|
|
||||||
Compute a shared secret using ECDH.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
private_key: Local ECDH private key
|
|
||||||
peer_pubkey_bytes: Peer's ephemeral public key (64 bytes, raw x||y format)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Shared secret bytes
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: If peer_pubkey_bytes is not 64 bytes
|
|
||||||
"""
|
|
||||||
if len(peer_pubkey_bytes) != 64:
|
|
||||||
raise ValueError("Peer public key must be 64 bytes (x||y format)")
|
|
||||||
|
|
||||||
x_int = int.from_bytes(peer_pubkey_bytes[:32], 'big')
|
|
||||||
y_int = int.from_bytes(peer_pubkey_bytes[32:], 'big')
|
|
||||||
|
|
||||||
# Create public key object from raw components
|
|
||||||
peer_public_numbers = ec.EllipticCurvePublicNumbers(x_int, y_int, ec.SECP256R1())
|
|
||||||
peer_public_key = peer_public_numbers.public_key()
|
|
||||||
|
|
||||||
# Perform key exchange
|
|
||||||
shared_key = private_key.exchange(ec.ECDH(), peer_public_key)
|
|
||||||
return shared_key
|
|
||||||
|
|
||||||
|
|
||||||
def der_to_raw(der_sig: bytes) -> bytes:
|
|
||||||
"""
|
|
||||||
Convert a DER-encoded ECDSA signature to a raw 64-byte signature (r||s).
|
|
||||||
|
|
||||||
Args:
|
|
||||||
der_sig: DER-encoded signature
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Raw 64-byte signature (r||s format), with each component padded to 32 bytes
|
|
||||||
"""
|
|
||||||
r, s = decode_dss_signature(der_sig)
|
|
||||||
r_bytes = r.to_bytes(32, byteorder='big')
|
|
||||||
s_bytes = s.to_bytes(32, byteorder='big')
|
|
||||||
return r_bytes + s_bytes
|
|
||||||
|
|
||||||
|
|
||||||
def raw_signature_to_der(raw_sig: bytes) -> bytes:
|
|
||||||
"""
|
|
||||||
Convert a raw signature (64 bytes, concatenated r||s) to DER-encoded signature.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
raw_sig: Raw 64-byte signature (r||s format)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
DER-encoded signature
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: If raw_sig is not 64 bytes
|
|
||||||
"""
|
|
||||||
if len(raw_sig) != 64:
|
|
||||||
raise ValueError("Raw signature must be 64 bytes (r||s).")
|
|
||||||
|
|
||||||
r = int.from_bytes(raw_sig[:32], 'big')
|
|
||||||
s = int.from_bytes(raw_sig[32:], 'big')
|
|
||||||
return encode_dss_signature(r, s)
|
|
@ -1,307 +0,0 @@
|
|||||||
import os
|
|
||||||
import struct
|
|
||||||
from typing import Optional, Tuple
|
|
||||||
from cryptography.hazmat.primitives.ciphers.aead import AESGCM, ChaCha20Poly1305
|
|
||||||
|
|
||||||
class MessageHeader:
|
|
||||||
"""
|
|
||||||
Header of an encrypted message (18 bytes total):
|
|
||||||
|
|
||||||
Clear Text Section (4 bytes):
|
|
||||||
- flag: 16 bits (0xBEEF by default)
|
|
||||||
- data_len: 16 bits (length of encrypted payload excluding tag)
|
|
||||||
|
|
||||||
Associated Data (14 bytes):
|
|
||||||
- retry: 8 bits (retry counter)
|
|
||||||
- connection_status: 4 bits (e.g., CRC required) + 4 bits padding
|
|
||||||
- iv/messageID: 96 bits (12 bytes)
|
|
||||||
"""
|
|
||||||
def __init__(self, flag: int, data_len: int, retry: int, connection_status: int, iv: bytes):
|
|
||||||
if not (0 <= flag < 65536):
|
|
||||||
raise ValueError("Flag must fit in 16 bits (0..65535)")
|
|
||||||
if not (0 <= data_len < 65536):
|
|
||||||
raise ValueError("Data length must fit in 16 bits (0..65535)")
|
|
||||||
if not (0 <= retry < 256):
|
|
||||||
raise ValueError("Retry must fit in 8 bits (0..255)")
|
|
||||||
if not (0 <= connection_status < 16):
|
|
||||||
raise ValueError("Connection status must fit in 4 bits (0..15)")
|
|
||||||
if len(iv) != 12:
|
|
||||||
raise ValueError("IV must be 12 bytes (96 bits)")
|
|
||||||
|
|
||||||
self.flag = flag # 16 bits
|
|
||||||
self.data_len = data_len # 16 bits
|
|
||||||
self.retry = retry # 8 bits
|
|
||||||
self.connection_status = connection_status # 4 bits
|
|
||||||
self.iv = iv # 96 bits (12 bytes)
|
|
||||||
|
|
||||||
def pack(self) -> bytes:
|
|
||||||
"""Pack header into 18 bytes."""
|
|
||||||
# Pack flag and data_len (4 bytes)
|
|
||||||
header = struct.pack('>H H', self.flag, self.data_len)
|
|
||||||
|
|
||||||
# Pack retry and connection_status (2 bytes)
|
|
||||||
# connection_status in high 4 bits of second byte, 4 bits padding as zero
|
|
||||||
ad_byte = (self.connection_status & 0x0F) << 4
|
|
||||||
ad_packed = struct.pack('>B B', self.retry, ad_byte)
|
|
||||||
|
|
||||||
# Append IV (12 bytes)
|
|
||||||
return header + ad_packed + self.iv
|
|
||||||
|
|
||||||
def get_associated_data(self) -> bytes:
|
|
||||||
"""Get the associated data for AEAD encryption (retry, conn_status, iv)."""
|
|
||||||
# Pack retry and connection_status
|
|
||||||
ad_byte = (self.connection_status & 0x0F) << 4
|
|
||||||
ad_packed = struct.pack('>B B', self.retry, ad_byte)
|
|
||||||
|
|
||||||
# Append IV
|
|
||||||
return ad_packed + self.iv
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def unpack(cls, data: bytes) -> 'MessageHeader':
|
|
||||||
"""Unpack 18 bytes into a MessageHeader object."""
|
|
||||||
if len(data) < 18:
|
|
||||||
raise ValueError(f"Header data too short: {len(data)} bytes, expected 18")
|
|
||||||
|
|
||||||
flag, data_len = struct.unpack('>H H', data[:4])
|
|
||||||
retry, ad_byte = struct.unpack('>B B', data[4:6])
|
|
||||||
connection_status = (ad_byte >> 4) & 0x0F
|
|
||||||
iv = data[6:18]
|
|
||||||
|
|
||||||
return cls(flag, data_len, retry, connection_status, iv)
|
|
||||||
|
|
||||||
class EncryptedMessage:
|
|
||||||
"""
|
|
||||||
Encrypted message packet format:
|
|
||||||
|
|
||||||
- Header (18 bytes):
|
|
||||||
* flag: 16 bits
|
|
||||||
* data_len: 16 bits
|
|
||||||
* retry: 8 bits
|
|
||||||
* connection_status: 4 bits (+ 4 bits padding)
|
|
||||||
* iv/messageID: 96 bits (12 bytes)
|
|
||||||
|
|
||||||
- Payload: variable length encrypted data
|
|
||||||
|
|
||||||
- Footer:
|
|
||||||
* Authentication tag: 128 bits (16 bytes)
|
|
||||||
* CRC32: 32 bits (4 bytes) - optional, based on connection_status
|
|
||||||
"""
|
|
||||||
def __init__(self, plaintext: bytes, key: bytes, flag: int = 0xBEEF,
|
|
||||||
retry: int = 0, connection_status: int = 0, iv: bytes = None,
|
|
||||||
cipher_type: int = 0):
|
|
||||||
self.plaintext = plaintext
|
|
||||||
self.key = key
|
|
||||||
self.flag = flag
|
|
||||||
self.retry = retry
|
|
||||||
self.connection_status = connection_status
|
|
||||||
self.iv = iv or generate_iv(initial=True)
|
|
||||||
self.cipher_type = cipher_type # 0 = AES-256-GCM, 1 = ChaCha20-Poly1305
|
|
||||||
|
|
||||||
# Will be set after encryption
|
|
||||||
self.ciphertext = None
|
|
||||||
self.tag = None
|
|
||||||
self.header = None
|
|
||||||
|
|
||||||
def encrypt(self) -> bytes:
|
|
||||||
"""Encrypt the plaintext and return the full encrypted message."""
|
|
||||||
# Create header with correct data_len (which will be set after encryption)
|
|
||||||
self.header = MessageHeader(
|
|
||||||
flag=self.flag,
|
|
||||||
data_len=0, # Will be updated after encryption
|
|
||||||
retry=self.retry,
|
|
||||||
connection_status=self.connection_status,
|
|
||||||
iv=self.iv
|
|
||||||
)
|
|
||||||
|
|
||||||
# Get associated data for AEAD
|
|
||||||
aad = self.header.get_associated_data()
|
|
||||||
|
|
||||||
# Encrypt using the appropriate cipher
|
|
||||||
if self.cipher_type == 0: # AES-256-GCM
|
|
||||||
cipher = AESGCM(self.key)
|
|
||||||
ciphertext_with_tag = cipher.encrypt(self.iv, self.plaintext, aad)
|
|
||||||
elif self.cipher_type == 1: # ChaCha20-Poly1305
|
|
||||||
cipher = ChaCha20Poly1305(self.key)
|
|
||||||
ciphertext_with_tag = cipher.encrypt(self.iv, self.plaintext, aad)
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unsupported cipher type: {self.cipher_type}")
|
|
||||||
|
|
||||||
# Extract ciphertext and tag
|
|
||||||
self.tag = ciphertext_with_tag[-16:]
|
|
||||||
self.ciphertext = ciphertext_with_tag[:-16]
|
|
||||||
|
|
||||||
# Update header with actual data length
|
|
||||||
self.header.data_len = len(self.ciphertext)
|
|
||||||
|
|
||||||
# Pack everything together
|
|
||||||
packed_header = self.header.pack()
|
|
||||||
|
|
||||||
# Check if CRC is required (based on connection_status)
|
|
||||||
if self.connection_status & 0x01: # Lowest bit indicates CRC required
|
|
||||||
import zlib
|
|
||||||
# Compute CRC32 of header + ciphertext + tag
|
|
||||||
crc = zlib.crc32(packed_header + self.ciphertext + self.tag) & 0xffffffff
|
|
||||||
crc_bytes = struct.pack('>I', crc)
|
|
||||||
return packed_header + self.ciphertext + self.tag + crc_bytes
|
|
||||||
else:
|
|
||||||
return packed_header + self.ciphertext + self.tag
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def decrypt(cls, data: bytes, key: bytes, cipher_type: int = 0) -> Tuple[bytes, MessageHeader]:
|
|
||||||
"""
|
|
||||||
Decrypt an encrypted message and return the plaintext and header.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
data: The full encrypted message
|
|
||||||
key: The encryption key
|
|
||||||
cipher_type: 0 for AES-256-GCM, 1 for ChaCha20-Poly1305
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tuple of (plaintext, header)
|
|
||||||
"""
|
|
||||||
if len(data) < 18 + 16: # Header + minimum tag size
|
|
||||||
raise ValueError("Message too short")
|
|
||||||
|
|
||||||
# Extract header
|
|
||||||
header_bytes = data[:18]
|
|
||||||
header = MessageHeader.unpack(header_bytes)
|
|
||||||
|
|
||||||
# Get ciphertext and tag
|
|
||||||
data_len = header.data_len
|
|
||||||
ciphertext_start = 18
|
|
||||||
ciphertext_end = ciphertext_start + data_len
|
|
||||||
|
|
||||||
if ciphertext_end + 16 > len(data):
|
|
||||||
raise ValueError("Message length does not match header's data_len")
|
|
||||||
|
|
||||||
ciphertext = data[ciphertext_start:ciphertext_end]
|
|
||||||
tag = data[ciphertext_end:ciphertext_end + 16]
|
|
||||||
|
|
||||||
# Get associated data for AEAD
|
|
||||||
aad = header.get_associated_data()
|
|
||||||
|
|
||||||
# Combine ciphertext and tag for decryption
|
|
||||||
ciphertext_with_tag = ciphertext + tag
|
|
||||||
|
|
||||||
# Decrypt using the appropriate cipher
|
|
||||||
try:
|
|
||||||
if cipher_type == 0: # AES-256-GCM
|
|
||||||
cipher = AESGCM(key)
|
|
||||||
plaintext = cipher.decrypt(header.iv, ciphertext_with_tag, aad)
|
|
||||||
elif cipher_type == 1: # ChaCha20-Poly1305
|
|
||||||
cipher = ChaCha20Poly1305(key)
|
|
||||||
plaintext = cipher.decrypt(header.iv, ciphertext_with_tag, aad)
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unsupported cipher type: {cipher_type}")
|
|
||||||
|
|
||||||
return plaintext, header
|
|
||||||
except Exception as e:
|
|
||||||
raise ValueError(f"Decryption failed: {e}")
|
|
||||||
|
|
||||||
def generate_iv(initial: bool = False, previous_iv: bytes = None) -> bytes:
|
|
||||||
"""
|
|
||||||
Generate a 96-bit IV (12 bytes).
|
|
||||||
|
|
||||||
Args:
|
|
||||||
initial: If True, return a random IV
|
|
||||||
previous_iv: The previous IV to increment
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
A new IV
|
|
||||||
"""
|
|
||||||
if initial or previous_iv is None:
|
|
||||||
return os.urandom(12) # 96 bits
|
|
||||||
else:
|
|
||||||
# Increment the previous IV by 1 modulo 2^96
|
|
||||||
iv_int = int.from_bytes(previous_iv, 'big')
|
|
||||||
iv_int = (iv_int + 1) % (1 << 96)
|
|
||||||
return iv_int.to_bytes(12, 'big')
|
|
||||||
|
|
||||||
# Convenience functions to match original API
|
|
||||||
def encrypt_message(plaintext: bytes, key: bytes, flag: int = 0xBEEF,
|
|
||||||
retry: int = 0, connection_status: int = 0,
|
|
||||||
iv: bytes = None, cipher_type: int = 0) -> bytes:
|
|
||||||
"""
|
|
||||||
Encrypt a message using the specified parameters.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
plaintext: The data to encrypt
|
|
||||||
key: The encryption key (32 bytes for AES-256-GCM, 32 bytes for ChaCha20-Poly1305)
|
|
||||||
flag: 16-bit flag value (default: 0xBEEF)
|
|
||||||
retry: 8-bit retry counter
|
|
||||||
connection_status: 4-bit connection status
|
|
||||||
iv: Optional 96-bit IV (if None, a random one will be generated)
|
|
||||||
cipher_type: 0 for AES-256-GCM, 1 for ChaCha20-Poly1305
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
The full encrypted message
|
|
||||||
"""
|
|
||||||
message = EncryptedMessage(
|
|
||||||
plaintext=plaintext,
|
|
||||||
key=key,
|
|
||||||
flag=flag,
|
|
||||||
retry=retry,
|
|
||||||
connection_status=connection_status,
|
|
||||||
iv=iv,
|
|
||||||
cipher_type=cipher_type
|
|
||||||
)
|
|
||||||
return message.encrypt()
|
|
||||||
|
|
||||||
def decrypt_message(message: bytes, key: bytes, cipher_type: int = 0) -> bytes:
|
|
||||||
"""
|
|
||||||
Decrypt a message.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
message: The full encrypted message
|
|
||||||
key: The encryption key
|
|
||||||
cipher_type: 0 for AES-256-GCM, 1 for ChaCha20-Poly1305
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
The decrypted plaintext
|
|
||||||
"""
|
|
||||||
plaintext, _ = EncryptedMessage.decrypt(message, key, cipher_type)
|
|
||||||
return plaintext
|
|
||||||
|
|
||||||
# ChaCha20-CTR functions for voice streaming (without authentication)
|
|
||||||
def chacha20_encrypt(plaintext: bytes, key: bytes, nonce: bytes) -> bytes:
|
|
||||||
"""
|
|
||||||
Encrypt plaintext using ChaCha20 in CTR mode (no authentication).
|
|
||||||
|
|
||||||
Args:
|
|
||||||
plaintext: Data to encrypt
|
|
||||||
key: 32-byte key
|
|
||||||
nonce: 16-byte nonce (for ChaCha20 in cryptography library)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Ciphertext
|
|
||||||
"""
|
|
||||||
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
|
|
||||||
from cryptography.hazmat.backends import default_backend
|
|
||||||
|
|
||||||
if len(key) != 32:
|
|
||||||
raise ValueError("ChaCha20 key must be 32 bytes")
|
|
||||||
if len(nonce) != 16:
|
|
||||||
raise ValueError("ChaCha20 nonce must be 16 bytes")
|
|
||||||
|
|
||||||
cipher = Cipher(
|
|
||||||
algorithms.ChaCha20(key, nonce),
|
|
||||||
mode=None,
|
|
||||||
backend=default_backend()
|
|
||||||
)
|
|
||||||
encryptor = cipher.encryptor()
|
|
||||||
return encryptor.update(plaintext) + encryptor.finalize()
|
|
||||||
|
|
||||||
def chacha20_decrypt(ciphertext: bytes, key: bytes, nonce: bytes) -> bytes:
|
|
||||||
"""
|
|
||||||
Decrypt ciphertext using ChaCha20 in CTR mode (no authentication).
|
|
||||||
|
|
||||||
Args:
|
|
||||||
ciphertext: Data to decrypt
|
|
||||||
key: 32-byte key
|
|
||||||
nonce: 12-byte nonce
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Plaintext
|
|
||||||
"""
|
|
||||||
# ChaCha20 is symmetrical - encryption and decryption are the same
|
|
||||||
return chacha20_encrypt(ciphertext, key, nonce)
|
|
@ -1,463 +0,0 @@
|
|||||||
import os
|
|
||||||
import struct
|
|
||||||
import time
|
|
||||||
import zlib
|
|
||||||
import hashlib
|
|
||||||
from typing import Tuple, Optional
|
|
||||||
|
|
||||||
def crc32_of(data: bytes) -> int:
|
|
||||||
"""
|
|
||||||
Compute CRC-32 of 'data'.
|
|
||||||
"""
|
|
||||||
return zlib.crc32(data) & 0xffffffff
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# PING REQUEST (new format)
|
|
||||||
# Fields (in order):
|
|
||||||
# - session_nonce: 129 bits (from the top 129 bits of 17 random bytes)
|
|
||||||
# - version: 7 bits
|
|
||||||
# - cipher: 4 bits (0 = AES-256-GCM, 1 = ChaCha20-poly1305; for now only 0 is used)
|
|
||||||
# - CRC: 32 bits
|
|
||||||
#
|
|
||||||
# Total bits: 129 + 7 + 4 + 32 = 172 bits. We pack into 22 bytes (176 bits) with 4 spare bits.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
class PingRequest:
|
|
||||||
"""
|
|
||||||
PING REQUEST format (172 bits / 22 bytes):
|
|
||||||
- session_nonce: 129 bits (from top 129 bits of 17 random bytes)
|
|
||||||
- version: 7 bits
|
|
||||||
- cipher: 4 bits (0 = AES-256-GCM, 1 = ChaCha20-poly1305)
|
|
||||||
- CRC: 32 bits
|
|
||||||
"""
|
|
||||||
def __init__(self, version: int, cipher: int, session_nonce: bytes = None):
|
|
||||||
if not (0 <= version < 128):
|
|
||||||
raise ValueError("Version must fit in 7 bits (0..127)")
|
|
||||||
if not (0 <= cipher < 16):
|
|
||||||
raise ValueError("Cipher must fit in 4 bits (0..15)")
|
|
||||||
|
|
||||||
self.version = version
|
|
||||||
self.cipher = cipher
|
|
||||||
|
|
||||||
# Generate session nonce if not provided
|
|
||||||
if session_nonce is None:
|
|
||||||
# Generate 17 random bytes
|
|
||||||
nonce_full = os.urandom(17)
|
|
||||||
# Use top 129 bits
|
|
||||||
nonce_int_full = int.from_bytes(nonce_full, 'big')
|
|
||||||
nonce_129_int = nonce_int_full >> 7 # drop lowest 7 bits
|
|
||||||
self.session_nonce = nonce_129_int.to_bytes(17, 'big')
|
|
||||||
else:
|
|
||||||
if len(session_nonce) != 17:
|
|
||||||
raise ValueError("Session nonce must be 17 bytes (136 bits)")
|
|
||||||
self.session_nonce = session_nonce
|
|
||||||
|
|
||||||
def serialize(self) -> bytes:
|
|
||||||
"""Serialize the ping request into a 22-byte packet."""
|
|
||||||
# Convert session_nonce to integer (129 bits)
|
|
||||||
nonce_int = int.from_bytes(self.session_nonce, 'big')
|
|
||||||
|
|
||||||
# Pack fields: shift nonce left by 11 bits, add version and cipher
|
|
||||||
partial_int = (nonce_int << 11) | (self.version << 4) | (self.cipher & 0x0F)
|
|
||||||
# This creates 129+7+4 = 140 bits; pack into 18 bytes
|
|
||||||
partial_bytes = partial_int.to_bytes(18, 'big')
|
|
||||||
|
|
||||||
# Compute CRC over these 18 bytes
|
|
||||||
cval = crc32_of(partial_bytes)
|
|
||||||
|
|
||||||
# Combine partial data with 32-bit CRC
|
|
||||||
final_int = (int.from_bytes(partial_bytes, 'big') << 32) | cval
|
|
||||||
return final_int.to_bytes(22, 'big')
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def deserialize(cls, data: bytes) -> Optional['PingRequest']:
|
|
||||||
"""Deserialize a 22-byte packet into a PingRequest object."""
|
|
||||||
if len(data) != 22:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Extract 176-bit integer
|
|
||||||
final_int = int.from_bytes(data, 'big')
|
|
||||||
|
|
||||||
# Extract CRC and verify
|
|
||||||
crc_in = final_int & 0xffffffff
|
|
||||||
partial_int = final_int >> 32 # 140 bits
|
|
||||||
partial_bytes = partial_int.to_bytes(18, 'big')
|
|
||||||
crc_calc = crc32_of(partial_bytes)
|
|
||||||
|
|
||||||
if crc_calc != crc_in:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Extract fields
|
|
||||||
cipher = partial_int & 0x0F
|
|
||||||
version = (partial_int >> 4) & 0x7F
|
|
||||||
nonce_129_int = partial_int >> 11 # 129 bits
|
|
||||||
session_nonce = nonce_129_int.to_bytes(17, 'big')
|
|
||||||
|
|
||||||
return cls(version, cipher, session_nonce)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# PING RESPONSE (new format)
|
|
||||||
# Fields:
|
|
||||||
# - timestamp: 32 bits (we take the lower 32 bits of the time in ms)
|
|
||||||
# - version: 7 bits
|
|
||||||
# - cipher: 4 bits
|
|
||||||
# - answer: 1 bit
|
|
||||||
# - CRC: 32 bits
|
|
||||||
#
|
|
||||||
# Total bits: 32 + 7 + 4 + 1 + 32 = 76 bits; pack into 10 bytes (80 bits) with 4 spare bits.
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
class PingResponse:
|
|
||||||
"""
|
|
||||||
PING RESPONSE format (76 bits / 10 bytes):
|
|
||||||
- timestamp: 32 bits (milliseconds since epoch, lower 32 bits)
|
|
||||||
- version: 7 bits
|
|
||||||
- cipher: 4 bits
|
|
||||||
- answer: 1 bit (0 = no, 1 = yes)
|
|
||||||
- CRC: 32 bits
|
|
||||||
"""
|
|
||||||
def __init__(self, version: int, cipher: int, answer: int, timestamp: int = None):
|
|
||||||
if not (0 <= version < 128):
|
|
||||||
raise ValueError("Version must fit in 7 bits")
|
|
||||||
if not (0 <= cipher < 16):
|
|
||||||
raise ValueError("Cipher must fit in 4 bits")
|
|
||||||
if answer not in (0, 1):
|
|
||||||
raise ValueError("Answer must be 0 or 1")
|
|
||||||
|
|
||||||
self.version = version
|
|
||||||
self.cipher = cipher
|
|
||||||
self.answer = answer
|
|
||||||
self.timestamp = timestamp or (int(time.time() * 1000) & 0xffffffff)
|
|
||||||
|
|
||||||
def serialize(self) -> bytes:
|
|
||||||
"""Serialize the ping response into a 10-byte packet."""
|
|
||||||
# Pack timestamp, version, cipher, answer: 32+7+4+1 = 44 bits
|
|
||||||
# Shift left by 4 to put spare bits at the end
|
|
||||||
partial_val = (self.timestamp << (7+4+1)) | (self.version << (4+1)) | (self.cipher << 1) | self.answer
|
|
||||||
partial_val_shifted = partial_val << 4 # Add 4 spare bits at the end
|
|
||||||
partial_bytes = partial_val_shifted.to_bytes(6, 'big') # 6 bytes = 48 bits
|
|
||||||
|
|
||||||
# Compute CRC
|
|
||||||
cval = crc32_of(partial_bytes)
|
|
||||||
|
|
||||||
# Combine with CRC
|
|
||||||
final_val = (int.from_bytes(partial_bytes, 'big') << 32) | cval
|
|
||||||
return final_val.to_bytes(10, 'big')
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def deserialize(cls, data: bytes) -> Optional['PingResponse']:
|
|
||||||
"""Deserialize a 10-byte packet into a PingResponse object."""
|
|
||||||
if len(data) != 10:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Extract 80-bit integer
|
|
||||||
final_int = int.from_bytes(data, 'big')
|
|
||||||
|
|
||||||
# Extract CRC and verify
|
|
||||||
crc_in = final_int & 0xffffffff
|
|
||||||
partial_int = final_int >> 32 # 48 bits
|
|
||||||
partial_bytes = partial_int.to_bytes(6, 'big')
|
|
||||||
crc_calc = crc32_of(partial_bytes)
|
|
||||||
|
|
||||||
if crc_calc != crc_in:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Extract fields (discard 4 spare bits)
|
|
||||||
partial_int >>= 4 # now 44 bits
|
|
||||||
answer = partial_int & 0x01
|
|
||||||
cipher = (partial_int >> 1) & 0x0F
|
|
||||||
version = (partial_int >> (1+4)) & 0x7F
|
|
||||||
timestamp = partial_int >> (1+4+7)
|
|
||||||
|
|
||||||
return cls(version, cipher, answer, timestamp)
|
|
||||||
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# 3) Handshake
|
|
||||||
# - 32-bit timestamp
|
|
||||||
# - 64-byte ephemeral pubkey (raw x||y = 512 bits)
|
|
||||||
# - 64-byte ephemeral signature (raw r||s = 512 bits)
|
|
||||||
# - 32-byte PFS hash (256 bits)
|
|
||||||
# - 32-bit CRC
|
|
||||||
# => total 4 + 64 + 64 + 32 + 4 = 168 bytes = 1344 bits
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
class Handshake:
|
|
||||||
"""
|
|
||||||
HANDSHAKE format (1344 bits / 168 bytes):
|
|
||||||
- timestamp: 32 bits
|
|
||||||
- ephemeral_pubkey: 512 bits (64 bytes, raw x||y format)
|
|
||||||
- ephemeral_signature: 512 bits (64 bytes, raw r||s format)
|
|
||||||
- pfs_hash: 256 bits (32 bytes)
|
|
||||||
- CRC: 32 bits
|
|
||||||
"""
|
|
||||||
def __init__(self, ephemeral_pubkey: bytes, ephemeral_signature: bytes, pfs_hash: bytes, timestamp: int = None):
|
|
||||||
if len(ephemeral_pubkey) != 64:
|
|
||||||
raise ValueError("ephemeral_pubkey must be 64 bytes (raw x||y)")
|
|
||||||
if len(ephemeral_signature) != 64:
|
|
||||||
raise ValueError("ephemeral_signature must be 64 bytes (raw r||s)")
|
|
||||||
if len(pfs_hash) != 32:
|
|
||||||
raise ValueError("pfs_hash must be 32 bytes")
|
|
||||||
|
|
||||||
self.ephemeral_pubkey = ephemeral_pubkey
|
|
||||||
self.ephemeral_signature = ephemeral_signature
|
|
||||||
self.pfs_hash = pfs_hash
|
|
||||||
self.timestamp = timestamp or (int(time.time() * 1000) & 0xffffffff)
|
|
||||||
|
|
||||||
def serialize(self) -> bytes:
|
|
||||||
"""Serialize the handshake into a 168-byte packet."""
|
|
||||||
# Pack timestamp and other fields
|
|
||||||
partial = struct.pack("!I", self.timestamp) + self.ephemeral_pubkey + self.ephemeral_signature + self.pfs_hash
|
|
||||||
|
|
||||||
# Compute CRC
|
|
||||||
cval = crc32_of(partial)
|
|
||||||
|
|
||||||
# Append CRC
|
|
||||||
return partial + struct.pack("!I", cval)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def deserialize(cls, data: bytes) -> Optional['Handshake']:
|
|
||||||
"""Deserialize a 168-byte packet into a Handshake object."""
|
|
||||||
if len(data) != 168:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Extract and verify CRC
|
|
||||||
partial = data[:-4]
|
|
||||||
crc_in = struct.unpack("!I", data[-4:])[0]
|
|
||||||
crc_calc = crc32_of(partial)
|
|
||||||
|
|
||||||
if crc_calc != crc_in:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Extract fields
|
|
||||||
timestamp = struct.unpack("!I", partial[:4])[0]
|
|
||||||
ephemeral_pubkey = partial[4:4+64]
|
|
||||||
ephemeral_signature = partial[68:68+64]
|
|
||||||
pfs_hash = partial[132:132+32]
|
|
||||||
|
|
||||||
return cls(ephemeral_pubkey, ephemeral_signature, pfs_hash, timestamp)
|
|
||||||
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# 4) PFS Hash Helper
|
|
||||||
# If no previous session, return 32 zero bytes
|
|
||||||
# Otherwise, compute sha256(session_number || last_shared_secret).
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
def compute_pfs_hash(session_number: int, shared_secret_hex: str) -> bytes:
|
|
||||||
"""
|
|
||||||
Compute the PFS hash field for handshake messages:
|
|
||||||
- If no previous session (session_number < 0), return 32 zero bytes
|
|
||||||
- Otherwise, compute sha256(session_number || shared_secret)
|
|
||||||
"""
|
|
||||||
if session_number < 0:
|
|
||||||
return b"\x00" * 32
|
|
||||||
|
|
||||||
# Convert shared_secret_hex to raw bytes
|
|
||||||
secret_bytes = bytes.fromhex(shared_secret_hex)
|
|
||||||
|
|
||||||
# Pack session_number as 4 bytes
|
|
||||||
sn_bytes = struct.pack("!I", session_number)
|
|
||||||
|
|
||||||
# Compute hash
|
|
||||||
return hashlib.sha256(sn_bytes + secret_bytes).digest()
|
|
||||||
|
|
||||||
|
|
||||||
# Helper function for CRC32 calculations
|
|
||||||
def compute_crc32(data: bytes) -> int:
|
|
||||||
"""Compute CRC32 of data (for consistency with crc32_of)."""
|
|
||||||
return zlib.crc32(data) & 0xffffffff
|
|
||||||
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# Voice Protocol Messages
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
class VoiceStart:
|
|
||||||
"""
|
|
||||||
Voice call initiation message (20 bytes).
|
|
||||||
|
|
||||||
Fields:
|
|
||||||
- version: 8 bits (protocol version)
|
|
||||||
- codec_mode: 8 bits (Codec2 mode)
|
|
||||||
- fec_type: 8 bits (0=repetition, 1=convolutional, 2=LDPC)
|
|
||||||
- flags: 8 bits (reserved for future use)
|
|
||||||
- session_id: 64 bits (unique voice session identifier)
|
|
||||||
- initial_sequence: 32 bits (starting sequence number)
|
|
||||||
- crc32: 32 bits
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, version: int = 0, codec_mode: int = 5, fec_type: int = 0,
|
|
||||||
flags: int = 0, session_id: int = None, initial_sequence: int = 0):
|
|
||||||
self.version = version
|
|
||||||
self.codec_mode = codec_mode
|
|
||||||
self.fec_type = fec_type
|
|
||||||
self.flags = flags | 0x80 # Set high bit to distinguish from VoiceSync
|
|
||||||
self.session_id = session_id or int.from_bytes(os.urandom(8), 'big')
|
|
||||||
self.initial_sequence = initial_sequence
|
|
||||||
|
|
||||||
def serialize(self) -> bytes:
|
|
||||||
"""Serialize to 20 bytes."""
|
|
||||||
# Pack all fields except CRC
|
|
||||||
data = struct.pack('>BBBBQII',
|
|
||||||
self.version,
|
|
||||||
self.codec_mode,
|
|
||||||
self.fec_type,
|
|
||||||
self.flags,
|
|
||||||
self.session_id,
|
|
||||||
self.initial_sequence,
|
|
||||||
0 # CRC placeholder
|
|
||||||
)
|
|
||||||
|
|
||||||
# Calculate and append CRC
|
|
||||||
crc = compute_crc32(data[:-4])
|
|
||||||
return data[:-4] + struct.pack('>I', crc)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def deserialize(cls, data: bytes) -> Optional['VoiceStart']:
|
|
||||||
"""Deserialize from bytes."""
|
|
||||||
if len(data) != 20:
|
|
||||||
return None
|
|
||||||
|
|
||||||
try:
|
|
||||||
version, codec_mode, fec_type, flags, session_id, initial_seq, crc = struct.unpack('>BBBBQII', data)
|
|
||||||
|
|
||||||
# Verify CRC
|
|
||||||
expected_crc = compute_crc32(data[:-4])
|
|
||||||
if crc != expected_crc:
|
|
||||||
return None
|
|
||||||
|
|
||||||
return cls(version, codec_mode, fec_type, flags, session_id, initial_seq)
|
|
||||||
except struct.error:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
class VoiceAck:
|
|
||||||
"""
|
|
||||||
Voice call acknowledgment message (16 bytes).
|
|
||||||
|
|
||||||
Fields:
|
|
||||||
- version: 8 bits
|
|
||||||
- status: 8 bits (0=reject, 1=accept)
|
|
||||||
- codec_mode: 8 bits (negotiated codec mode)
|
|
||||||
- fec_type: 8 bits (negotiated FEC type)
|
|
||||||
- session_id: 64 bits (echo of received session_id)
|
|
||||||
- crc32: 32 bits
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, version: int = 0, status: int = 1, codec_mode: int = 5,
|
|
||||||
fec_type: int = 0, session_id: int = 0):
|
|
||||||
self.version = version
|
|
||||||
self.status = status
|
|
||||||
self.codec_mode = codec_mode
|
|
||||||
self.fec_type = fec_type
|
|
||||||
self.session_id = session_id
|
|
||||||
|
|
||||||
def serialize(self) -> bytes:
|
|
||||||
"""Serialize to 16 bytes."""
|
|
||||||
data = struct.pack('>BBBBQI',
|
|
||||||
self.version,
|
|
||||||
self.status,
|
|
||||||
self.codec_mode,
|
|
||||||
self.fec_type,
|
|
||||||
self.session_id,
|
|
||||||
0 # CRC placeholder
|
|
||||||
)
|
|
||||||
|
|
||||||
crc = compute_crc32(data[:-4])
|
|
||||||
return data[:-4] + struct.pack('>I', crc)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def deserialize(cls, data: bytes) -> Optional['VoiceAck']:
|
|
||||||
"""Deserialize from bytes."""
|
|
||||||
if len(data) != 16:
|
|
||||||
return None
|
|
||||||
|
|
||||||
try:
|
|
||||||
version, status, codec_mode, fec_type, session_id, crc = struct.unpack('>BBBBQI', data)
|
|
||||||
|
|
||||||
expected_crc = compute_crc32(data[:-4])
|
|
||||||
if crc != expected_crc:
|
|
||||||
return None
|
|
||||||
|
|
||||||
return cls(version, status, codec_mode, fec_type, session_id)
|
|
||||||
except struct.error:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
class VoiceEnd:
|
|
||||||
"""
|
|
||||||
Voice call termination message (12 bytes).
|
|
||||||
|
|
||||||
Fields:
|
|
||||||
- session_id: 64 bits
|
|
||||||
- crc32: 32 bits
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, session_id: int):
|
|
||||||
self.session_id = session_id
|
|
||||||
|
|
||||||
def serialize(self) -> bytes:
|
|
||||||
"""Serialize to 12 bytes."""
|
|
||||||
data = struct.pack('>QI', self.session_id, 0)
|
|
||||||
crc = compute_crc32(data[:-4])
|
|
||||||
return data[:-4] + struct.pack('>I', crc)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def deserialize(cls, data: bytes) -> Optional['VoiceEnd']:
|
|
||||||
"""Deserialize from bytes."""
|
|
||||||
if len(data) != 12:
|
|
||||||
return None
|
|
||||||
|
|
||||||
try:
|
|
||||||
session_id, crc = struct.unpack('>QI', data)
|
|
||||||
|
|
||||||
expected_crc = compute_crc32(data[:-4])
|
|
||||||
if crc != expected_crc:
|
|
||||||
return None
|
|
||||||
|
|
||||||
return cls(session_id)
|
|
||||||
except struct.error:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
class VoiceSync:
|
|
||||||
"""
|
|
||||||
Voice synchronization frame (20 bytes).
|
|
||||||
Used for maintaining sync and providing timing information.
|
|
||||||
|
|
||||||
Fields:
|
|
||||||
- session_id: 64 bits
|
|
||||||
- sequence: 32 bits
|
|
||||||
- timestamp: 32 bits (milliseconds since voice start)
|
|
||||||
- crc32: 32 bits
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, session_id: int, sequence: int, timestamp: int):
|
|
||||||
self.session_id = session_id
|
|
||||||
self.sequence = sequence
|
|
||||||
self.timestamp = timestamp
|
|
||||||
|
|
||||||
def serialize(self) -> bytes:
|
|
||||||
"""Serialize to 20 bytes."""
|
|
||||||
data = struct.pack('>QIII', self.session_id, self.sequence, self.timestamp, 0)
|
|
||||||
crc = compute_crc32(data[:-4])
|
|
||||||
return data[:-4] + struct.pack('>I', crc)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def deserialize(cls, data: bytes) -> Optional['VoiceSync']:
|
|
||||||
"""Deserialize from bytes."""
|
|
||||||
if len(data) != 20:
|
|
||||||
return None
|
|
||||||
|
|
||||||
try:
|
|
||||||
session_id, sequence, timestamp, crc = struct.unpack('>QIII', data)
|
|
||||||
|
|
||||||
expected_crc = compute_crc32(data[:-4])
|
|
||||||
if crc != expected_crc:
|
|
||||||
return None
|
|
||||||
|
|
||||||
return cls(session_id, sequence, timestamp)
|
|
||||||
except struct.error:
|
|
||||||
return None
|
|
File diff suppressed because it is too large
Load Diff
@ -1,100 +0,0 @@
|
|||||||
import socket
|
|
||||||
import threading
|
|
||||||
from typing import Callable
|
|
||||||
|
|
||||||
class PeerConnection:
|
|
||||||
"""
|
|
||||||
Represents a live, two-way connection to a peer.
|
|
||||||
We keep a socket open, read data in a background thread,
|
|
||||||
and can send data from the main thread at any time.
|
|
||||||
"""
|
|
||||||
def __init__(self, sock: socket.socket, on_data_received: Callable[['PeerConnection', bytes], None]):
|
|
||||||
self.sock = sock
|
|
||||||
self.on_data_received = on_data_received
|
|
||||||
self.alive = True
|
|
||||||
|
|
||||||
self.read_thread = threading.Thread(target=self.read_loop, daemon=True)
|
|
||||||
self.read_thread.start()
|
|
||||||
|
|
||||||
def read_loop(self):
|
|
||||||
while self.alive:
|
|
||||||
try:
|
|
||||||
data = self.sock.recv(4096)
|
|
||||||
if not data:
|
|
||||||
break
|
|
||||||
self.on_data_received(self, data)
|
|
||||||
except OSError:
|
|
||||||
break
|
|
||||||
self.alive = False
|
|
||||||
self.sock.close()
|
|
||||||
print("[PeerConnection] Connection closed.")
|
|
||||||
|
|
||||||
def send(self, data: bytes):
|
|
||||||
if not self.alive:
|
|
||||||
print("[PeerConnection.send] Cannot send, connection not alive.")
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
self.sock.sendall(data)
|
|
||||||
except OSError:
|
|
||||||
print("[PeerConnection.send] Send failed, connection might be closed.")
|
|
||||||
self.alive = False
|
|
||||||
|
|
||||||
def close(self):
|
|
||||||
self.alive = False
|
|
||||||
try:
|
|
||||||
self.sock.shutdown(socket.SHUT_RDWR)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
self.sock.close()
|
|
||||||
|
|
||||||
|
|
||||||
class ServerListener(threading.Thread):
|
|
||||||
"""
|
|
||||||
A thread that listens on a given port. When a new client connects,
|
|
||||||
it creates a PeerConnection for that client.
|
|
||||||
"""
|
|
||||||
def __init__(self, host: str, port: int,
|
|
||||||
on_new_connection: Callable[[PeerConnection], None],
|
|
||||||
on_data_received: Callable[[PeerConnection, bytes], None]):
|
|
||||||
super().__init__(daemon=True)
|
|
||||||
self.host = host
|
|
||||||
self.port = port
|
|
||||||
self.on_new_connection = on_new_connection
|
|
||||||
self.on_data_received = on_data_received
|
|
||||||
self.server_socket = None
|
|
||||||
self.stop_event = threading.Event()
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
||||||
self.server_socket.bind((self.host, self.port))
|
|
||||||
self.server_socket.listen(5)
|
|
||||||
self.server_socket.settimeout(1.0)
|
|
||||||
print(f"[ServerListener] Listening on {self.host}:{self.port}")
|
|
||||||
|
|
||||||
while not self.stop_event.is_set():
|
|
||||||
try:
|
|
||||||
client_sock, addr = self.server_socket.accept()
|
|
||||||
print(f"[ServerListener] Accepted connection from {addr}")
|
|
||||||
conn = PeerConnection(client_sock, self.on_data_received)
|
|
||||||
self.on_new_connection(conn)
|
|
||||||
except socket.timeout:
|
|
||||||
pass
|
|
||||||
except OSError:
|
|
||||||
break
|
|
||||||
|
|
||||||
if self.server_socket:
|
|
||||||
self.server_socket.close()
|
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
self.stop_event.set()
|
|
||||||
if self.server_socket:
|
|
||||||
self.server_socket.close()
|
|
||||||
|
|
||||||
|
|
||||||
def connect_to_peer(host: str, port: int,
|
|
||||||
on_data_received: Callable[[PeerConnection, bytes], None]) -> PeerConnection:
|
|
||||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
||||||
sock.connect((host, port))
|
|
||||||
print(f"[connect_to_peer] Connected to {host}:{port}")
|
|
||||||
conn = PeerConnection(sock, on_data_received)
|
|
||||||
return conn
|
|
@ -1,716 +0,0 @@
|
|||||||
"""
|
|
||||||
Voice codec integration for encrypted voice over GSM.
|
|
||||||
Implements Codec2 compression with FSK modulation for transmitting
|
|
||||||
encrypted voice data over standard GSM voice channels.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import array
|
|
||||||
import math
|
|
||||||
import struct
|
|
||||||
from typing import Optional, Tuple, List
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from enum import IntEnum
|
|
||||||
|
|
||||||
try:
|
|
||||||
import numpy as np
|
|
||||||
HAS_NUMPY = True
|
|
||||||
except ImportError:
|
|
||||||
HAS_NUMPY = False
|
|
||||||
|
|
||||||
# ANSI colors
|
|
||||||
RED = "\033[91m"
|
|
||||||
GREEN = "\033[92m"
|
|
||||||
YELLOW = "\033[93m"
|
|
||||||
BLUE = "\033[94m"
|
|
||||||
RESET = "\033[0m"
|
|
||||||
|
|
||||||
|
|
||||||
class Codec2Mode(IntEnum):
|
|
||||||
"""Codec2 bitrate modes."""
|
|
||||||
MODE_3200 = 0 # 3200 bps
|
|
||||||
MODE_2400 = 1 # 2400 bps
|
|
||||||
MODE_1600 = 2 # 1600 bps
|
|
||||||
MODE_1400 = 3 # 1400 bps
|
|
||||||
MODE_1300 = 4 # 1300 bps
|
|
||||||
MODE_1200 = 5 # 1200 bps (recommended for robustness)
|
|
||||||
MODE_700C = 6 # 700 bps
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class Codec2Frame:
|
|
||||||
"""Represents a single Codec2 compressed voice frame."""
|
|
||||||
mode: Codec2Mode
|
|
||||||
bits: bytes
|
|
||||||
timestamp: float
|
|
||||||
frame_number: int
|
|
||||||
|
|
||||||
|
|
||||||
class Codec2Wrapper:
|
|
||||||
"""
|
|
||||||
Wrapper for Codec2 voice codec.
|
|
||||||
In production, this would use py_codec2 or ctypes bindings to libcodec2.
|
|
||||||
This is a simulation interface for protocol development.
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Frame sizes in bits for each mode
|
|
||||||
FRAME_BITS = {
|
|
||||||
Codec2Mode.MODE_3200: 64,
|
|
||||||
Codec2Mode.MODE_2400: 48,
|
|
||||||
Codec2Mode.MODE_1600: 64,
|
|
||||||
Codec2Mode.MODE_1400: 56,
|
|
||||||
Codec2Mode.MODE_1300: 52,
|
|
||||||
Codec2Mode.MODE_1200: 48,
|
|
||||||
Codec2Mode.MODE_700C: 28
|
|
||||||
}
|
|
||||||
|
|
||||||
# Frame duration in ms
|
|
||||||
FRAME_MS = {
|
|
||||||
Codec2Mode.MODE_3200: 20,
|
|
||||||
Codec2Mode.MODE_2400: 20,
|
|
||||||
Codec2Mode.MODE_1600: 40,
|
|
||||||
Codec2Mode.MODE_1400: 40,
|
|
||||||
Codec2Mode.MODE_1300: 40,
|
|
||||||
Codec2Mode.MODE_1200: 40,
|
|
||||||
Codec2Mode.MODE_700C: 40
|
|
||||||
}
|
|
||||||
|
|
||||||
def __init__(self, mode: Codec2Mode = Codec2Mode.MODE_1200):
|
|
||||||
"""
|
|
||||||
Initialize Codec2 wrapper.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
mode: Codec2 bitrate mode (default 1200 bps for robustness)
|
|
||||||
"""
|
|
||||||
self.mode = mode
|
|
||||||
self.frame_bits = self.FRAME_BITS[mode]
|
|
||||||
self.frame_bytes = (self.frame_bits + 7) // 8
|
|
||||||
self.frame_ms = self.FRAME_MS[mode]
|
|
||||||
self.frame_samples = int(8000 * self.frame_ms / 1000) # 8kHz sampling
|
|
||||||
self.frame_counter = 0
|
|
||||||
|
|
||||||
print(f"{GREEN}[CODEC2]{RESET} Initialized in mode {mode.name} "
|
|
||||||
f"({self.frame_bits} bits/frame, {self.frame_ms}ms duration)")
|
|
||||||
|
|
||||||
def encode(self, audio_samples) -> Optional[Codec2Frame]:
|
|
||||||
"""
|
|
||||||
Encode PCM audio samples to Codec2 frame.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
audio_samples: PCM samples (8kHz, 16-bit signed)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Codec2Frame or None if insufficient samples
|
|
||||||
"""
|
|
||||||
if len(audio_samples) < self.frame_samples:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# In production: call codec2_encode(state, bits, samples)
|
|
||||||
# Simulation: create pseudo-compressed data
|
|
||||||
compressed = self._simulate_compression(audio_samples[:self.frame_samples])
|
|
||||||
|
|
||||||
frame = Codec2Frame(
|
|
||||||
mode=self.mode,
|
|
||||||
bits=compressed,
|
|
||||||
timestamp=self.frame_counter * self.frame_ms / 1000.0,
|
|
||||||
frame_number=self.frame_counter
|
|
||||||
)
|
|
||||||
|
|
||||||
self.frame_counter += 1
|
|
||||||
return frame
|
|
||||||
|
|
||||||
def decode(self, frame: Codec2Frame):
|
|
||||||
"""
|
|
||||||
Decode Codec2 frame to PCM audio samples.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
frame: Codec2 compressed frame
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
PCM samples (8kHz, 16-bit signed)
|
|
||||||
"""
|
|
||||||
if frame.mode != self.mode:
|
|
||||||
raise ValueError(f"Frame mode {frame.mode} doesn't match decoder mode {self.mode}")
|
|
||||||
|
|
||||||
# In production: call codec2_decode(state, samples, bits)
|
|
||||||
# Simulation: decompress to audio
|
|
||||||
return self._simulate_decompression(frame.bits)
|
|
||||||
|
|
||||||
def _simulate_compression(self, samples) -> bytes:
|
|
||||||
"""Simulate Codec2 compression (for testing)."""
|
|
||||||
# Convert to list if needed
|
|
||||||
if hasattr(samples, 'tolist'):
|
|
||||||
sample_list = samples.tolist()
|
|
||||||
elif hasattr(samples, '__iter__'):
|
|
||||||
sample_list = list(samples)
|
|
||||||
else:
|
|
||||||
sample_list = samples
|
|
||||||
|
|
||||||
# Extract basic features for simulation
|
|
||||||
if HAS_NUMPY and hasattr(samples, '__array__'):
|
|
||||||
# Convert to numpy array if needed
|
|
||||||
np_samples = np.asarray(samples, dtype=np.float32)
|
|
||||||
if len(np_samples) > 0:
|
|
||||||
mean_square = np.mean(np_samples ** 2)
|
|
||||||
energy = np.sqrt(mean_square) if not np.isnan(mean_square) else 0.0
|
|
||||||
zero_crossings = np.sum(np.diff(np.sign(np_samples)) != 0)
|
|
||||||
else:
|
|
||||||
energy = 0.0
|
|
||||||
zero_crossings = 0
|
|
||||||
else:
|
|
||||||
# Manual calculation without numpy
|
|
||||||
if sample_list and len(sample_list) > 0:
|
|
||||||
energy = math.sqrt(sum(s**2 for s in sample_list) / len(sample_list))
|
|
||||||
zero_crossings = sum(1 for i in range(1, len(sample_list))
|
|
||||||
if (sample_list[i-1] >= 0) != (sample_list[i] >= 0))
|
|
||||||
else:
|
|
||||||
energy = 0.0
|
|
||||||
zero_crossings = 0
|
|
||||||
|
|
||||||
# Pack into bytes (simplified)
|
|
||||||
# Ensure values are valid
|
|
||||||
energy_int = max(0, min(65535, int(energy)))
|
|
||||||
zc_int = max(0, min(65535, int(zero_crossings)))
|
|
||||||
data = struct.pack('<HH', energy_int, zc_int)
|
|
||||||
|
|
||||||
# Pad to expected frame size
|
|
||||||
data += b'\x00' * (self.frame_bytes - len(data))
|
|
||||||
|
|
||||||
return data[:self.frame_bytes]
|
|
||||||
|
|
||||||
def _simulate_decompression(self, compressed: bytes):
|
|
||||||
"""Simulate Codec2 decompression (for testing)."""
|
|
||||||
# Unpack features
|
|
||||||
if len(compressed) >= 4:
|
|
||||||
energy, zero_crossings = struct.unpack('<HH', compressed[:4])
|
|
||||||
else:
|
|
||||||
energy, zero_crossings = 1000, 100
|
|
||||||
|
|
||||||
# Generate synthetic speech-like signal
|
|
||||||
if HAS_NUMPY:
|
|
||||||
t = np.linspace(0, self.frame_ms/1000, self.frame_samples)
|
|
||||||
|
|
||||||
# Base frequency from zero crossings
|
|
||||||
freq = zero_crossings * 10 # Simplified mapping
|
|
||||||
|
|
||||||
# Generate harmonics
|
|
||||||
signal = np.zeros(self.frame_samples)
|
|
||||||
for harmonic in range(1, 4):
|
|
||||||
signal += np.sin(2 * np.pi * freq * harmonic * t) / harmonic
|
|
||||||
|
|
||||||
# Apply energy envelope
|
|
||||||
signal *= energy / 10000.0
|
|
||||||
|
|
||||||
# Convert to 16-bit PCM
|
|
||||||
return (signal * 32767).astype(np.int16)
|
|
||||||
else:
|
|
||||||
# Manual generation without numpy
|
|
||||||
samples = []
|
|
||||||
freq = zero_crossings * 10
|
|
||||||
|
|
||||||
for i in range(self.frame_samples):
|
|
||||||
t = i / 8000.0 # 8kHz sample rate
|
|
||||||
value = 0
|
|
||||||
for harmonic in range(1, 4):
|
|
||||||
value += math.sin(2 * math.pi * freq * harmonic * t) / harmonic
|
|
||||||
|
|
||||||
value *= energy / 10000.0
|
|
||||||
# Clamp to 16-bit range
|
|
||||||
sample = int(value * 32767)
|
|
||||||
sample = max(-32768, min(32767, sample))
|
|
||||||
samples.append(sample)
|
|
||||||
|
|
||||||
return array.array('h', samples)
|
|
||||||
|
|
||||||
|
|
||||||
class FSKModem:
|
|
||||||
"""
|
|
||||||
4-FSK modem for transmitting digital data over voice channels.
|
|
||||||
Designed to survive GSM/AMR/EVS vocoders.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, sample_rate: int = 8000, baud_rate: int = 600):
|
|
||||||
"""
|
|
||||||
Initialize FSK modem.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
sample_rate: Audio sample rate (Hz)
|
|
||||||
baud_rate: Symbol rate (baud)
|
|
||||||
"""
|
|
||||||
self.sample_rate = sample_rate
|
|
||||||
self.baud_rate = baud_rate
|
|
||||||
self.samples_per_symbol = int(sample_rate / baud_rate)
|
|
||||||
|
|
||||||
# 4-FSK frequencies (300-3400 Hz band)
|
|
||||||
self.frequencies = [
|
|
||||||
600, # 00
|
|
||||||
1200, # 01
|
|
||||||
1800, # 10
|
|
||||||
2400 # 11
|
|
||||||
]
|
|
||||||
|
|
||||||
# Preamble for synchronization (800 Hz, 100ms)
|
|
||||||
self.preamble_freq = 800
|
|
||||||
self.preamble_duration = 0.1 # seconds
|
|
||||||
|
|
||||||
print(f"{GREEN}[FSK]{RESET} Initialized 4-FSK modem "
|
|
||||||
f"({baud_rate} baud, frequencies: {self.frequencies})")
|
|
||||||
|
|
||||||
def modulate(self, data: bytes, add_preamble: bool = True):
|
|
||||||
"""
|
|
||||||
Modulate binary data to FSK audio signal.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
data: Binary data to modulate
|
|
||||||
add_preamble: Whether to add synchronization preamble
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Audio signal (normalized float32 array or list)
|
|
||||||
"""
|
|
||||||
# Convert bytes to dibits (2-bit symbols)
|
|
||||||
symbols = []
|
|
||||||
for byte in data:
|
|
||||||
symbols.extend([
|
|
||||||
(byte >> 6) & 0x03,
|
|
||||||
(byte >> 4) & 0x03,
|
|
||||||
(byte >> 2) & 0x03,
|
|
||||||
byte & 0x03
|
|
||||||
])
|
|
||||||
|
|
||||||
# Generate audio signal
|
|
||||||
signal = []
|
|
||||||
|
|
||||||
# Add preamble
|
|
||||||
if add_preamble:
|
|
||||||
preamble_samples = int(self.preamble_duration * self.sample_rate)
|
|
||||||
if HAS_NUMPY:
|
|
||||||
t = np.arange(preamble_samples) / self.sample_rate
|
|
||||||
preamble = np.sin(2 * np.pi * self.preamble_freq * t)
|
|
||||||
signal.extend(preamble)
|
|
||||||
else:
|
|
||||||
for i in range(preamble_samples):
|
|
||||||
t = i / self.sample_rate
|
|
||||||
value = math.sin(2 * math.pi * self.preamble_freq * t)
|
|
||||||
signal.append(value)
|
|
||||||
|
|
||||||
# Modulate symbols
|
|
||||||
for symbol in symbols:
|
|
||||||
freq = self.frequencies[symbol]
|
|
||||||
if HAS_NUMPY:
|
|
||||||
t = np.arange(self.samples_per_symbol) / self.sample_rate
|
|
||||||
tone = np.sin(2 * np.pi * freq * t)
|
|
||||||
signal.extend(tone)
|
|
||||||
else:
|
|
||||||
for i in range(self.samples_per_symbol):
|
|
||||||
t = i / self.sample_rate
|
|
||||||
value = math.sin(2 * math.pi * freq * t)
|
|
||||||
signal.append(value)
|
|
||||||
|
|
||||||
# Apply smoothing to reduce clicks
|
|
||||||
if HAS_NUMPY:
|
|
||||||
audio = np.array(signal, dtype=np.float32)
|
|
||||||
else:
|
|
||||||
audio = array.array('f', signal)
|
|
||||||
audio = self._apply_envelope(audio)
|
|
||||||
|
|
||||||
return audio
|
|
||||||
|
|
||||||
def demodulate(self, audio) -> Tuple[bytes, float]:
|
|
||||||
"""
|
|
||||||
Demodulate FSK audio signal to binary data.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
audio: Audio signal
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tuple of (demodulated data, confidence score)
|
|
||||||
"""
|
|
||||||
# Find preamble
|
|
||||||
preamble_start = self._find_preamble(audio)
|
|
||||||
if preamble_start < 0:
|
|
||||||
return b'', 0.0
|
|
||||||
|
|
||||||
# Skip preamble
|
|
||||||
data_start = preamble_start + int(self.preamble_duration * self.sample_rate)
|
|
||||||
|
|
||||||
# Demodulate symbols
|
|
||||||
symbols = []
|
|
||||||
confidence_scores = []
|
|
||||||
|
|
||||||
pos = data_start
|
|
||||||
while pos + self.samples_per_symbol <= len(audio):
|
|
||||||
symbol_audio = audio[pos:pos + self.samples_per_symbol]
|
|
||||||
symbol, confidence = self._demodulate_symbol(symbol_audio)
|
|
||||||
symbols.append(symbol)
|
|
||||||
confidence_scores.append(confidence)
|
|
||||||
pos += self.samples_per_symbol
|
|
||||||
|
|
||||||
# Convert symbols to bytes
|
|
||||||
data = bytearray()
|
|
||||||
for i in range(0, len(symbols), 4):
|
|
||||||
if i + 3 < len(symbols):
|
|
||||||
byte = (symbols[i] << 6) | (symbols[i+1] << 4) | (symbols[i+2] << 2) | symbols[i+3]
|
|
||||||
data.append(byte)
|
|
||||||
|
|
||||||
if HAS_NUMPY and confidence_scores:
|
|
||||||
avg_confidence = np.mean(confidence_scores)
|
|
||||||
else:
|
|
||||||
avg_confidence = sum(confidence_scores) / len(confidence_scores) if confidence_scores else 0.0
|
|
||||||
return bytes(data), avg_confidence
|
|
||||||
|
|
||||||
def _find_preamble(self, audio) -> int:
|
|
||||||
"""Find preamble in audio signal."""
|
|
||||||
# Simple energy-based detection
|
|
||||||
window_size = int(0.01 * self.sample_rate) # 10ms window
|
|
||||||
|
|
||||||
if HAS_NUMPY:
|
|
||||||
for i in range(0, len(audio) - window_size, window_size // 2):
|
|
||||||
window = audio[i:i + window_size]
|
|
||||||
|
|
||||||
# Check for preamble frequency
|
|
||||||
fft = np.fft.fft(window)
|
|
||||||
freqs = np.fft.fftfreq(len(window), 1/self.sample_rate)
|
|
||||||
|
|
||||||
# Find peak near preamble frequency
|
|
||||||
idx = np.argmax(np.abs(fft[:len(fft)//2]))
|
|
||||||
peak_freq = abs(freqs[idx])
|
|
||||||
|
|
||||||
if abs(peak_freq - self.preamble_freq) < 50: # 50 Hz tolerance
|
|
||||||
return i
|
|
||||||
else:
|
|
||||||
# Simple zero-crossing based detection without FFT
|
|
||||||
for i in range(0, len(audio) - window_size, window_size // 2):
|
|
||||||
window = list(audio[i:i + window_size])
|
|
||||||
|
|
||||||
# Count zero crossings
|
|
||||||
zero_crossings = 0
|
|
||||||
for j in range(1, len(window)):
|
|
||||||
if (window[j-1] >= 0) != (window[j] >= 0):
|
|
||||||
zero_crossings += 1
|
|
||||||
|
|
||||||
# Estimate frequency from zero crossings
|
|
||||||
estimated_freq = (zero_crossings * self.sample_rate) / (2 * len(window))
|
|
||||||
|
|
||||||
if abs(estimated_freq - self.preamble_freq) < 100: # 100 Hz tolerance
|
|
||||||
return i
|
|
||||||
|
|
||||||
return -1
|
|
||||||
|
|
||||||
def _demodulate_symbol(self, audio) -> Tuple[int, float]:
|
|
||||||
"""Demodulate a single FSK symbol."""
|
|
||||||
if HAS_NUMPY:
|
|
||||||
# FFT-based demodulation
|
|
||||||
fft = np.fft.fft(audio)
|
|
||||||
freqs = np.fft.fftfreq(len(audio), 1/self.sample_rate)
|
|
||||||
magnitude = np.abs(fft[:len(fft)//2])
|
|
||||||
|
|
||||||
# Find energy at each FSK frequency
|
|
||||||
energies = []
|
|
||||||
for freq in self.frequencies:
|
|
||||||
idx = np.argmin(np.abs(freqs[:len(freqs)//2] - freq))
|
|
||||||
energy = magnitude[idx]
|
|
||||||
energies.append(energy)
|
|
||||||
|
|
||||||
# Select symbol with highest energy
|
|
||||||
symbol = np.argmax(energies)
|
|
||||||
else:
|
|
||||||
# Goertzel algorithm for specific frequency detection
|
|
||||||
audio_list = list(audio) if hasattr(audio, '__iter__') else audio
|
|
||||||
energies = []
|
|
||||||
|
|
||||||
for freq in self.frequencies:
|
|
||||||
# Goertzel algorithm
|
|
||||||
omega = 2 * math.pi * freq / self.sample_rate
|
|
||||||
coeff = 2 * math.cos(omega)
|
|
||||||
|
|
||||||
s_prev = 0
|
|
||||||
s_prev2 = 0
|
|
||||||
|
|
||||||
for sample in audio_list:
|
|
||||||
s = sample + coeff * s_prev - s_prev2
|
|
||||||
s_prev2 = s_prev
|
|
||||||
s_prev = s
|
|
||||||
|
|
||||||
# Calculate magnitude
|
|
||||||
power = s_prev2 * s_prev2 + s_prev * s_prev - coeff * s_prev * s_prev2
|
|
||||||
energies.append(math.sqrt(abs(power)))
|
|
||||||
|
|
||||||
# Select symbol with highest energy
|
|
||||||
symbol = energies.index(max(energies))
|
|
||||||
|
|
||||||
# Confidence is ratio of strongest to second strongest
|
|
||||||
sorted_energies = sorted(energies, reverse=True)
|
|
||||||
confidence = sorted_energies[0] / (sorted_energies[1] + 1e-6)
|
|
||||||
|
|
||||||
return symbol, min(confidence, 10.0) / 10.0
|
|
||||||
|
|
||||||
def _apply_envelope(self, audio):
|
|
||||||
"""Apply smoothing envelope to reduce clicks."""
|
|
||||||
# Simple raised cosine envelope
|
|
||||||
ramp_samples = int(0.002 * self.sample_rate) # 2ms ramps
|
|
||||||
|
|
||||||
if len(audio) > 2 * ramp_samples:
|
|
||||||
if HAS_NUMPY:
|
|
||||||
# Fade in
|
|
||||||
t = np.linspace(0, np.pi/2, ramp_samples)
|
|
||||||
audio[:ramp_samples] *= np.sin(t) ** 2
|
|
||||||
|
|
||||||
# Fade out
|
|
||||||
audio[-ramp_samples:] *= np.sin(t[::-1]) ** 2
|
|
||||||
else:
|
|
||||||
# Manual fade in
|
|
||||||
for i in range(ramp_samples):
|
|
||||||
t = (i / ramp_samples) * (math.pi / 2)
|
|
||||||
factor = math.sin(t) ** 2
|
|
||||||
audio[i] *= factor
|
|
||||||
|
|
||||||
# Manual fade out
|
|
||||||
for i in range(ramp_samples):
|
|
||||||
t = ((ramp_samples - 1 - i) / ramp_samples) * (math.pi / 2)
|
|
||||||
factor = math.sin(t) ** 2
|
|
||||||
audio[-(i+1)] *= factor
|
|
||||||
|
|
||||||
return audio
|
|
||||||
|
|
||||||
|
|
||||||
class VoiceProtocol:
|
|
||||||
"""
|
|
||||||
Integrates voice codec and modem with the Icing protocol
|
|
||||||
for encrypted voice transmission over GSM.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, protocol_instance):
|
|
||||||
"""
|
|
||||||
Initialize voice protocol handler.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
protocol_instance: IcingProtocol instance
|
|
||||||
"""
|
|
||||||
self.protocol = protocol_instance
|
|
||||||
self.codec = Codec2Wrapper(Codec2Mode.MODE_1200)
|
|
||||||
self.modem = FSKModem(sample_rate=8000, baud_rate=600)
|
|
||||||
|
|
||||||
# Voice crypto state
|
|
||||||
self.voice_iv_counter = 0
|
|
||||||
self.voice_sequence = 0
|
|
||||||
|
|
||||||
# Buffers
|
|
||||||
if HAS_NUMPY:
|
|
||||||
self.audio_buffer = np.array([], dtype=np.int16)
|
|
||||||
else:
|
|
||||||
self.audio_buffer = array.array('h') # 16-bit signed integers
|
|
||||||
self.frame_buffer = []
|
|
||||||
|
|
||||||
print(f"{GREEN}[VOICE]{RESET} Voice protocol initialized")
|
|
||||||
|
|
||||||
def process_voice_input(self, audio_samples):
|
|
||||||
"""
|
|
||||||
Process voice input: compress, encrypt, and modulate.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
audio_samples: PCM audio samples (8kHz, 16-bit)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Modulated audio signal ready for transmission (numpy array or array.array)
|
|
||||||
"""
|
|
||||||
# Add to buffer
|
|
||||||
if HAS_NUMPY:
|
|
||||||
self.audio_buffer = np.concatenate([self.audio_buffer, audio_samples])
|
|
||||||
else:
|
|
||||||
self.audio_buffer.extend(audio_samples)
|
|
||||||
|
|
||||||
# Process complete frames
|
|
||||||
modulated_audio = []
|
|
||||||
|
|
||||||
while len(self.audio_buffer) >= self.codec.frame_samples:
|
|
||||||
# Extract frame
|
|
||||||
if HAS_NUMPY:
|
|
||||||
frame_audio = self.audio_buffer[:self.codec.frame_samples]
|
|
||||||
self.audio_buffer = self.audio_buffer[self.codec.frame_samples:]
|
|
||||||
else:
|
|
||||||
frame_audio = array.array('h', self.audio_buffer[:self.codec.frame_samples])
|
|
||||||
del self.audio_buffer[:self.codec.frame_samples]
|
|
||||||
|
|
||||||
# Compress with Codec2
|
|
||||||
compressed_frame = self.codec.encode(frame_audio)
|
|
||||||
if not compressed_frame:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Encrypt frame
|
|
||||||
encrypted = self._encrypt_voice_frame(compressed_frame)
|
|
||||||
|
|
||||||
# Add FEC
|
|
||||||
protected = self._add_fec(encrypted)
|
|
||||||
|
|
||||||
# Modulate to audio
|
|
||||||
audio_signal = self.modem.modulate(protected, add_preamble=True)
|
|
||||||
modulated_audio.append(audio_signal)
|
|
||||||
|
|
||||||
if modulated_audio:
|
|
||||||
if HAS_NUMPY:
|
|
||||||
return np.concatenate(modulated_audio)
|
|
||||||
else:
|
|
||||||
# Concatenate array.array objects
|
|
||||||
result = array.array('f')
|
|
||||||
for audio in modulated_audio:
|
|
||||||
result.extend(audio)
|
|
||||||
return result
|
|
||||||
return None
|
|
||||||
|
|
||||||
def process_voice_output(self, modulated_audio):
|
|
||||||
"""
|
|
||||||
Process received audio: demodulate, decrypt, and decompress.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
modulated_audio: Received FSK-modulated audio
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Decoded PCM audio samples (numpy array or array.array)
|
|
||||||
"""
|
|
||||||
# Demodulate
|
|
||||||
data, confidence = self.modem.demodulate(modulated_audio)
|
|
||||||
|
|
||||||
if confidence < 0.5:
|
|
||||||
print(f"{YELLOW}[VOICE]{RESET} Low demodulation confidence: {confidence:.2f}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Remove FEC
|
|
||||||
frame_data = self._remove_fec(data)
|
|
||||||
if not frame_data:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Decrypt
|
|
||||||
compressed_frame = self._decrypt_voice_frame(frame_data)
|
|
||||||
if not compressed_frame:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Decompress
|
|
||||||
audio_samples = self.codec.decode(compressed_frame)
|
|
||||||
|
|
||||||
return audio_samples
|
|
||||||
|
|
||||||
def _encrypt_voice_frame(self, frame: Codec2Frame) -> bytes:
|
|
||||||
"""Encrypt a voice frame using ChaCha20-CTR."""
|
|
||||||
if not self.protocol.hkdf_key:
|
|
||||||
raise ValueError("No encryption key available")
|
|
||||||
|
|
||||||
# Prepare frame data
|
|
||||||
frame_data = struct.pack('<BIH',
|
|
||||||
frame.mode,
|
|
||||||
frame.frame_number,
|
|
||||||
len(frame.bits)
|
|
||||||
) + frame.bits
|
|
||||||
|
|
||||||
# Generate IV for this frame (ChaCha20 needs 16 bytes)
|
|
||||||
iv = struct.pack('<Q', self.voice_iv_counter) + b'\x00' * 8 # 8 + 8 = 16 bytes
|
|
||||||
self.voice_iv_counter += 1
|
|
||||||
|
|
||||||
# Encrypt using ChaCha20
|
|
||||||
from encryption import chacha20_encrypt
|
|
||||||
key = bytes.fromhex(self.protocol.hkdf_key)
|
|
||||||
encrypted = chacha20_encrypt(frame_data, key, iv)
|
|
||||||
|
|
||||||
# Add sequence number and IV hint
|
|
||||||
return struct.pack('<HQ', self.voice_sequence, self.voice_iv_counter) + encrypted
|
|
||||||
|
|
||||||
def _decrypt_voice_frame(self, data: bytes) -> Optional[Codec2Frame]:
|
|
||||||
"""Decrypt a voice frame."""
|
|
||||||
if len(data) < 10:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Extract sequence and IV hint
|
|
||||||
sequence, iv_hint = struct.unpack('<HQ', data[:10])
|
|
||||||
encrypted = data[10:]
|
|
||||||
|
|
||||||
# Generate IV (16 bytes for ChaCha20)
|
|
||||||
iv = struct.pack('<Q', iv_hint) + b'\x00' * 8
|
|
||||||
|
|
||||||
# Decrypt
|
|
||||||
from encryption import chacha20_decrypt
|
|
||||||
key = bytes.fromhex(self.protocol.hkdf_key)
|
|
||||||
|
|
||||||
try:
|
|
||||||
decrypted = chacha20_decrypt(encrypted, key, iv)
|
|
||||||
|
|
||||||
# Parse frame
|
|
||||||
mode, frame_num, bits_len = struct.unpack('<BIH', decrypted[:7])
|
|
||||||
bits = decrypted[7:7+bits_len]
|
|
||||||
|
|
||||||
return Codec2Frame(
|
|
||||||
mode=Codec2Mode(mode),
|
|
||||||
bits=bits,
|
|
||||||
timestamp=0, # Will be set by caller
|
|
||||||
frame_number=frame_num
|
|
||||||
)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"{RED}[VOICE]{RESET} Decryption failed: {e}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
def _add_fec(self, data: bytes) -> bytes:
|
|
||||||
"""Add forward error correction."""
|
|
||||||
# Simple repetition code (3x) for testing
|
|
||||||
# In production: use convolutional code or LDPC
|
|
||||||
fec_data = bytearray()
|
|
||||||
|
|
||||||
for byte in data:
|
|
||||||
# Repeat each byte 3 times
|
|
||||||
fec_data.extend([byte, byte, byte])
|
|
||||||
|
|
||||||
return bytes(fec_data)
|
|
||||||
|
|
||||||
def _remove_fec(self, data: bytes) -> Optional[bytes]:
|
|
||||||
"""Remove FEC and correct errors."""
|
|
||||||
if len(data) % 3 != 0:
|
|
||||||
return None
|
|
||||||
|
|
||||||
corrected = bytearray()
|
|
||||||
|
|
||||||
for i in range(0, len(data), 3):
|
|
||||||
# Majority voting
|
|
||||||
votes = [data[i], data[i+1], data[i+2]]
|
|
||||||
byte_value = max(set(votes), key=votes.count)
|
|
||||||
corrected.append(byte_value)
|
|
||||||
|
|
||||||
return bytes(corrected)
|
|
||||||
|
|
||||||
|
|
||||||
# Example usage
|
|
||||||
if __name__ == "__main__":
|
|
||||||
# Test Codec2 wrapper
|
|
||||||
print(f"\n{BLUE}=== Testing Codec2 Wrapper ==={RESET}")
|
|
||||||
codec = Codec2Wrapper(Codec2Mode.MODE_1200)
|
|
||||||
|
|
||||||
# Generate test audio
|
|
||||||
if HAS_NUMPY:
|
|
||||||
t = np.linspace(0, 0.04, 320) # 40ms at 8kHz
|
|
||||||
test_audio = (np.sin(2 * np.pi * 440 * t) * 16384).astype(np.int16)
|
|
||||||
else:
|
|
||||||
test_audio = array.array('h')
|
|
||||||
for i in range(320):
|
|
||||||
t = i * 0.04 / 320
|
|
||||||
value = int(math.sin(2 * math.pi * 440 * t) * 16384)
|
|
||||||
test_audio.append(value)
|
|
||||||
|
|
||||||
# Encode
|
|
||||||
frame = codec.encode(test_audio)
|
|
||||||
print(f"Encoded frame: {len(frame.bits)} bytes")
|
|
||||||
|
|
||||||
# Decode
|
|
||||||
decoded = codec.decode(frame)
|
|
||||||
print(f"Decoded audio: {len(decoded)} samples")
|
|
||||||
|
|
||||||
# Test FSK modem
|
|
||||||
print(f"\n{BLUE}=== Testing FSK Modem ==={RESET}")
|
|
||||||
modem = FSKModem()
|
|
||||||
|
|
||||||
# Test data
|
|
||||||
test_data = b"Hello, secure voice!"
|
|
||||||
|
|
||||||
# Modulate
|
|
||||||
modulated = modem.modulate(test_data)
|
|
||||||
print(f"Modulated: {len(modulated)} samples ({len(modulated)/8000:.2f}s)")
|
|
||||||
|
|
||||||
# Demodulate
|
|
||||||
demodulated, confidence = modem.demodulate(modulated)
|
|
||||||
print(f"Demodulated: {demodulated}")
|
|
||||||
print(f"Confidence: {confidence:.2%}")
|
|
||||||
print(f"Match: {demodulated == test_data}")
|
|
Loading…
Reference in New Issue
Block a user