From d29a4de26d0e3f31f467bcc9167b9758fad774f8 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 17 Sep 2017 11:57:16 +0200
Subject: Update both forward and reverse mode crypto docs

They were written before HKDF was introduced.

Improve graphics as well
---
 docs/img/file-content-encryption.svg | 166 +++++++++++++++++++++--------------
 1 file changed, 99 insertions(+), 67 deletions(-)

(limited to 'docs/img/file-content-encryption.svg')

diff --git a/docs/img/file-content-encryption.svg b/docs/img/file-content-encryption.svg
index 6f054eb..dfde974 100644
--- a/docs/img/file-content-encryption.svg
+++ b/docs/img/file-content-encryption.svg
@@ -19,40 +19,40 @@
   <defs
      id="defs4">
     <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker5544"
+       inkscape:isstock="true"
        style="overflow:visible"
-       inkscape:isstock="true">
+       id="marker13917"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mend">
       <path
-         id="path5546"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         inkscape:connector-curvature="0"
          transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
+         style="fill:#000000;fill-opacity:0.99607843;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:0.99607843"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path13915" />
     </marker>
     <marker
        inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker9033"
+       id="marker13729"
        style="overflow:visible"
        inkscape:isstock="true"
        inkscape:collect="always">
       <path
-         id="path9035"
+         id="path13727"
          d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         style="fill:#000000;fill-opacity:0.99607843;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:0.99607843"
          transform="matrix(-0.4,0,0,-0.4,-4,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker8949"
+       id="marker13671"
        refX="0"
        refY="0"
        orient="auto"
@@ -61,21 +61,37 @@
       <path
          inkscape:connector-curvature="0"
          transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         style="fill:#000000;fill-opacity:0.99607843;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:0.99607843"
          d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path8951" />
+         id="path13669" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5544"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path5546"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:0.99607843;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:0.99607843"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker8631"
+       id="marker9033"
        style="overflow:visible"
        inkscape:isstock="true"
        inkscape:collect="always">
       <path
-         id="path8633"
+         id="path9035"
          d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
          transform="matrix(-0.4,0,0,-0.4,-4,0)"
@@ -84,7 +100,7 @@
     <marker
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker8559"
+       id="marker8949"
        refX="0"
        refY="0"
        orient="auto"
@@ -95,7 +111,7 @@
          transform="matrix(-0.4,0,0,-0.4,-4,0)"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
          d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path8561" />
+         id="path8951" />
     </marker>
     <marker
        inkscape:stockid="Arrow1Mend"
@@ -137,13 +153,13 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="325.88995"
-     inkscape:cy="143.0543"
+     inkscape:zoom="5.6"
+     inkscape:cx="315.34957"
+     inkscape:cy="136.91144"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     showguides="false"
+     showguides="true"
      inkscape:window-width="1920"
      inkscape:window-height="1016"
      inkscape:window-x="0"
@@ -156,7 +172,8 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="false"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:document-rotation="0">
+     inkscape:document-rotation="0"
+     inkscape:guide-bbox="true">
     <inkscape:grid
        type="xygrid"
        id="grid4153"
@@ -166,6 +183,16 @@
        spacingy="3.5433069"
        originx="-58.710531"
        originy="-676.77163" />
+    <sodipodi:guide
+       position="343.64317,172.42602"
+       orientation="1,0"
+       id="guide13905"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="280.79083,104.40873"
+       orientation="0,1"
+       id="guide14057"
+       inkscape:locked="false" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -388,34 +415,17 @@
        id="path8425"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker8493)"
-       d="m 333.68912,240.94489 0,26.57479"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker8493)"
+       d="m 333.68911,240.94488 v 28.39441"
        id="path8485"
        inkscape:connector-curvature="0" />
-    <ellipse
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path8737"
-       cx="391.14938"
-       cy="240.94487"
-       rx="5.3170562"
-       ry="5.3149605" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker8559)"
-       d="M 503.54943,161.22048 H 391.11775 V 267.5197"
-       id="path8551"
-       inkscape:connector-curvature="0" />
     <ellipse
        style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path8737-5"
