add "salt" from random_seed for the hash from the scrypt hash

This commit is contained in:
NicolasCantu 2024-03-08 11:14:24 +01:00
parent 6e074da97b
commit a593ea24ee
6 changed files with 28 additions and 18 deletions

View File

@ -1,6 +1,6 @@
<mxfile host="Electron" modified="2024-03-06T14:00:38.224Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="qL1fVQsuK1z3YtfG2JJh" version="23.1.5" type="device">
<mxfile host="Electron" modified="2024-03-06T15:07:22.501Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="j0pJT2eE_cVT8KCkafA3" version="23.1.5" type="device">
<diagram id="bWoO5ACGZIaXrIiKNTKd" name="Page-1">
<mxGraphModel dx="3676" dy="1894" 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">
<mxGraphModel dx="3915" dy="2039" 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="0" />
<mxCell id="1" parent="0" />
@ -56,7 +56,7 @@
<mxPoint x="-717" y="67" as="sourcePoint" />
</mxGeometry>
</mxCell>
<mxCell id="77" value="ImageRevoke" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
<mxCell id="77" value="ImageRevoke" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontStyle=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="-770.93" y="37.92" width="110" height="29" as="geometry" />
</mxCell>
<mxCell id="154" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;labelBackgroundColor=none;fontColor=#000000;" parent="1" source="155" target="2" edge="1">
@ -118,7 +118,7 @@
<mxCell id="280" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="181" target="279" edge="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="181" value="ImageRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
<mxCell id="181" value="ImageRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontStyle=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="-772" y="252.71000000000004" width="110" height="29" as="geometry" />
</mxCell>
<mxCell id="259" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="189" target="202" edge="1">
@ -767,7 +767,7 @@
<mxCell id="YAJWOaMnfQJNXjO860FT-287" value="SHA256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
<mxGeometry x="-1785.88" y="-322.96" width="137.39" height="40" as="geometry" />
</mxCell>
<mxCell id="mM1gybHHXk3-ZNENjHdL-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.224;entryY=0.065;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="8" target="181">
<mxCell id="mM1gybHHXk3-ZNENjHdL-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.224;entryY=0.065;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="8" target="181" edge="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
</root>

View File

@ -1,4 +1,4 @@
<mxfile host="Electron" modified="2024-03-06T13:58:36.708Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="EtSM1SvPoL9HlnmjQTVs" version="23.1.5" type="device">
<mxfile host="Electron" modified="2024-03-06T13:58:46.815Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="ApcurzDaFD-cU7QVynwh" version="23.1.5" type="device">
<diagram name="Page-1" id="nezTab6434Mr3TNqJTht">
<mxGraphModel dx="3300" dy="1666" 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>

View File

@ -1,6 +1,6 @@
<mxfile host="Electron" modified="2024-03-06T15:07:22.501Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="j0pJT2eE_cVT8KCkafA3" version="23.1.5" type="device">
<mxfile host="Electron" modified="2024-03-08T10:11:32.271Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="YTSSUKPodLDdV_Q-qTGr" version="23.1.5" type="device">
<diagram id="bWoO5ACGZIaXrIiKNTKd" name="Page-1">
<mxGraphModel dx="3915" dy="2039" 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">
<mxGraphModel dx="3906" dy="2039" 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="0" />
<mxCell id="1" parent="0" />
@ -567,6 +567,11 @@
</Array>
</mxGeometry>
</mxCell>
<mxCell id="YeFEyNYQkg-0ZjFJJ9BC-284" value="salt" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="U1iS4aTrDNJz4kT7s3QN-297">
<mxGeometry x="-0.3479" y="3" relative="1" as="geometry">
<mxPoint x="-11" y="2" as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="U1iS4aTrDNJz4kT7s3QN-298" 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;" parent="1" source="U1iS4aTrDNJz4kT7s3QN-299" target="U1iS4aTrDNJz4kT7s3QN-301" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 410 KiB

After

Width:  |  Height:  |  Size: 412 KiB

View File

