minor updates

1 files changed, 321 insertions, 27 deletions

diff --git a/hsm-keys.graffle b/hsm-keys.graffle
index 558b970..b477e21 100644
--- a/hsm-keys.graffle
+++ b/hsm-keys.graffle
@@ -5,7 +5,7 @@
 	<key>ApplicationVersion</key>
 	<array>
 		<string>com.omnigroup.OmniGraffle6</string>
-		<string>159.7.0.224654</string>
+		<string>159.11.0.228015</string>
 	</array>
 	<key>CreationDate</key>
 	<string>2015-01-08 13:51:19 +0000</string>
@@ -28,7 +28,7 @@
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2015-01-28 09:09:26 +0000</string>
+	<string>2015-03-17 10:20:54 +0000</string>
 	<key>Modifier</key>
 	<string>Jakob Schlyter</string>
 	<key>NotesVisible</key>
@@ -52,7 +52,7 @@
 		<key>NSLeftMargin</key>
 		<array>
 			<string>float</string>
-			<string>18</string>
+			<string>12</string>
 		</array>
 		<key>NSOrientation</key>
 		<array>
@@ -72,7 +72,7 @@
 		<key>NSRightMargin</key>
 		<array>
 			<string>float</string>
-			<string>41</string>
+			<string>12</string>
 		</array>
 		<key>NSTopMargin</key>
 		<array>
@@ -92,7 +92,7 @@
 			<key>BackgroundGraphic</key>
 			<dict>
 				<key>Bounds</key>
-				<string>{{0, 0}, {783, 559}}</string>
+				<string>{{0, 0}, {818, 559}}</string>
 				<key>Class</key>
 				<string>SolidGraphic</string>
 				<key>ID</key>
@@ -717,7 +717,7 @@ Application Keys\
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\f0\fs20 \cf0 STK-1\
+\f0\fs20 \cf0 STK-2\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
 \i\fs16 \cf0 Storage Transfer Key\
@@ -1417,7 +1417,7 @@ Master Key}</string>
 			<key>BackgroundGraphic</key>
 			<dict>
 				<key>Bounds</key>
-				<string>{{0, 0}, {783, 559}}</string>
+				<string>{{0, 0}, {818, 559}}</string>
 				<key>Class</key>
 				<string>SolidGraphic</string>
 				<key>ID</key>
@@ -1456,14 +1456,178 @@ Master Key}</string>
 					<key>Head</key>
 					<dict>
 						<key>ID</key>
+						<integer>226</integer>
+					</dict>
+					<key>ID</key>
+					<integer>245</integer>
+					<key>OrthogonalBarAutomatic</key>
+					<false/>
+					<key>OrthogonalBarPoint</key>
+					<string>{170.07874170063047, 364.98552349251759}</string>
+					<key>OrthogonalBarPosition</key>
+					<real>68.887402042159977</real>
+					<key>Points</key>
+					<array>
+						<string>{170.07874170063047, 228.18895911455135}</string>
+						<string>{423.77953140407101, 389.76376319887129}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>2</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>242</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>Head</key>
+					<dict>
+						<key>ID</key>
+						<integer>242</integer>
+					</dict>
+					<key>ID</key>
+					<integer>244</integer>
+					<key>Points</key>
+					<array>
+						<string>{170.07874170063047, 120.47242217287302}</string>
+						<string>{170.07874170063047, 228.18895911455135}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>243</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{120.47244203794659, 100.62992217287302}, {99.212599325367762, 39.685000000000002}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>ID</key>
+					<integer>243</integer>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs20 \cf0 Administrator\
+Password}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{120.47244203794659, 208.34645911455132}, {99.212599325367762, 39.685000000000059}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>9</real>
+					</dict>
+					<key>ID</key>
+					<integer>242</integer>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs18 \cf0 PBKDF2 or similar}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>Head</key>
+					<dict>
+						<key>ID</key>
 						<integer>191</integer>
 					</dict>
 					<key>ID</key>
 					<integer>240</integer>
 					<key>Points</key>
 					<array>
-						<string>{240.94488407589327, 235.27557335207769}</string>
-						<string>{240.94488407589327, 307.55903899986913}</string>
+						<string>{423.77953140407101, 228.18895911455141}</string>
+						<string>{423.77953140407101, 300.47242476234283}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -1509,8 +1673,8 @@ Master Key}</string>
 					<integer>239</integer>
 					<key>Points</key>
 					<array>
-						<string>{344.40945194377696, 127.5590364103993}</string>
-						<string>{240.94488407589327, 235.27557335207769}</string>
+						<string>{527.24409927195472, 120.47242217287302}</string>
+						<string>{423.77953140407101, 228.18895911455141}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -1556,8 +1720,8 @@ Master Key}</string>
 					<integer>238</integer>
 					<key>Points</key>
 					<array>
-						<string>{240.94488407589327, 127.5590364103993}</string>
-						<string>{240.94488407589327, 235.27557335207769}</string>
+						<string>{423.77953140407101, 120.47242217287302}</string>
+						<string>{423.77953140407101, 228.18895911455141}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -1603,8 +1767,8 @@ Master Key}</string>
 					<integer>237</integer>
 					<key>Points</key>
 					<array>
