updates.

diff --git a/doc/whitepaper/silc_network.edg b/doc/whitepaper/silc_network.edg
index 58d184d452f6b7b54a448087e0a5234cc898ed26..3198926e8ac46884070b61c70ac0f5922d752b22 100644 (file)
--- a/doc/whitepaper/silc_network.edg
+++ b/doc/whitepaper/silc_network.edg
@@ -3,9 +3,9 @@ Version 3.50
 \r
 ## Globals Section:\r
 \r
-X 198\r
-Y 137\r
-Scale 97\r
+X -296\r
+Y 40\r
+Scale 100\r
 PosterRows 1\r
 PosterCols 1\r
 Color1 221,208,221\r
@@ -16,13 +16,13 @@ Color5 0,255,255
 Color6 0,0,255\r
 Color7 0,0,160\r
 Color8 128,0,128\r
-Color9 239,231,239\r
+Color9 243,237,243\r
 Color10 219,219,219\r
 Color11 244,244,244\r
 Color12 255,242,230\r
 Color13 240,255,240\r
 Color14 0,128,0\r
-Color15 128,128,255\r
+Color15 223,223,255\r
 Color16 255,255,0\r
 GridX 32\r
 GridY 32\r
@@ -45,11 +45,11 @@ SBarLblHeight 32
 SBarConHeight 24\r
 Parent ""\r
 LargeDropMenus FALSE\r
-LastEnd "block shorter"\r
-LastEndLen 36\r
+LastEnd "block"\r
+LastEndLen 25\r
 ConPointMarks 0\r
 CornerRadius 18\r
-Template "General Purpose Diagram.EDG"\r
+Template "silc_template.edg"\r
 \r
 DevMode 580\r
 {\r
@@ -74,11 +74,10 @@ DevMode 580
 00000100\r
 }\r
 \r
-DevNames 68\r
+DevNames 56\r
 {\r
 080011002200010077696E73706F6F6C004850204C617365724A657420313130\r
-30004C5054313A00000000000000000000000000000000002E006500DC455D00\r
-CC395900\r
+30004C5054313A0000000000000000000000000000000000\r
 }\r
 \r
 Preview 4388\r
@@ -1466,6 +1465,23 @@ FigureStyle "SILC Client"
   TypeFace "Arial"\r
 }\r
 \r
+FigureStyle "SILC Network Cloud"\r
+{\r
+  HasButton TRUE\r
+  Height 480\r
+  Width 672\r
+  BorderColor 227,225,255\r
+  FillColor 240,240,255\r
+  TextColor 192,192,192\r
+  BorderWidth 3\r
+  TextFormat 0x0A22\r
+  Behavior 0x00024E12\r
+  Symbol "cloud"\r
+  TypeSize 18\r
+  TypeWeight 700\r
+  TypeFace "Arial"\r
+}\r
+\r
 ## Connector Styles Section:\r
 \r
 ConnectorStyle "Plain"\r
@@ -1691,13 +1707,26 @@ ConnectorStyle "SILC Server To Router"
   Behavior 0x00000000\r
 }\r
 \r