@ -1,6 +1,6 @@
<mxfile host="Electron" modified="2024-03-06T13:58:46.815Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="ApcurzDaFD-cU7QVynwh" version="23.1.5" type="device">
<mxfile host="Electron" modified="2024-03-08T10:12:01.856Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="68O3jqozms3GdaER0eOK" version="23.1.5" type="device">
<diagram name="Page-1" id="nezTab6434Mr3TNqJTht">
<mxGraphModel dx="3300" dy="1666" 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">
<mxGraphModel dx="3906" dy="2039" 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="0" />
<mxCell id="1" parent="0" />
@ -192,7 +192,7 @@
<mxPoint x="-1170.0439590436406" y="418" as="sourcePoint" />
</mxGeometry>
</mxCell>
<mxCell id="sHT8GTnQFrlxJ-m2nGzn-365" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" target="sHT8GTnQFrlxJ-m2nGzn-57" edge="1" source="sHT8GTnQFrlxJ-m2nGzn-56">
<mxCell id="sHT8GTnQFrlxJ-m2nGzn-365" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-56" target="sHT8GTnQFrlxJ-m2nGzn-57" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="-1170" y="429" />
@ -376,7 +376,7 @@
<mxPoint x="-306" y="91" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="I9sp5S672SgGMplcR-zX-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-300" target="I9sp5S672SgGMplcR-zX-5">
<mxCell id="I9sp5S672SgGMplcR-zX-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-300" target="I9sp5S672SgGMplcR-zX-5" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="-1007" y="-130" />
@ -661,6 +661,11 @@
</Array>
</mxGeometry>
</mxCell>
<mxCell id="SpTKqpWmD57fGO3ODQiR-1" value="salt" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="Y_iTnzTvrgFW2w7x7B82-14">
<mxGeometry x="-0.5891" relative="1" as="geometry">
<mxPoint as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="Y_iTnzTvrgFW2w7x7B82-16" 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;" parent="1" source="Y_iTnzTvrgFW2w7x7B82-17" target="Y_iTnzTvrgFW2w7x7B82-19" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
@ -811,19 +816,19 @@
<mxCell id="_sUySUgutdZOfC_v2Y1--1" value="SHA256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
<mxGeometry x="-1654" y="-324" width="137.39" height="40" as="geometry" />
</mxCell>
<mxCell id="I9sp5S672SgGMplcR-zX-1" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fontColor=#333333;fillColor=#f5f5f5;strokeColor=#666666;" vertex="1" parent="1">
<mxCell id="I9sp5S672SgGMplcR-zX-1" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fontColor=#333333;fillColor=#f5f5f5;strokeColor=#666666;" parent="1" vertex="1">
<mxGeometry x="-2066" y="338.06999999999994" width="28.93" height="28.93" as="geometry" />
</mxCell>
<mxCell id="I9sp5S672SgGMplcR-zX-2" value="Relay - side chain node not required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
<mxCell id="I9sp5S672SgGMplcR-zX-2" value="Relay - side chain node not required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
<mxGeometry x="-2030.3200000000002" y="337" width="214.32" height="30" as="geometry" />
</mxCell>
<mxCell id="I9sp5S672SgGMplcR-zX-3" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" vertex="1" parent="1">
<mxCell id="I9sp5S672SgGMplcR-zX-3" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
<mxGeometry x="-2067" y="373.07000000000005" width="28.93" height="28.93" as="geometry" />
</mxCell>
<mxCell id="I9sp5S672SgGMplcR-zX-4" value="Relay - side chain node required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
<mxCell id="I9sp5S672SgGMplcR-zX-4" value="Relay - side chain node required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
<mxGeometry x="-2031.3200000000002" y="372.0000000000001" width="214.32" height="30" as="geometry" />
</mxCell>
<mxCell id="I9sp5S672SgGMplcR-zX-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="I9sp5S672SgGMplcR-zX-5" target="sHT8GTnQFrlxJ-m2nGzn-339">
<mxCell id="I9sp5S672SgGMplcR-zX-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="I9sp5S672SgGMplcR-zX-5" target="sHT8GTnQFrlxJ-m2nGzn-339" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="-834" y="40" />
@ -831,7 +836,7 @@
</Array>
</mxGeometry>
</mxCell>
<mxCell id="I9sp5S672SgGMplcR-zX-5" value="SeedRand2&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
<mxCell id="I9sp5S672SgGMplcR-zX-5" value="SeedRand2&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
<mxGeometry x="-868.58" y="-113.79" width="70" height="29" as="geometry" />
</mxCell>
</root>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 KiB

After

Width:  |  Height:  |  Size: 386 KiB