-       cx="403.82645"
+       cx="402.37164"
        cy="240.94487"
-       rx="5.3170557"
+       rx="2.674895"
        ry="5.31496" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker8631)"
-       d="M 568.19735,217.55703 H 403.81955 V 267.5197"
-       id="path8623"
-       inkscape:connector-curvature="0" />
     <ellipse
        style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path8737-56"
@@ -426,14 +436,14 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:67.66333771px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="423.86295"
-       y="213.29985"
+       x="465.70953"
+       y="214.10306"
        id="text4155-88-4-5-8"
        transform="scale(1.0001971,0.99980293)"><tspan
          sodipodi:role="line"
          id="tspan4157-9-8-2-7"
-         x="423.86295"
-         y="213.29985"
+         x="465.70953"
+         y="214.10306"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.00295734px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;fill:#000000;fill-opacity:1">N</tspan></text>
     <path
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker8949)"
@@ -479,43 +489,65 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:67.66333771px;word-spacing:0px;fill:#aa00d4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="313.90033"
+       x="315.77496"
        y="260.28745"
        id="text4155-88-3-5-0"
        transform="scale(1.0001971,0.99980293)"><tspan
          sodipodi:role="line"
          id="tspan4157-9-7-3-8"
-         x="313.90033"
+         x="315.77496"
          y="260.28745"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.00295734px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;fill:#aa00d4">IV</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:67.66333771px;word-spacing:0px;fill:#37abc8;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="351.90231"
+       x="365.02475"
        y="260.49326"
        id="text4155-88-3-5-0-3"
        transform="scale(1.0001971,0.99980293)"><tspan
          sodipodi:role="line"
          id="tspan4157-9-7-3-8-5"
-         x="351.90231"
+         x="365.02475"
          y="260.49326"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.00295734px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;fill:#37abc8">AAD</tspan></text>
-    <ellipse
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#37abc8;stroke-width:0.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99607843"
-       id="path16660"
-       cx="397.82806"
-       cy="254.06166"
-       rx="10.249999"
-       ry="4.4999995" />
+    <g
+       id="g13657"
+       transform="translate(50.240039,22.957093)">
+      <rect
+         ry="10.629921"
+         y="184.49184"
+         x="334.97046"
+         height="21.259842"
+         width="34.75692"
+         id="rect3336-9-4-2-0-1-3-3-0-8-2"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.9999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         transform="scale(1.0001971,0.99980293)"
+         id="text4155-6-5-7-9-1-6-1-2-9-1"
+         y="199.06342"
+         x="352.27948"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.99999905px;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:center;letter-spacing:67.66333008px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.00295639px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;letter-spacing:0px;text-anchor:middle;stroke-width:0.99999988px"
+           y="199.06342"
+           x="352.27948"
+           id="tspan4157-3-0-7-6-8-7-2-3-7-3"
+           sodipodi:role="line">cat</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99937493;stroke-opacity:0.99607843;marker-end:url(#marker13729)"
+       d="M 564.26339,218.03086 H 424.20079"
+       id="path13659"
+       inkscape:connector-curvature="0" />
     <path
-       style="opacity:1;fill:none;fill-opacity:0.99607843;stroke:#000000;stroke-width:0.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99607843"
-       d="m 391.11055,248.5008 v 3.69022"
-       id="path16662"
+       style="fill:none;stroke:#000000;stroke-width:0.99937493;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;marker-end:url(#marker13671)"
+       d="M 503.50116,160.66233 H 402.3537 v 42.50214"
+       id="path13661"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:1;fill:none;fill-opacity:0.99607843;stroke:#000000;stroke-width:0.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99607843"
-       d="m 403.81734,248.58371 v 3.69022"
-       id="path16662-2"
+       style="fill:none;stroke:#000000;stroke-width:0.99937493;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;marker-end:url(#marker13917)"
+       d="M 402.37164,230.88366 V 269.2308"
+       id="path13907"
        inkscape:connector-curvature="0" />
   </g>
 </svg>
-- 
cgit v1.2.3