apps/certpatch/certpatch.8: Merge with EOM 1.4

apps/certpatch/certpatch.c: Merge with EOM 1.6
exchange.c: Merge with EOM 1.114
ike_quick_mode.c: Merge with EOM 1.110
ike_phase_1.c: Merge with EOM 1.16
ike_auth.c: Merge with EOM 1.41
ike_aggressive.c: Merge with EOM 1.4
libcrypto.c: Merge with EOM 1.10
libcrypto.h: Merge with EOM 1.10
isakmpd.8: Merge with EOM 1.19
isakmpd.c: Merge with EOM 1.42
ipsec.h: Merge with EOM 1.40
init.c: Merge with EOM 1.22
message.c: Merge with EOM 1.143
message.h: Merge with EOM 1.49
sa.c: Merge with EOM 1.98
sa.h: Merge with EOM 1.54
policy.c: Merge with EOM 1.14
pf_key_v2.c: Merge with EOM 1.36
x509.c: Merge with EOM 1.32
x509.h: Merge with EOM 1.9
udp.c: Merge with EOM 1.46

author: niklas
Angelos copyrights

22 files changed, 66 insertions, 45 deletions

diff --git a/sbin/isakmpd/apps/certpatch/certpatch.8 b/sbin/isakmpd/apps/certpatch/certpatch.8
index f23799bfd25..393f61ad207 100644
--- a/sbin/isakmpd/apps/certpatch/certpatch.8
+++ b/sbin/isakmpd/apps/certpatch/certpatch.8
@@ -1,7 +1,8 @@
-.\" $OpenBSD: certpatch.8,v 1.2 1999/10/01 14:10:34 niklas Exp $
-.\" $EOM: certpatch.8,v 1.3 1999/09/23 01:38:46 angelos Exp $
+.\" $OpenBSD: certpatch.8,v 1.3 2000/02/01 02:46:17 niklas Exp $
+.\" $EOM: certpatch.8,v 1.4 2000/01/31 22:33:50 niklas Exp $
 .\"
 .\" Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+.\" Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/apps/certpatch/certpatch.c b/sbin/isakmpd/apps/certpatch/certpatch.c