+ConnectorStyle "Router to Router Prime"\r
+{\r
+  HasButton TRUE\r
+  End1 "block"\r
+  End2 "block"\r
+  End1Length 36\r
+  End2Length 36\r
+  LineWidth 3\r
+  EndBorderWidth 2\r
+  Color 130,130,130\r
+  Behavior 0x00000008\r
+}\r
+\r
 ## Figures & Connectors Section:\r
 \r
 Figure 1\r
 {\r
   Style "SILC INFO"\r
   Text "INFO"\r
-  Bounds 480,1856,1568,2112\r
+  Bounds 448,1536,1536,1792\r
   BorderColor 192,192,192\r
   FillColor 252,252,252\r
   TextColor 130,130,130\r
@@ -1720,8 +1749,8 @@ Connector 2
   Style "SILC Server To Router"\r
   Figure1 -1\r
   Figure2 -1\r
-  EndPoint1 640,1936\r
-  EndPoint2 912,1936\r
+  EndPoint1 608,1616\r
+  EndPoint2 880,1616\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -1737,7 +1766,7 @@ Figure 3
 {\r
   Style "SILC Background"\r
   Text ""\r
-  Bounds 352,464,1696,1840\r
+  Bounds 320,144,1664,1520\r
   BorderColor 192,192,192\r
   FillColor 245,241,245\r
   TextColor 130,130,130\r
@@ -1756,7 +1785,7 @@ Figure 4
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 576,1072,768,1168\r
+  Bounds 544,752,736,848\r
   BorderColor 130,130,130\r
   FillColor 240,255,240\r
   TextColor 130,130,130\r
@@ -1773,7 +1802,7 @@ Figure 5
 {\r
   Style "SILC Router"\r
   Text "Router"\r
-  Bounds 688,912,944,1040\r
+  Bounds 656,592,912,720\r
   BorderColor 130,130,130\r
   FillColor 255,242,230\r
   TextColor 130,130,130\r
@@ -1790,7 +1819,7 @@ Figure 6
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 880,1072,1072,1168\r
+  Bounds 848,752,1040,848\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1807,7 +1836,7 @@ Figure 7
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 1008,928,1200,1024\r
+  Bounds 976,608,1168,704\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1824,7 +1853,7 @@ Figure 8
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 864,784,1056,880\r
+  Bounds 832,464,1024,560\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1841,7 +1870,7 @@ Figure 9
 {\r
   Style "SILC Server"\r
   Text "Server"\r
-  Bounds 576,784,768,880\r
+  Bounds 544,464,736,560\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1858,7 +1887,7 @@ Figure 10
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 432,928,624,1024\r
+  Bounds 400,608,592,704\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1875,7 +1904,7 @@ Figure 11
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 992,1568,1184,1664\r
+  Bounds 960,1248,1152,1344\r
   BorderColor 130,130,130\r
   FillColor 240,255,240\r
   TextColor 130,130,130\r
@@ -1892,7 +1921,7 @@ Figure 12
 {\r
   Style "Rectangle"\r
   Text "Router"\r
-  Bounds 1104,1408,1360,1536\r
+  Bounds 1072,1088,1328,1216\r
   BorderColor 130,130,130\r
   FillColor 255,242,230\r
   TextColor 130,130,130\r
@@ -1909,7 +1938,7 @@ Figure 13
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 1296,1568,1488,1664\r
+  Bounds 1264,1248,1456,1344\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1926,7 +1955,7 @@ Figure 14
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 1424,1424,1616,1520\r
+  Bounds 1392,1104,1584,1200\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1943,7 +1972,7 @@ Figure 15
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 1280,1280,1472,1376\r
+  Bounds 1248,960,1440,1056\r
   BorderColor 130,130,130\r
   FillColor 240,255,240\r
   TextColor 130,130,130\r
@@ -1960,7 +1989,7 @@ Figure 16
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 992,1280,1184,1376\r
+  Bounds 960,960,1152,1056\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1977,7 +2006,7 @@ Figure 17
 {\r
   Style "Rectangle"\r
   Text "Server"\r
-  Bounds 848,1424,1040,1520\r
+  Bounds 816,1104,1008,1200\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -1994,7 +2023,7 @@ Figure 18
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 448,688,544,752\r
+  Bounds 416,368,512,432\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2010,7 +2039,7 @@ Figure 18
 Figure 19\r
 {\r
   Text ""\r
-  Bounds 841,1337,856,1352\r
+  Bounds 809,1017,824,1032\r
   FillColor 0,0,0\r
   BorderWidth 0\r
   BindToStyle FALSE\r
@@ -2025,8 +2054,8 @@ Connector 20
 {\r
   Figure1 5\r
   Figure2 19\r
-  EndPoint1 822,1040\r
-  EndPoint2 848,1344\r
+  EndPoint1 790,720\r
+  EndPoint2 816,1024\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 TRUE\r
   End1 "block"\r
@@ -2046,8 +2075,8 @@ Connector 21
   Style "Flow Closed 2"\r
   Figure1 19\r
   Figure2 12\r
-  EndPoint1 848,1344\r
-  EndPoint2 1104,1429\r
+  EndPoint1 816,1024\r
+  EndPoint2 1072,1109\r
   SuppressEnd1 TRUE\r
   SuppressEnd2 FALSE\r
   End1 "block"\r
@@ -2064,7 +2093,7 @@ Connector 21
 Figure 22\r
 {\r
   Text ""\r
-  Bounds 697,1609,712,1624\r
+  Bounds 665,1289,680,1304\r
   FillColor 0,0,0\r
   BorderWidth 0\r
   BindToStyle FALSE\r
@@ -2080,8 +2109,8 @@ Connector 23
   Style "SILC Router to Router"\r
   Figure1 22\r
   Figure2 -1\r
-  EndPoint1 704,1616\r
-  EndPoint2 480,1808\r
+  EndPoint1 672,1296\r
+  EndPoint2 448,1488\r
   SuppressEnd1 TRUE\r
   SuppressEnd2 FALSE\r
   End1 "block"\r
@@ -2100,8 +2129,8 @@ Connector 24
   Style "Flow Closed 2"\r
   Figure1 12\r
   Figure2 22\r
-  EndPoint1 1104,1507\r
-  EndPoint2 704,1616\r
+  EndPoint1 1072,1187\r
+  EndPoint2 672,1296\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 TRUE\r
   End1 "block"\r
@@ -2118,7 +2147,7 @@ Connector 24
 Figure 25\r
 {\r
   Text ""\r
-  Bounds 873,649,888,664\r
+  Bounds 841,329,856,344\r
   FillColor 0,0,0\r
   BorderWidth 0\r
   BindToStyle FALSE\r
@@ -2134,8 +2163,8 @@ Connector 26
   Style "Flow Closed 2"\r
   Figure1 5\r
   Figure2 25\r
-  EndPoint1 829,912\r
-  EndPoint2 880,656\r
+  EndPoint1 797,592\r
+  EndPoint2 848,336\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 TRUE\r
   End1 "block"\r
@@ -2154,8 +2183,8 @@ Connector 27
   Style "Flow Closed 2"\r
   Figure1 25\r
   Figure2 -1\r
-  EndPoint1 880,656\r
-  EndPoint2 1632,560\r
+  EndPoint1 848,336\r
+  EndPoint2 1600,240\r
   SuppressEnd1 TRUE\r
   SuppressEnd2 FALSE\r
   End1 "block"\r
@@ -2175,7 +2204,7 @@ Figure 28
   Style "Title"\r
   Text "Another Router\line \line \line \line \line \line \line \line \li-\r
 ne Cell B"\r
-  Bounds 1391,585,1676,1056\r
+  Bounds 1359,265,1644,736\r
   TextColor 130,130,130\r
   TextFormat 0x0022\r
   Behavior 0x00824192\r
@@ -2189,8 +2218,8 @@ Connector 29
   Style "Flow Closed"\r
   Figure1 10\r
   Figure2 5\r
-  EndPoint1 624,976\r
-  EndPoint2 688,976\r
+  EndPoint1 592,656\r
+  EndPoint2 656,656\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2207,8 +2236,8 @@ Connector 30
   Style "SILC Server To Router"\r
   Figure1 9\r
   Figure2 5\r
-  EndPoint1 720,880\r
-  EndPoint2 752,912\r
+  EndPoint1 688,560\r
+  EndPoint2 720,592\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2225,8 +2254,8 @@ Connector 31
   Style "Flow Closed"\r
   Figure1 8\r
   Figure2 5\r
-  EndPoint1 912,880\r
-  EndPoint2 880,912\r
+  EndPoint1 880,560\r
+  EndPoint2 848,592\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2242,8 +2271,8 @@ Connector 32
 {\r
   Figure1 7\r
   Figure2 5\r
-  EndPoint1 1008,976\r
-  EndPoint2 944,976\r
+  EndPoint1 976,656\r
+  EndPoint2 912,656\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2261,7 +2290,7 @@ Figure 33
   Label TRUE\r
   Style "Title"\r
   Text "SILC Network"\r
-  Bounds 790,494,1251,576\r
+  Bounds 758,174,1219,256\r
   TextColor 192,192,192\r
   TextFormat 0x0022\r
   Behavior 0x00824192\r
@@ -2275,7 +2304,7 @@ Figure 34
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 576,656,672,720\r
+  Bounds 544,336,640,400\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2294,7 +2323,7 @@ Figure 35
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 416,784,512,848\r
+  Bounds 384,464,480,528\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2311,7 +2340,7 @@ Figure 36
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1024,688,1120,752\r
+  Bounds 992,368,1088,432\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2328,7 +2357,7 @@ Figure 37
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1104,784,1200,848\r
+  Bounds 1072,464,1168,528\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2345,7 +2374,7 @@ Figure 38
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1200,704,1296,768\r
+  Bounds 1168,384,1264,448\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2362,7 +2391,7 @@ Figure 39
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1248,880,1344,944\r
+  Bounds 1216,560,1312,624\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2379,7 +2408,7 @@ Figure 40
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1408,1072,1504,1136\r
+  Bounds 1376,752,1472,816\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2396,7 +2425,7 @@ Figure 41
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1280,784,1376,848\r
+  Bounds 1248,464,1344,528\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2413,7 +2442,7 @@ Figure 42
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 416,1088,512,1152\r
+  Bounds 384,768,480,832\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2430,7 +2459,7 @@ Figure 43
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 464,1200,560,1264\r
+  Bounds 432,880,528,944\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2447,7 +2476,7 @@ Figure 44
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 640,1216,736,1280\r
+  Bounds 608,896,704,960\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2464,7 +2493,7 @@ Figure 45
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1344,1184,1440,1248\r
+  Bounds 1312,864,1408,928\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2481,7 +2510,7 @@ Figure 46
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1536,1120,1632,1184\r
+  Bounds 1504,800,1600,864\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2498,7 +2527,7 @@ Figure 47
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1504,1232,1600,1296\r
+  Bounds 1472,912,1568,976\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2515,7 +2544,7 @@ Figure 48
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1552,1680,1648,1744\r
+  Bounds 1520,1360,1616,1424\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2532,7 +2561,7 @@ Figure 49
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1424,1696,1520,1760\r
+  Bounds 1392,1376,1488,1440\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2549,7 +2578,7 @@ Figure 50
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1536,1568,1632,1632\r
+  Bounds 1504,1248,1600,1312\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2566,7 +2595,7 @@ Figure 51
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 848,1648,944,1712\r
+  Bounds 816,1328,912,1392\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2583,7 +2612,7 @@ Figure 52
 {\r
   Style "SILC Client"\r
   Text "Client"\r
-  Bounds 528,1296,624,1360\r
+  Bounds 496,976,592,1040\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2600,7 +2629,7 @@ Figure 53
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 1152,1712,1248,1776\r
+  Bounds 1120,1392,1216,1456\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2617,7 +2646,7 @@ Figure 54
 {\r
   Style "Rectangle"\r
   Text "Client"\r
-  Bounds 992,1728,1088,1792\r
+  Bounds 960,1408,1056,1472\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2634,8 +2663,8 @@ Connector 55
 {\r
   Figure1 4\r
   Figure2 5\r
-  EndPoint1 720,1072\r
-  EndPoint2 752,1040\r
+  EndPoint1 688,752\r
+  EndPoint2 720,720\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2652,8 +2681,8 @@ Connector 56
 {\r
   Figure1 6\r
   Figure2 5\r
-  EndPoint1 922,1072\r
-  EndPoint2 888,1040\r
+  EndPoint1 890,752\r
+  EndPoint2 856,720\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2670,8 +2699,8 @@ Connector 57
 {\r
   Figure1 16\r
   Figure2 12\r
-  EndPoint1 1136,1376\r
-  EndPoint2 1168,1408\r
+  EndPoint1 1104,1056\r
+  EndPoint2 1136,1088\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2688,8 +2717,8 @@ Connector 58
 {\r
   Figure1 15\r
   Figure2 12\r
-  EndPoint1 1328,1376\r
-  EndPoint2 1296,1408\r
+  EndPoint1 1296,1056\r
+  EndPoint2 1264,1088\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2706,8 +2735,8 @@ Connector 59
 {\r
   Figure1 14\r
   Figure2 12\r
-  EndPoint1 1424,1472\r
-  EndPoint2 1360,1472\r
+  EndPoint1 1392,1152\r
+  EndPoint2 1328,1152\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2724,8 +2753,8 @@ Connector 60
 {\r
   Figure1 13\r
   Figure2 12\r
-  EndPoint1 1338,1568\r
-  EndPoint2 1304,1536\r
+  EndPoint1 1306,1248\r
+  EndPoint2 1272,1216\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2742,8 +2771,8 @@ Connector 61
 {\r
   Figure1 11\r
   Figure2 12\r
-  EndPoint1 1136,1568\r
-  EndPoint2 1168,1536\r
+  EndPoint1 1104,1248\r
+  EndPoint2 1136,1216\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2760,8 +2789,8 @@ Connector 62
 {\r
   Figure1 17\r
   Figure2 12\r
-  EndPoint1 1040,1472\r
-  EndPoint2 1104,1472\r
+  EndPoint1 1008,1152\r
+  EndPoint2 1072,1152\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block short"\r
@@ -2779,8 +2808,8 @@ Connector 63
   Style "SILC Router to Router"\r
   Figure1 -1\r
   Figure2 -1\r
-  EndPoint1 624,1904\r
-  EndPoint2 928,1904\r
+  EndPoint1 592,1584\r
+  EndPoint2 896,1584\r
   SuppressEnd1 FALSE\r
   SuppressEnd2 FALSE\r
   End1 "block"\r
@@ -2799,7 +2828,7 @@ Figure 64
   Label TRUE\r
   Style "Title"\r
   Text "Router to Router Connection\line Server to Router Connection"\r
-  Bounds 1037,1888,1400,1951\r
+  Bounds 1005,1568,1368,1631\r
   TextColor 130,130,130\r
   TextFormat 0x0024\r
   Behavior 0x00824192\r
@@ -2816,7 +2845,7 @@ Figure 65
 {\r
   Style "Rectangle"\r
   Text ""\r
-  Bounds 624,2064,912,2096\r
+  Bounds 592,1744,880,1776\r
   BorderColor 130,130,130\r
   FillColor 219,219,219\r
   TextColor 130,130,130\r
@@ -2834,7 +2863,7 @@ Figure 66
 {\r
   Style "Rectangle"\r
   Text ""\r
-  Bounds 624,2032,912,2064\r
+  Bounds 592,1712,880,1744\r
   BorderColor 130,130,130\r
   FillColor 244,244,244\r
   TextColor 130,130,130\r
@@ -2852,7 +2881,7 @@ Figure 67
 {\r
   Style "Rectangle"\r
   Text ""\r
-  Bounds 624,1968,912,2000\r
+  Bounds 592,1648,880,1680\r
   BorderColor 130,130,130\r
   FillColor 255,242,230\r
   TextColor 130,130,130\r
@@ -2870,7 +2899,7 @@ Figure 68
 {\r
   Style "Rectangle"\r
   Text ""\r
-  Bounds 624,2000,912,2032\r
+  Bounds 592,1680,880,1712\r
   BorderColor 130,130,130\r
   FillColor 240,255,240\r
   TextColor 130,130,130\r
@@ -2889,7 +2918,7 @@ Figure 69
   Label TRUE\r
   Style "Title"\r
   Text "Router\line Server/Backup Router\line Server\line Client"\r
-  Bounds 1037,1971,1320,2096\r
+  Bounds 1005,1651,1288,1776\r
   TextColor 130,130,130\r
   TextFormat 0x0024\r
   Behavior 0x00824192\r
@@ -2905,7 +2934,7 @@ Figure 70
   Style "Title"\r
   Text "\line \line \line \line \line \line Cell A\line \line \line \line-\r
  \line \line \line Another Router"\r
-  Bounds 387,1112,672,1771\r
+  Bounds 355,792,640,1451\r
   TextColor 130,130,130\r
   TextFormat 0x0022\r
   Behavior 0x00824192\r

diff --git a/doc/whitepaper/silc_protocol.html b/doc/whitepaper/silc_protocol.html
index 39b1cb7c2357aa94d73298d163d4c6e3a2156e69..2adc9615b86e74acbf25510975c8de88934a3aa3 100644 (file)
--- a/doc/whitepaper/silc_protocol.html
+++ b/doc/whitepaper/silc_protocol.html
@@ -270,9 +270,44 @@ The rekey process can be executed with or without the Perfect Forward
 Secrecy (PFS).
 <p>
 
-<img src="silc_ske.JPG" alt="SILC Key Exchange (SKE) Protocol" align="center" border"0">
-<p><br>
-
+The security properties that are used in the SILC session are also
+negotiated during the SKE.  The protocol has initiator and responder.
+The initator is the one who starts the SKE negotiation and responder is
+the one who receives the SKE negotiation.  When the protocol is started
+initiator sends a list of security properties that it supports.  The
+responder then selects the security properties it supports and sends
+its reply to the initiator.  The security properties includes ciphers,
+hash functions, public key algorithms, HMAC functions and other
+security properties.  The responder can always choose the properties
+it supports.
+<p>
+
+After the security properties are selected the protocol continues
+by performing the Diffie-Hellman key exchange algorithm.  At the same
+time the intiator and responder also sends their public keys or
+certificates to each other.  The responder also computes a signature
+that the initiator will verify.  It is also possible to perform a
+mutual authentication when both of the parties computes a signature
+which are verified by each other independently.  If any of the phases
+of the protocol are to fail the connection is closed immeadiately.
+<p>
+
+The public key or certificate that is received during the SKE protocol
+must be verified.  If it is not verified it would be possible to 
+execute a man-in-the-middle attack against the SKE protocol.  If
+certificates are used they can be verified by a third party Certification
+Authority (CA).  Verifying a public key requires either confirming
+a fingerprint of the public key over phone or email, or the server
+can for example publish the fingerprint (and the public key) on some 
+website.  In real life systems accepting the public key without
+verification, however is often desired.  In many security protocols,
+such as in SSH2, the public key is accepted without verification
+in the first time when the connection is created.  The public key is
+then cached on local hard disk.  When connecting next time to the
+server the public key on local cache is verified against the public
+key server sent.  In real life this works most of the time.  However,
+if client (or server) cannot trust this, it must find some other way
+to verify the received public key or certificate.
 
 
 <p><br>
@@ -612,7 +647,7 @@ protocol clients can fetch other clients public keys from servers.
 However, the servers may not have authenticated the fetched public key so
 that should not be fully trusted.  Use of certificates can solve the
 problem.  The receiver's certificate could be authenticated by a third
-party Certificate Authority (CA).
+party Certification Authority (CA).
 
 <p>
 Usually verifying the public key is not a problem since the receiver
@@ -670,7 +705,10 @@ For comprehensive introduction to cryptography refer to the
 - Certificate
 <p>
 
-- Certificate Authority (CA)
+- Certification Authority (CA)
+<p>
+
+- Diffie-Hellman key exchange
 <p>
 
 - Encryption