Merge commit 'origin/silc.1.1.branch'

[silc.git] / doc / draft-riikonen-silc-ke-auth-03.nroff

diff --git a/doc/draft-riikonen-silc-ke-auth-03.nroff b/doc/draft-riikonen-silc-ke-auth-03.nroff
index 2f41ac531672189fff1d4b4b67ad58a4a8b632e1..afc7d4153deeb626a42b92d5f780aa97413472c1 100644 (file)
--- a/doc/draft-riikonen-silc-ke-auth-03.nroff
+++ b/doc/draft-riikonen-silc-ke-auth-03.nroff
@@ -8,7 +8,7 @@
 .ds RF FORMFEED[Page %]
 .ds CF
 .ds LH Internet-Draft
-.ds RH 25 April 2001
+.ds RH 21 August 2001
 .ds CH
 .na
 .hy 0
@@ -16,14 +16,14 @@
 .nf
 Network Working Group                                      P. Riikonen
 Internet-Draft
-draft-riikonen-silc-ke-auth-02.txt                       25 April 2001
-Expires: 25 October 2001
+draft-riikonen-silc-ke-auth-03.txt                      21 August 2001
+Expires: 21 February 2002
 
 .in 3
 
 .ce 2
 SILC Key Exchange and Authentication Protocols
-<draft-riikonen-silc-ke-auth-02.txt>
+<draft-riikonen-silc-ke-auth-03.txt>
 
 .ti 0
 Status of this Memo
@@ -86,9 +86,9 @@ Table of Contents
       2.4.2 diffie-hellman-group2 ............................... 14
   2.5 Key Exchange Status Types ................................. 15
 3 SILC Connection Authentication Protocol ....................... 16
-  3.1 Connection Auth Payload ................................... 17
+  3.1 Connection Auth Payload ................................... 18
   3.2 Connection Authentication Types ........................... 18
-      3.2.1 Passphrase Authentication ........................... 18
+      3.2.1 Passphrase Authentication ........................... 19
       3.2.2 Public Key Authentication ........................... 19
   3.3 Connection Authentication Status Types .................... 19
 4 Security Considerations ....................................... 20
@@ -630,15 +630,15 @@ be produced in the following manner:
 
 .in 6
 K1 = hash(2 | KEY | HASH)
-K2 = hash(KEY | K1)
-K3 = hash(KEY | K1 | K2)  ...
+K2 = hash(KEY | HASH | K1)
+K3 = hash(KEY | HASH | K1 | K2)  ...
 
 Sending Encryption Key = K1 | K2 | K3 ...
 
 
 K1 = hash(3 | KEY | HASH)
-K2 = hash(KEY | K1)
-K3 = hash(KEY | K1 | K2)  ...
+K2 = hash(KEY | HASH | K1)
+K3 = hash(KEY | HASH | K1 | K2)  ...
 
 Receiving Encryption Key = K1 | K2 | K3 ...
 .in 3
@@ -993,6 +993,8 @@ SILC_AUTH_STATUS_OK type MUST be sent in SILC_PACKET_FAILURE packet.
 The length of status is 32 bits (4 bytes).  The following status types
 are defined:
 
+
+
 0   SILC_AUTH_OK
 
     Protocol was executed successfully.
@@ -1083,10 +1085,10 @@ security of this protocol.
 
 .nf
 Pekka Riikonen
-Kasarmikatu 11 A4
-70110 Kuopio
+Snellmanninkatu 34 A 15
+70100 Kuopio
 Finland
 
-EMail: priikone@poseidon.pspt.fi
+EMail: priikone@silcnet.org
 
-This Internet-Draft expires 25 October 2001
+This Internet-Draft expires 21 February 2002