index 5b54a71fe09..518c8f32d87 100644
--- a/sbin/isakmpd/apps/certpatch/certpatch.c
+++ b/sbin/isakmpd/apps/certpatch/certpatch.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: certpatch.c,v 1.6 2000/01/26 15:22:41 niklas Exp $	*/
-/*	$EOM: certpatch.c,v 1.5 2000/01/10 22:02:00 angelos Exp $	*/
+/*	$OpenBSD: certpatch.c,v 1.7 2000/02/01 02:46:17 niklas Exp $	*/
+/*	$EOM: certpatch.c,v 1.6 2000/01/31 22:33:50 niklas Exp $	*/
 
 /*
  * Copyright (c) 1999 Niels Provos.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c
index 5230e5c2221..f59ffdbc23c 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: exchange.c,v 1.25 2000/01/26 15:20:29 niklas Exp $	*/
-/*	$EOM: exchange.c,v 1.113 1999/11/28 17:46:28 ho Exp $	*/
+/*	$OpenBSD: exchange.c,v 1.26 2000/02/01 02:46:17 niklas Exp $	*/
+/*	$EOM: exchange.c,v 1.114 2000/01/31 22:33:44 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/ike_aggressive.c b/sbin/isakmpd/ike_aggressive.c
index 64f9ce1ac81..d4bb1d4ae56 100644
--- a/sbin/isakmpd/ike_aggressive.c
+++ b/sbin/isakmpd/ike_aggressive.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: ike_aggressive.c,v 1.3 1999/08/26 22:28:54 niklas Exp $	*/
-/*	$EOM: ike_aggressive.c,v 1.3 1999/08/19 01:14:04 angelos Exp $	*/
+/*	$OpenBSD: ike_aggressive.c,v 1.4 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: ike_aggressive.c,v 1.4 2000/01/31 22:33:45 niklas Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c
index 3380cefc625..14d492adf10 100644
--- a/sbin/isakmpd/ike_auth.c
+++ b/sbin/isakmpd/ike_auth.c
@@ -1,9 +1,10 @@
-/*	$OpenBSD: ike_auth.c,v 1.19 1999/10/01 14:10:54 niklas Exp $	*/
-/*	$EOM: ike_auth.c,v 1.40 1999/09/28 16:35:48 angelos Exp $	*/
+/*	$OpenBSD: ike_auth.c,v 1.20 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: ike_auth.c,v 1.41 2000/01/31 22:33:45 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 1999 Niels Provos.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/ike_phase_1.c b/sbin/isakmpd/ike_phase_1.c
index b79b52bbfdf..9a9397de5ff 100644
--- a/sbin/isakmpd/ike_phase_1.c
+++ b/sbin/isakmpd/ike_phase_1.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: ike_phase_1.c,v 1.11 2000/01/30 09:20:57 niklas Exp $	*/
-/*	$EOM: ike_phase_1.c,v 1.15 2000/01/30 07:09:26 angelos Exp $	*/
+/*	$OpenBSD: ike_phase_1.c,v 1.12 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: ike_phase_1.c,v 1.16 2000/01/31 22:33:45 niklas Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c
index d6b825f4bba..5da3db1b61f 100644
--- a/sbin/isakmpd/ike_quick_mode.c
+++ b/sbin/isakmpd/ike_quick_mode.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: ike_quick_mode.c,v 1.27 2000/01/31 08:38:28 niklas Exp $	*/
-/*	$EOM: ike_quick_mode.c,v 1.109 2000/01/31 08:39:44 niklas Exp $	*/
+/*	$OpenBSD: ike_quick_mode.c,v 1.28 2000/02/01 02:46:17 niklas Exp $	*/
+/*	$EOM: ike_quick_mode.c,v 1.110 2000/01/31 22:33:45 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/init.c b/sbin/isakmpd/init.c
index d81dc4446c1..2deeba43d36 100644
--- a/sbin/isakmpd/init.c
+++ b/sbin/isakmpd/init.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: init.c,v 1.12 2000/01/31 08:19:05 niklas Exp $	*/
-/*	$EOM: init.c,v 1.21 2000/01/31 05:28:50 angelos Exp $	*/
+/*	$OpenBSD: init.c,v 1.13 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: init.c,v 1.22 2000/01/31 22:33:46 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/ipsec.h b/sbin/isakmpd/ipsec.h
index 1d52ef6ecad..bbe3a3a263d 100644
--- a/sbin/isakmpd/ipsec.h
+++ b/sbin/isakmpd/ipsec.h
@@ -1,8 +1,9 @@
-/*	$OpenBSD: ipsec.h,v 1.12 2000/01/26 15:25:01 niklas Exp $	*/
-/*	$EOM: ipsec.h,v 1.39 1999/10/10 21:46:49 angelos Exp $	*/
+/*	$OpenBSD: ipsec.h,v 1.13 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: ipsec.h,v 1.40 2000/01/31 22:33:46 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index 15ba32e4d10..1b41526ffcf 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,7 +1,8 @@
-.\" $OpenBSD: isakmpd.8,v 1.15 2000/01/26 15:22:30 niklas Exp $
-.\" $EOM: isakmpd.8,v 1.18 1999/10/10 21:46:50 angelos Exp $
+.\" $OpenBSD: isakmpd.8,v 1.16 2000/02/01 02:46:18 niklas Exp $
+.\" $EOM: isakmpd.8,v 1.19 2000/01/31 22:33:46 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+.\" Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index 10ba8a7d470..1cac9249bb1 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: isakmpd.c,v 1.17 2000/01/31 08:18:54 niklas Exp $	*/
-/*	$EOM: isakmpd.c,v 1.41 2000/01/31 05:50:59 angelos Exp $	*/
+/*	$OpenBSD: isakmpd.c,v 1.18 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: isakmpd.c,v 1.42 2000/01/31 22:33:46 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/libcrypto.c b/sbin/isakmpd/libcrypto.c
index 2a33c1e87a2..14da92bca68 100644
--- a/sbin/isakmpd/libcrypto.c
+++ b/sbin/isakmpd/libcrypto.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: libcrypto.c,v 1.3 2000/01/31 08:19:13 niklas Exp $	*/
-/*	$EOM: libcrypto.c,v 1.9 2000/01/31 05:50:59 angelos Exp $	*/
+/*	$OpenBSD: libcrypto.c,v 1.4 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: libcrypto.c,v 1.10 2000/01/31 22:33:46 niklas Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/libcrypto.h b/sbin/isakmpd/libcrypto.h
index dcf272516ef..0bca5744c54 100644
--- a/sbin/isakmpd/libcrypto.h
+++ b/sbin/isakmpd/libcrypto.h
@@ -1,8 +1,9 @@
-/*	$OpenBSD: libcrypto.h,v 1.3 2000/01/31 08:19:13 niklas Exp $	*/
-/*	$EOM: libcrypto.h,v 1.9 2000/01/31 05:50:59 angelos Exp $	*/
+/*	$OpenBSD: libcrypto.h,v 1.4 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: libcrypto.h,v 1.10 2000/01/31 22:33:46 niklas Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c
index 157788249b8..42b820bbcfa 100644
--- a/sbin/isakmpd/message.c
+++ b/sbin/isakmpd/message.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: message.c,v 1.28 2000/01/31 08:38:28 niklas Exp $	*/
-/*	$EOM: message.c,v 1.142 2000/01/31 08:39:44 niklas Exp $	*/
+/*	$OpenBSD: message.c,v 1.29 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: message.c,v 1.143 2000/01/31 22:33:47 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/message.h b/sbin/isakmpd/message.h
index 95d0a440950..9def5b67003 100644
--- a/sbin/isakmpd/message.h
+++ b/sbin/isakmpd/message.h
@@ -1,8 +1,9 @@
-/*	$OpenBSD: message.h,v 1.11 1999/08/26 22:27:51 niklas Exp $	*/
-/*	$EOM: message.h,v 1.48 1999/08/18 00:44:57 angelos Exp $	*/
+/*	$OpenBSD: message.h,v 1.12 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: message.h,v 1.49 2000/01/31 22:33:47 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index 31140812edd..1e4c4f2b1f9 100644
--- a/sbin/isakmpd/pf_key_v2.c
+++ b/sbin/isakmpd/pf_key_v2.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: pf_key_v2.c,v 1.22 2000/01/31 08:38:29 niklas Exp $	*/
-/*	$EOM: pf_key_v2.c,v 1.35 2000/01/31 08:39:45 niklas Exp $	*/
+/*	$OpenBSD: pf_key_v2.c,v 1.23 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: pf_key_v2.c,v 1.36 2000/01/31 22:33:48 niklas Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c
index 62c50c5f423..fc4577325dc 100644
--- a/sbin/isakmpd/policy.c
+++ b/sbin/isakmpd/policy.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: policy.c,v 1.5 2000/01/27 18:07:28 niklas Exp $	*/
-/*	$EOM: policy.c,v 1.13 2000/01/27 17:38:43 ho Exp $ */
+/*	$OpenBSD: policy.c,v 1.6 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: policy.c,v 1.14 2000/01/31 22:33:48 niklas Exp $ */
 
 /*
- * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 68e694ebabf..8d3c0529496 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: sa.c,v 1.23 1999/08/26 22:27:51 niklas Exp $	*/
-/*	$EOM: sa.c,v 1.97 1999/08/18 00:44:57 angelos Exp $	*/
+/*	$OpenBSD: sa.c,v 1.24 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: sa.c,v 1.98 2000/01/31 22:33:48 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/sa.h b/sbin/isakmpd/sa.h
index 8a505cfea8d..6e6ddf93572 100644
--- a/sbin/isakmpd/sa.h
+++ b/sbin/isakmpd/sa.h
@@ -1,8 +1,9 @@
-/*	$OpenBSD: sa.h,v 1.14 1999/08/26 22:27:51 niklas Exp $	*/
-/*	$EOM: sa.h,v 1.53 1999/08/18 00:44:57 angelos Exp $	*/
+/*	$OpenBSD: sa.h,v 1.15 2000/02/01 02:46:18 niklas Exp $	*/
+/*	$EOM: sa.h,v 1.54 2000/01/31 22:33:49 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c
index ffee2c48a58..65907e3b215 100644
--- a/sbin/isakmpd/udp.c
+++ b/sbin/isakmpd/udp.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: udp.c,v 1.17 2000/01/26 15:22:17 niklas Exp $	*/
-/*	$EOM: udp.c,v 1.45 2000/01/25 06:51:20 angelos Exp $	*/
+/*	$OpenBSD: udp.c,v 1.18 2000/02/01 02:46:19 niklas Exp $	*/
+/*	$EOM: udp.c,v 1.46 2000/01/31 22:33:49 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c
index c8d4ccb6711..b3e05429d11 100644
--- a/sbin/isakmpd/x509.c
+++ b/sbin/isakmpd/x509.c
@@ -1,9 +1,10 @@
-/*	$OpenBSD: x509.c,v 1.20 2000/01/31 08:38:29 niklas Exp $	*/
-/*	$EOM: x509.c,v 1.31 2000/01/31 08:39:45 niklas Exp $	*/
+/*	$OpenBSD: x509.c,v 1.21 2000/02/01 02:46:19 niklas Exp $	*/
+/*	$EOM: x509.c,v 1.32 2000/01/31 22:33:49 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niels Provos.  All rights reserved.
  * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/isakmpd/x509.h b/sbin/isakmpd/x509.h
index 1b92e14f012..2135e15633f 100644
--- a/sbin/isakmpd/x509.h
+++ b/sbin/isakmpd/x509.h
@@ -1,8 +1,9 @@
-/*	$OpenBSD: x509.h,v 1.5 1999/08/26 22:29:49 niklas Exp $	*/
-/*	$EOM: x509.h,v 1.8 1999/08/18 00:44:58 angelos Exp $	*/
+/*	$OpenBSD: x509.h,v 1.6 2000/02/01 02:46:19 niklas Exp $	*/
+/*	$EOM: x509.h,v 1.9 2000/01/31 22:33:49 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niels Provos.  All rights reserved.
+ * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions