diff --git a/CHANGELOG.md b/CHANGELOG.md index 51d45f2..a0cecf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Global constants fully shared among components through `sflc_constants.h`. +## [0.4.1] - 2023-07-30 + +### Fixed + + - Fixed and improved benchmark scripts. + - Fixed mistake in drawing of header layout in `doc`. + + ## [0.4.0] - 2023-07-24 ### Added diff --git a/README.md b/README.md index 21f8ba6..bddceaf 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,13 @@ Both methods works with the `init` action, and we do not have current plans to c Please see the file `CHANGELOG.md` for a detailed history of changes. +## [0.4.1] - 2023-07-30 + +### Fixed + + - Fixed and improved benchmark scripts. + - Fixed mistake in drawing of header layout in `doc`. + ### [0.4.0] - 2023-07-24 - BREAKING CHANGE: slightly modified header field format, removing redundant data and making it adherent to documentation. @@ -206,13 +213,6 @@ Please see the file `CHANGELOG.md` for a detailed history of changes. - Added `doc` (currently includes figure of Shufflecake headers structure). -### [0.3.1] - 2023-07-15 - -- BREAKING CHANGE: fixed parameters for Argon2id KDF, which were previously set too high, resulting in slow opening for non-recent devices. Unfortunately this breaks header format compatibility with device headers initialized with v0.3.0, so please treat v0.3.0 as bugged. -- Interactive test for Argon2id KDF. -- Added in `README.md` a description for a manual procedure for increasing volume resistance to corruption using RAID. - - diff --git a/dm-sflc/sflc_constants.h b/dm-sflc/sflc_constants.h index 5b4668a..0789e7a 100644 --- a/dm-sflc/sflc_constants.h +++ b/dm-sflc/sflc_constants.h @@ -30,8 +30,8 @@ #define SFLC_VER_MAJOR 0 #define SFLC_VER_MINOR 4 -#define SFLC_VER_REVISION 0 -#define SFLC_VER_SPECIAL "rc1" +#define SFLC_VER_REVISION 1 +#define SFLC_VER_SPECIAL "" #define STRINGIFY0(s) # s #define STRINGIFY(s) STRINGIFY0(s) diff --git a/doc/headers.png b/doc/headers.png index 811dd41..4440afd 100644 Binary files a/doc/headers.png and b/doc/headers.png differ diff --git a/doc/headers.svg b/doc/headers.svg index 747c2c1..235fec0 100644 --- a/doc/headers.svg +++ b/doc/headers.svg @@ -9,6 +9,9 @@ id="svg2909" inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="headers.svg" + inkscape:export-filename="headers.png" + inkscape:export-xdpi="200" + inkscape:export-ydpi="200" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -24,9 +27,9 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" showgrid="false" - inkscape:zoom="0.97008941" - inkscape:cx="606.64511" - inkscape:cy="183.48824" + inkscape:zoom="1.3719136" + inkscape:cx="356.07199" + inkscape:cy="309.05736" inkscape:window-width="1920" inkscape:window-height="979" inkscape:window-x="0" @@ -35,6 +38,21 @@ inkscape:current-layer="layer1" /> + + + + width="9.1584034" + height="2.6533794" + x="57.834915" + y="96.752327" /> + width="38.416847" + height="4.3625588" + x="114.02888" + y="102.2608" /> DMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="104.56422" + y="68.745987">DMB Header + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.110355" + x="83.604408" + y="68.976669">Header Device / Cake + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.110355" + x="83.735283" + y="57.673012">Device / Cake + width="11.465055" + height="3.1864953" + x="102.99949" + y="55.082439" /> Header + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="103.92523" + y="57.393742">Header + width="52.224102" + height="3.1864953" + x="114.46454" + y="55.082439" /> Encrypted Slices + IVs + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="128.51878" + y="57.393742">Encrypted Slices + IVs + width="8.1592417" + height="3.1864953" + x="119.25961" + y="66.434685" /> VMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="120.01392" + y="68.745987">VMB 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="125.80538" + y="69.01001">1 + width="7.147172" + height="3.1864953" + x="127.41884" + y="66.434685" /> EncryptedEncryptedPosMap 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="133.17734" + y="69.01001">1 . . . + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.110355" + x="150.65839" + y="68.748878">. . . + width="8.1592417" + height="3.1864953" + x="134.56601" + y="66.434685" /> VMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="135.32034" + y="68.745987">VMB 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="141.1118" + y="69.01001">2 + width="7.147172" + height="3.1864953" + x="142.72525" + y="66.434685" /> EncryptedEncryptedPosMap 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="148.48375" + y="69.01001">2 + width="8.1592417" + height="3.1864953" + x="155.13127" + y="66.434685" /> VMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="155.46236" + y="68.745987">VMB 15 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="161.2538" + y="69.01001">15 + width="7.147172" + height="3.1864953" + x="163.29051" + y="66.434685" /> EncryptedEncryptedPosMap 15 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="168.569" + y="69.01001">15 DMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.110355" + x="13.470656" + y="81.917572">DMB - salt - + width="4.9622297" + height="3.1864953" + x="48.94276" + y="78.92202" /> IV + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="49.807903" + y="81.233315">IV 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="52.166321" + y="81.49733">1 . . . + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.110355" + x="71.734634" + y="81.119873">. . . + width="7.4233003" + height="3.1864953" + x="53.904987" + y="78.92202" /> ctxt + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="54.770126" + y="81.233315">ctxt 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="59.664196" + y="81.49733">1 + width="4.9622297" + height="3.1864953" + x="75.505547" + y="78.92202" /> IV + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="75.909805" + y="81.233315">IV 15 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="78.268211" + y="81.49733">15 + width="7.4233003" + height="3.1864953" + x="80.467781" + y="78.92202" /> ctxt + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="80.759171" + y="81.233315">ctxt 15 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="85.653229" + y="81.49733">15 + width="9.9828825" + height="3.1864953" + x="61.328289" + y="78.92202" /> HMAC + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="62.193432" + y="81.233315">HMAC 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="70.022423" + y="81.49733">1 + width="9.9828825" + height="3.1864953" + x="87.89109" + y="78.92202" /> HMAC + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="88.029625" + y="81.233315">HMAC 15 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="95.769196" + y="81.49733">15 Password + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.142684" + x="15.382882" + y="99.972694">Password Argon2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#73573d;fill-opacity:1;stroke-width:0.0830525" + x="20.279879" + y="89.912842">Argon2 - - + inkscape:original-d="m 27.428784,89.382764 c 0.80587,-1.59e-4 15.370012,-1.59e-4 16.167309,0" + sodipodi:nodetypes="cc" /> KEK + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="45.172684" + y="89.916275">KEK AES-GCM + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#73573d;fill-opacity:1;stroke-width:0.0830525" + x="57.697063" + y="89.912842">AES-GCM - VMBkey + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="58.932346" + y="98.408951">VMBkey 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0442088" + x="65.413292" + y="98.779732">2 VMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.110355" + x="106.05735" + y="93.04277">VMB + width="4.9622297" + height="3.1864953" + x="114.36445" + y="90.432854" /> IV + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="114.76871" + y="92.744156">IV VMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.0354338" + x="117.26833" + y="91.396767">VMB + width="26.755627" + height="3.1864953" + x="119.32668" + y="90.432854" /> ctxt + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="128.72772" + y="92.744156">ctxt AES-CTR + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#73573d;fill-opacity:1;stroke-width:0.0830525" + x="126.81254" + y="98.267799">AES-CTR 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0442088" + x="48.513706" + y="90.182976">2 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0894191" + x="31.247276" + y="100.53474">2 VEK + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="115.06866" + y="105.03249">VEK VMBkey + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="121.20164" + y="105.03249">VMBkey 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0573041" + x="127.94362" + y="105.49582">1 NumSlices + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="131.04501" + y="105.03249">NumSlices Metadata + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="142.33987" + y="105.03249">Metadata | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="119.54999" + y="105.12276">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="119.93719" + y="105.12276">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="129.31367" + y="105.12276">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="129.70091" + y="105.12276">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="140.77605" + y="105.12276">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="141.16324" + y="105.12276">| AES-CTR + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#73573d;fill-opacity:1;stroke-width:0.0830525" + x="175.59528" + y="62.922466">AES-CTR Data I/O + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="177.03749" + y="69.522552">Data I/O + width="190.61122" + height="71.942459" + x="9.0003271" + y="40.513866" /> 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.06904" + x="111.88454" + y="93.350937">2 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="117.26022" + y="93.105782">2 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="133.50323" + y="93.105782">2 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0573041" + x="118.47769" + y="105.49582">2 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0573041" + x="139.82524" + y="105.49582">2 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0573041" + x="149.83839" + y="105.49582">2 VMB + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.0354338" + x="133.51483" + y="91.396767">VMB + width="4.9622297" + height="3.1864953" + x="147.56366" + y="78.92202" /> IV + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="147.96793" + y="81.233322">IV POS + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.0354338" + x="150.46754" + y="79.885941">POS + width="17.634396" + height="3.1864953" + x="152.52591" + y="78.92202" /> ctxt + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.110355" + x="158.40535" + y="81.233322">ctxt 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="150.45943" + y="81.594948">2 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.06904" + x="163.18091" + y="81.594948">2 POS + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.0354338" + x="163.19249" + y="79.885941">POS AES-CTR + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#73573d;fill-opacity:1;stroke-width:0.0830525" + x="160.73103" + y="87.760963">AES-CTR + width="30.842108" + height="4.0817685" + x="151.53714" + y="91.900093" /> PSI + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="152.46043" + y="94.429573">PSI 1 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0573041" + x="155.30444" + y="94.892891">1 PSI + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="158.77934" + y="94.429573">PSI 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0573041" + x="161.63753" + y="94.892891">2 | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="168.96609" + y="94.657684">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="169.35329" + y="94.657684">| PSI + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="171.01221" + y="94.429573">PSI NumSlices + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0573041" + x="173.87036" + y="94.892891">NumSlices 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0411333" + x="181.10196" + y="95.180397">2 . . . + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.0705427" + x="165.64677" + y="94.429573">. . . | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="163.51205" + y="94.657684">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="163.89926" + y="94.657684">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="156.83821" + y="94.657684">| | + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#0000ff;fill-opacity:1;stroke-width:0.121321" + x="157.22542" + y="94.657684">| EncryptedEncryptedPosition Map 2 + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:'FreeSans Semi-Bold';fill:#000000;fill-opacity:1;stroke-width:0.06904" + x="186.58961" + y="83.951057">2 + + IV + 2 + + ctxt + 2 + + HMAC + 2 + + salt + + IV + 1 + + ctxt + 1 + + HMAC + 1 + + salt + + IV + 1 + + ctxt + 1 + + HMAC + 1 + + + Shufflecake v0.4.x + + Structure of disk and headers + Example where a password for volume 2 unlocks volume 2and recursively also volume 1 (dotted arrow). + diff --git a/resources/images/badges/badge_version_0.4.1.png b/resources/images/badges/badge_version_0.4.1.png new file mode 100644 index 0000000..5b674d7 Binary files /dev/null and b/resources/images/badges/badge_version_0.4.1.png differ diff --git a/resources/images/badges/badges.svg b/resources/images/badges/badges.svg index 69a9ec1..a33717e 100644 --- a/resources/images/badges/badges.svg +++ b/resources/images/badges/badges.svg @@ -26,7 +26,7 @@ inkscape:document-units="mm" showgrid="false" inkscape:zoom="1.9401788" - inkscape:cx="265.69716" + inkscape:cx="266.21258" inkscape:cy="181.94199" inkscape:window-width="1920" inkscape:window-height="979" @@ -330,7 +330,7 @@ height="5.2916675" x="61.548569" y="72.206657" - inkscape:export-filename="badge_version_0.4.0.png" + inkscape:export-filename="badge_version_0.4.1.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" /> 0.4.0 + y="76.044922">0.4.1