TO-DO: Merge with EOM 1.34

DESIGN-NOTES: Merge with EOM 1.41

author: niklas
Up-to-date

2 files changed, 14 insertions, 10 deletions

diff --git a/sbin/isakmpd/DESIGN-NOTES b/sbin/isakmpd/DESIGN-NOTES
index 0f684194e61..d5a89f3bc93 100644
--- a/sbin/isakmpd/DESIGN-NOTES
+++ b/sbin/isakmpd/DESIGN-NOTES
@@ -1,5 +1,5 @@
-$OpenBSD: DESIGN-NOTES,v 1.8 1999/04/05 21:03:12 niklas Exp $
-$EOM: DESIGN-NOTES,v 1.40 1999/04/02 01:08:54 niklas Exp $
+$OpenBSD: DESIGN-NOTES,v 1.9 1999/04/27 21:13:28 niklas Exp $
+$EOM: DESIGN-NOTES,v 1.41 1999/04/27 09:39:07 niklas Exp $
 
 General coding conventions
 --------------------------
@@ -51,7 +51,10 @@ gmp_util.c	Utilities to ease interfaceing to GMP.
 hash.c		Generic hash handling.
 if.c		Network interface details.
 ike_auth.c	IKE authentication method abstraction.
+ike_aggressive.c
+		IKE's main mode exchange logic.
 ike_main_mode.c	IKE's main mode exchange logic.
+ike_phase_1.c	Common parts IKE's main & aggressive modes' exchange logic.
 ike_quick_mode.c
 		IKE's quick mode logic.
 init.c		Initialization of all modules (might be autogenned in the 
diff --git a/sbin/isakmpd/TO-DO b/sbin/isakmpd/TO-DO
index 3a99c1cded3..7a075c99829 100644
--- a/sbin/isakmpd/TO-DO
+++ b/sbin/isakmpd/TO-DO
@@ -1,5 +1,5 @@
-$OpenBSD: TO-DO,v 1.8 1999/04/19 19:55:56 niklas Exp $
-$EOM: TO-DO,v 1.33 1999/04/17 15:48:23 niklas Exp $
+$OpenBSD: TO-DO,v 1.9 1999/04/27 21:13:28 niklas Exp $
+$EOM: TO-DO,v 1.34 1999/04/27 09:39:06 niklas Exp $
 
 This file is pretty lame as it should really contain a lot more given that
 the program is far from ready in any area.
@@ -47,13 +47,13 @@ the program is far from ready in any area.
 
 * SIGHUP handler with reparsing of config file. [done]
 
-* RSA signature authentication <Niels> [done]
+* RSA signature authentication. <Niels> [done]
 
-* DSS signature authentication
+* DSS signature authentication.
 
-* RSA encryption authentication
+* RSA encryption authentication.
 
-* New group mode
+* New group mode.
 
 * DELETE payload handling, and generation from ui.
 
@@ -91,12 +91,13 @@ the program is far from ready in any area.
 * If an exchange is on-going when a rekey event happens, drop the request.
   [done]
 
-* INITIAL CONTACT notification sending when appropriate.
+* INITIAL CONTACT notification sending when appropriate. [done]
 
-* INITIAL CONTACT notification handling.
+* INITIAL CONTACT notification handling. [done]
 
 * IPsec SAs could also do with timers protecting its lifetime, if say,
   someone changed the lifetime of the IPsec SA in stack under us.
+  [done for KLIPS]
 
 * Handle notifications showing the peer did not want to continue this exchange.