-						<string>{137.48031620800964, 127.5590364103993}</string>
-						<string>{240.94488407589327, 235.27557335207769}</string>
+						<string>{320.31496353618729, 120.47242217287302}</string>
+						<string>{423.77953140407101, 228.18895911455141}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -1633,7 +1797,7 @@ Master Key}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{191.33858441320939, 215.43307335207766}, {99.212599325367762, 39.685000000000059}}</string>
+					<string>{{374.1732317413871, 208.34645911455138}, {99.212599325367762, 39.685000000000059}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -1669,7 +1833,7 @@ sharing splitting}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{294.80315228109305, 107.7165364103993}, {99.212599325367762, 39.685000000000002}}</string>
+					<string>{{477.63779960927081, 100.62992217287302}, {99.212599325367762, 39.685000000000002}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -1698,7 +1862,7 @@ Component n}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{191.33858441320939, 107.7165364103993}, {99.212599325367762, 39.685000000000002}}</string>
+					<string>{{374.1732317413871, 100.62992217287302}, {99.212599325367762, 39.685000000000002}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -1727,7 +1891,7 @@ Component \'85}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{87.874016545325745, 107.7165364103993}, {99.212599325367762, 39.685000000000002}}</string>
+					<string>{{270.70866387350338, 100.62992217287302}, {99.212599325367762, 39.685000000000002}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -1756,7 +1920,7 @@ Component 1}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{191.33858441320939, 287.71653899986916}, {99.212599325367762, 39.685000000000002}}</string>
+					<string>{{374.1732317413871, 280.62992476234285}, {99.212599325367762, 39.685000000000002}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -1816,8 +1980,8 @@ Component 1}</string>
 					<integer>228</integer>
 					<key>Points</key>
 					<array>
-						<string>{240.94488407589327, 307.55903899986913}</string>
-						<string>{240.94488407589327, 396.85037743639759}</string>
+						<string>{423.77953140407101, 300.47242476234283}</string>
+						<string>{423.77953140407101, 389.76376319887129}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -1846,7 +2010,7 @@ Component 1}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{191.33858441320939, 377.00787743639762}, {99.212599325367762, 39.685000000000002}}</string>
+					<string>{{374.1732317413871, 369.92126319887132}, {99.212599325367762, 39.685000000000002}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -1872,6 +2036,136 @@ Component 1}</string>
 						<integer>0</integer>
 					</dict>
 				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{254.05512041531688, 72.283465222767973}, {339.44882197750826, 261.53841488947023}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica-Oblique</string>
+						<key>Size</key>
+						<real>8</real>
+					</dict>
+					<key>ID</key>
+					<integer>246</integer>
+					<key>Line</key>
+					<dict>
+						<key>ID</key>
+						<integer>238</integer>
+						<key>Position</key>
+						<real>0.91728924671877132</real>
+						<key>RotationType</key>
+						<integer>0</integer>
+					</dict>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>Color</key>
+							<dict>
+								<key>a</key>
+								<string>0.1</string>
+								<key>b</key>
+								<string>0.4</string>
+								<key>g</key>
+								<string>0.4</string>
+								<key>r</key>
+								<string>1</string>
+							</dict>
+						</dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Align</key>
+						<integer>2</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr
+
+\f0\i\fs16 \cf0 Future version}</string>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
+				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{103.81889857975983, 71.842806821571543}, {132.51968624174128, 261.25900276517262}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica-Oblique</string>
+						<key>Size</key>
+						<real>9</real>
+					</dict>
+					<key>ID</key>
+					<integer>247</integer>
+					<key>Line</key>
+					<dict>
+						<key>ID</key>
+						<integer>244</integer>
+						<key>Position</key>
+						<real>0.91365551248654853</real>
+						<key>RotationType</key>
+						<integer>0</integer>
+					</dict>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>Color</key>
+							<dict>
+								<key>a</key>
+								<string>0.1</string>
+								<key>b</key>
+								<string>0.4</string>
+								<key>g</key>
+								<string>0.4</string>
+								<key>r</key>
+								<string>1</string>
+							</dict>
+						</dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Align</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
+{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
+
+\f0\i\fs16 \cf0 First version}</string>
+					</dict>
+					<key>TextPlacement</key>
+					<integer>0</integer>
+				</dict>
 			</array>
 			<key>GridInfo</key>
 			<dict>
@@ -1943,7 +2237,7 @@ Component 1}</string>
 	<key>WindowInfo</key>
 	<dict>
 		<key>CurrentSheet</key>
-		<integer>1</integer>
+		<integer>0</integer>
 		<key>Expanded_Canvases</key>
 		<array>
 			<string>Key protection</string>
@@ -1951,7 +2245,7 @@ Component 1}</string>
 		<key>FitInWindow</key>
 		<true/>
 		<key>Frame</key>
-		<string>{{0, 0}, {1680, 999}}</string>
+		<string>{{204, 272}, {1680, 999}}</string>
 		<key>ShowInfo</key>
 		<true/>
 		<key>ShowRuler</key>
@@ -1963,9 +2257,9 @@ Component 1}</string>
 		<key>TopSlabHeight</key>
 		<real>484</real>
 		<key>VisibleRegion</key>
-		<string>{{0, -37}, {782.99999999999989, 633.43045774647874}}</string>
+		<string>{{0, -27.000000000000036}, {818.00000000000011, 614.22007042253517}}</string>
 		<key>Zoom</key>
-		<real>1.450830140485313</real>
+		<real>1.3887530562347188</real>
 		<key>ZoomValues</key>
 		<array>
 			<array>