(c) 2001

36 files changed, 85 insertions, 80 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 8fa24ab982c..31ca6cc60b2 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.30 2001/01/26 21:49:36 ho Exp $
+#	$OpenBSD: Makefile,v 1.31 2001/01/27 12:03:31 niklas Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
 # Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
-# Copyright (c) 2000 Håkan Olsson.  All rights reserved.
+# Copyright (c) 2000, 2001 Håkan Olsson.  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/Makefile b/sbin/isakmpd/apps/certpatch/Makefile
index 335fea6485e..573020c96db 100644
--- a/sbin/isakmpd/apps/certpatch/Makefile
+++ b/sbin/isakmpd/apps/certpatch/Makefile
@@ -1,8 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 2001/01/27 11:24:39 niklas Exp $
+#	$OpenBSD: Makefile,v 1.5 2001/01/27 12:03:37 niklas Exp $
 #	$EOM: Makefile,v 1.6 2000/03/28 21:22:06 ho Exp $
 
 #
 # Copyright (c) 1999 Niels Provos.  All rights reserved.
+# Copyright (c) 2001 Niklas Hallqvist.  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 06ad17657bf..fb1a68c0c19 100644
--- a/sbin/isakmpd/apps/certpatch/certpatch.c
+++ b/sbin/isakmpd/apps/certpatch/certpatch.c
@@ -1,10 +1,11 @@
-/*	$OpenBSD: certpatch.c,v 1.13 2001/01/27 11:24:39 niklas Exp $	*/
+/*	$OpenBSD: certpatch.c,v 1.14 2001/01/27 12:03:37 niklas Exp $	*/
 /*	$EOM: certpatch.c,v 1.11 2000/12/21 14:50:09 ho Exp $	*/
 
 /*
  * Copyright (c) 1999 Niels Provos.  All rights reserved.
  * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
- * Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2001 Håkan Olsson.  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/conf.c b/sbin/isakmpd/conf.c
index 3b603ee4d44..2fd7a066674 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.c,v 1.26 2001/01/26 12:12:51 niklas Exp $	*/
+/*	$OpenBSD: conf.c,v 1.27 2001/01/27 12:03:31 niklas Exp $	*/
 /*	$EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 2000 Håkan Olsson.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sbin/isakmpd/conf.h b/sbin/isakmpd/conf.h
index e193451e957..1410160f885 100644
--- a/sbin/isakmpd/conf.h
+++ b/sbin/isakmpd/conf.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.h,v 1.13 2001/01/26 12:12:51 niklas Exp $	*/
+/*	$OpenBSD: conf.h,v 1.14 2001/01/27 12:03:31 niklas Exp $	*/
 /*	$EOM: conf.h,v 1.13 2000/09/18 00:01:47 ho Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 2000 Håkan Olsson.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sbin/isakmpd/connection.c b/sbin/isakmpd/connection.c
index deebcc8c5f1..53130e90fa5 100644
--- a/sbin/isakmpd/connection.c
+++ b/sbin/isakmpd/connection.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: connection.c,v 1.12 2001/01/26 12:12:51 niklas Exp $	*/
+/*	$OpenBSD: connection.c,v 1.13 2001/01/27 12:03:31 niklas Exp $	*/
 /*	$EOM: connection.c,v 1.28 2000/11/23 12:21:18 niklas Exp $	*/
 
 /*
- * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 1999 Hakan Olsson.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sbin/isakmpd/dnssec.c b/sbin/isakmpd/dnssec.c
index b4e280c8793..646fc883161 100644
--- a/sbin/isakmpd/dnssec.c
+++ b/sbin/isakmpd/dnssec.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: dnssec.c,v 1.1 2001/01/26 21:49:36 ho Exp $	*/
+/*	$OpenBSD: dnssec.c,v 1.2 2001/01/27 12:03:32 niklas Exp $	*/
 
 /*
- * Copyright (c) 2000 Håkan Olsson.  All rights reserved.
+ * Copyright (c) 2001 Håkan Olsson.  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/dnssec.h b/sbin/isakmpd/dnssec.h
index 22c59ce4af6..21377aea40c 100644
--- a/sbin/isakmpd/dnssec.h
+++ b/sbin/isakmpd/dnssec.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: dnssec.h,v 1.1 2001/01/26 21:49:37 ho Exp $	*/
+/*	$OpenBSD: dnssec.h,v 1.2 2001/01/27 12:03:32 niklas Exp $	*/
 
 /*
- * Copyright (c) 2000 Håkan Olsson.  All rights reserved.
+ * Copyright (c) 2001 Håkan Olsson.  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 1475a243025..ec497c51010 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: exchange.c,v 1.39 2001/01/26 12:12:51 niklas Exp $	*/
+/*	$OpenBSD: exchange.c,v 1.40 2001/01/27 12:03:32 niklas Exp $	*/
 /*	$EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
- * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2001 Angelos D. Keromytis.  All rights reserved.
  * Copyright (c) 1999, 2000 Håkan Olsson.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sbin/isakmpd/exchange.h b/sbin/isakmpd/exchange.h
index 8c493bf5e60..1648518f52e 100644
--- a/sbin/isakmpd/exchange.h
+++ b/sbin/isakmpd/exchange.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: exchange.h,v 1.16 2001/01/26 12:12:51 niklas Exp $	*/
+/*	$OpenBSD: exchange.h,v 1.17 2001/01/27 12:03:32 niklas Exp $	*/
 /*	$EOM: exchange.h,v 1.28 2000/09/28 12:54:28 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  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/genconstants.sh b/sbin/isakmpd/genconstants.sh
index 24eba0caf7b..0744d7f0e19 100644
--- a/sbin/isakmpd/genconstants.sh
+++ b/sbin/isakmpd/genconstants.sh
@@ -1,8 +1,8 @@
-#	$OpenBSD: genconstants.sh,v 1.7 2001/01/26 12:12:51 niklas Exp $
+#	$OpenBSD: genconstants.sh,v 1.8 2001/01/27 12:03:32 niklas Exp $
 #	$EOM: genconstants.sh,v 1.6 1999/04/02 01:15:53 niklas Exp $
 
 #
-# Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+# Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  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/genfields.sh b/sbin/isakmpd/genfields.sh
index 9626c8b26e7..827bf2df1d7 100644
--- a/sbin/isakmpd/genfields.sh
+++ b/sbin/isakmpd/genfields.sh
@@ -1,8 +1,8 @@
-#	$OpenBSD: genfields.sh,v 1.5 2001/01/26 12:12:51 niklas Exp $
+#	$OpenBSD: genfields.sh,v 1.6 2001/01/27 12:03:32 niklas Exp $
 #	$EOM: genfields.sh,v 1.5 1999/04/02 01:15:55 niklas Exp $
 
 #
-# Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+# Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  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 e98a530a482..95042e9f0fc 100644
--- a/sbin/isakmpd/ike_auth.c
+++ b/sbin/isakmpd/ike_auth.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ike_auth.c,v 1.35 2001/01/27 11:53:57 itojun Exp $	*/
+/*	$OpenBSD: ike_auth.c,v 1.36 2001/01/27 12:03:32 niklas Exp $	*/
 /*	$EOM: ike_auth.c,v 1.59 2000/11/21 00:21:31 angelos Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 1999 Niels Provos.  All rights reserved.
  * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
- * Copyright (c) 2000 Håkan Olsson.  All rights reserved.
+ * Copyright (c) 2000, 2001 Håkan Olsson.  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 4a057071332..75e66dd515d 100644
--- a/sbin/isakmpd/ike_quick_mode.c
+++ b/sbin/isakmpd/ike_quick_mode.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: ike_quick_mode.c,v 1.42 2001/01/26 12:12:51 niklas Exp $	*/
+/*	$OpenBSD: ike_quick_mode.c,v 1.43 2001/01/27 12:03:33 niklas Exp $	*/
 /*	$EOM: ike_quick_mode.c,v 1.139 2001/01/26 10:43:17 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
- * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
- * Copyright (c) 2000 Håkan Olsson.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Angelos D. Keromytis.  All rights reserved.
+ * Copyright (c) 2000, 2001 Håkan Olsson.  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.c b/sbin/isakmpd/ipsec.c
index 32a948d192e..9d6ae446da7 100644
--- a/sbin/isakmpd/ipsec.c
+++ b/sbin/isakmpd/ipsec.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: ipsec.c,v 1.37 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: ipsec.c,v 1.38 2001/01/27 12:03:33 niklas Exp $	*/
 /*	$EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2001 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 bf581bc6e8d..7eb0b7caeef 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: isakmpd.c,v 1.26 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: isakmpd.c,v 1.27 2001/01/27 12:03:33 niklas Exp $	*/
 /*	$EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
  * Copyright (c) 1999, 2000 Håkan Olsson.  All rights reserved.
  *
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index c3208bca61a..56eb8af64b7 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,8 +1,8 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.47 2001/01/26 11:08:58 niklas Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.48 2001/01/27 12:03:33 niklas Exp $
 .\" $EOM: isakmpd.conf.5,v 1.57 2000/12/21 14:43:17 ho Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
-.\" Copyright (c) 2000 Håkan Olsson.  All rights reserved.
+.\" Copyright (c) 2000, 2001 Håkan Olsson.  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 d2b6ab4ae03..d03eb2b5b07 100644
--- a/sbin/isakmpd/libcrypto.c
+++ b/sbin/isakmpd/libcrypto.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: libcrypto.c,v 1.9 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: libcrypto.c,v 1.10 2001/01/27 12:03:33 niklas Exp $	*/
 /*	$EOM: libcrypto.c,v 1.14 2000/09/28 12:53:27 niklas Exp $	*/
 
 /*
- * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 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
diff --git a/sbin/isakmpd/log.c b/sbin/isakmpd/log.c
index fb2b042d6b4..11f03980545 100644
--- a/sbin/isakmpd/log.c
+++ b/sbin/isakmpd/log.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: log.c,v 1.15 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: log.c,v 1.16 2001/01/27 12:03:33 niklas Exp $	*/
 /*	$EOM: log.c,v 1.30 2000/09/29 08:19:23 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 1999, 2000 Håkan Olsson.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c
index 2884c5be9a3..a4c10659d49 100644
--- a/sbin/isakmpd/message.c
+++ b/sbin/isakmpd/message.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: message.c,v 1.35 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: message.c,v 1.36 2001/01/27 12:03:34 niklas Exp $	*/
 /*	$EOM: message.c,v 1.156 2000/10/10 12:36:39 provos Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
  * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
  * Copyright (c) 1999, 2000 Håkan Olsson.  All rights reserved.
  *
diff --git a/sbin/isakmpd/pf_encap.c b/sbin/isakmpd/pf_encap.c
index cf2fb84d74c..05e72bc5b91 100644
--- a/sbin/isakmpd/pf_encap.c
+++ b/sbin/isakmpd/pf_encap.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: pf_encap.c,v 1.19 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: pf_encap.c,v 1.20 2001/01/27 12:03:34 niklas Exp $	*/
 /*	$EOM: pf_encap.c,v 1.73 2000/12/04 04:46:34 angelos Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2001 Niklas Hallqvist.  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 cdb09ff30a8..ae64751318d 100644
--- a/sbin/isakmpd/pf_key_v2.c
+++ b/sbin/isakmpd/pf_key_v2.c
@@ -1,9 +1,9 @@
-/*      $OpenBSD: pf_key_v2.c,v 1.44 2001/01/26 12:12:52 niklas Exp $  */
+/*      $OpenBSD: pf_key_v2.c,v 1.45 2001/01/27 12:03:34 niklas Exp $  */
 /*	$EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $	*/
 
 /*
- * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
- * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 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 d38ef4cae65..b8e514ba19e 100644
--- a/sbin/isakmpd/policy.c
+++ b/sbin/isakmpd/policy.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: policy.c,v 1.20 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: policy.c,v 1.21 2001/01/27 12:03:34 niklas Exp $	*/
 /*	$EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */
 
 /*
- * Copyright (c) 1999, 2000 Angelos D. Keromytis.  All rights reserved.
- * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Angelos D. Keromytis.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 Niklas Hallqvist.  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/prf.h b/sbin/isakmpd/prf.h
index 5cb91026f5d..07e7c830d19 100644
--- a/sbin/isakmpd/prf.h
+++ b/sbin/isakmpd/prf.h
@@ -1,8 +1,9 @@
-/*	$OpenBSD: prf.h,v 1.4 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: prf.h,v 1.5 2001/01/27 12:03:36 niklas Exp $	*/
 /*	$EOM: prf.h,v 1.1 1998/07/11 20:06:22 provos Exp $	*/
 
 /*
  * Copyright (c) 1998 Niels Provos.  All rights reserved.
+ * Copyright (c) 2001 Niklas Hallqvist.  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/regress/b2n/b2ntest.c b/sbin/isakmpd/regress/b2n/b2ntest.c
index 0c8959171e5..66a7241aeec 100644
--- a/sbin/isakmpd/regress/b2n/b2ntest.c
+++ b/sbin/isakmpd/regress/b2n/b2ntest.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: b2ntest.c,v 1.4 2001/01/26 12:04:19 niklas Exp $	*/
+/*	$OpenBSD: b2ntest.c,v 1.5 2001/01/27 12:03:37 niklas Exp $	*/
 /*	$EOM: b2ntest.c,v 1.4 1998/07/16 19:31:55 provos Exp $	*/
 
 /*
  * Copyright (c) 1998 Niels Provos.  All rights reserved.
+ * Copyright (c) 2001 Niklas Hallqvist.  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/regress/crypto/cryptotest.c b/sbin/isakmpd/regress/crypto/cryptotest.c
index 3e63435bfd7..66f73c736e6 100644
--- a/sbin/isakmpd/regress/crypto/cryptotest.c
+++ b/sbin/isakmpd/regress/crypto/cryptotest.c
@@ -1,8 +1,9 @@
-/*	$OpenBSD: cryptotest.c,v 1.4 2001/01/26 12:04:19 niklas Exp $	*/
+/*	$OpenBSD: cryptotest.c,v 1.5 2001/01/27 12:03:38 niklas Exp $	*/
 /*	$EOM: cryptotest.c,v 1.5 1998/10/07 16:40:49 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998 Niels Provos.  All rights reserved.
+ * Copyright (c) 2001 Niklas Hallqvist.  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/regress/rsakeygen/Makefile b/sbin/isakmpd/regress/rsakeygen/Makefile
index b25f445fd2e..552997f9db6 100644
--- a/sbin/isakmpd/regress/rsakeygen/Makefile
+++ b/sbin/isakmpd/regress/rsakeygen/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.11 2001/01/27 11:24:43 niklas Exp $
+#	$OpenBSD: Makefile,v 1.12 2001/01/27 12:03:38 niklas Exp $
 #	$EOM: Makefile,v 1.10 2000/03/28 21:23:24 ho Exp $
 
 #
 # Copyright (c) 1999 Niels Provos.  All rights reserved.
-# Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+# Copyright (c) 1999, 2001 Niklas Hallqvist.  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/regress/rsakeygen/rsakeygen.c b/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
index f2ddbc8fad7..0dfb4d80f6d 100644
--- a/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
+++ b/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
@@ -1,9 +1,10 @@
-/*	$OpenBSD: rsakeygen.c,v 1.12 2001/01/27 11:24:43 niklas Exp $	*/
+/*	$OpenBSD: rsakeygen.c,v 1.13 2001/01/27 12:03:38 niklas Exp $	*/
 /*	$EOM: rsakeygen.c,v 1.10 2000/12/21 15:18:53 ho Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niels Provos.  All rights reserved.
- * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2001 Håkan Olsson.  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/regress/x509/Makefile b/sbin/isakmpd/regress/x509/Makefile
index 83890f0d3f2..fef2e7cadd2 100644
--- a/sbin/isakmpd/regress/x509/Makefile
+++ b/sbin/isakmpd/regress/x509/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.11 2001/01/27 11:24:44 niklas Exp $
+#	$OpenBSD: Makefile,v 1.12 2001/01/27 12:03:38 niklas Exp $
 #	$EOM: Makefile,v 1.16 2000/09/28 12:53:27 niklas Exp $
 
 #
 # Copyright (c) 1999 Niels Provos.  All rights reserved.
-# Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+# Copyright (c) 1999, 2001 Niklas Hallqvist.  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/regress/x509/x509test.c b/sbin/isakmpd/regress/x509/x509test.c
index a377bf87d41..8b4271c46aa 100644
--- a/sbin/isakmpd/regress/x509/x509test.c
+++ b/sbin/isakmpd/regress/x509/x509test.c
@@ -1,9 +1,10 @@
-/*	$OpenBSD: x509test.c,v 1.14 2001/01/27 11:24:44 niklas Exp $	*/
+/*	$OpenBSD: x509test.c,v 1.15 2001/01/27 12:03:39 niklas Exp $	*/
 /*	$EOM: x509test.c,v 1.9 2000/12/21 15:24:25 ho Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niels Provos.  All rights reserved.
- * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2001 Håkan Olsson.  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.c b/sbin/isakmpd/sa.c
index 0584adb9fcd..6525721c1fa 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: sa.c,v 1.36 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: sa.c,v 1.37 2001/01/27 12:03:36 niklas Exp $	*/
 /*	$EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
- * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2001 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 cb6b51dbc23..cfe8759de5c 100644
--- a/sbin/isakmpd/sa.h
+++ b/sbin/isakmpd/sa.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: sa.h,v 1.19 2001/01/14 23:40:01 angelos Exp $	*/
+/*	$OpenBSD: sa.h,v 1.20 2001/01/27 12:03:36 niklas Exp $	*/
 /*	$EOM: sa.h,v 1.58 2000/10/10 12:39:01 provos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
- * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
+ * Copyright (c) 1999, 2001 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/sysdep/openbsd/Makefile.sysdep b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
index 7738fcd8720..b8d2e44f446 100644
--- a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.sysdep,v 1.14 2001/01/27 11:24:45 niklas Exp $
+#	$OpenBSD: Makefile.sysdep,v 1.15 2001/01/27 12:03:39 niklas Exp $
 #	$EOM: Makefile.sysdep,v 1.18 2001/01/26 10:55:22 niklas Exp $
 
 #
-# Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
+# Copyright (c) 1999, 2000, 2001 Niklas Hallqvist.  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 1c80286e179..d93d84b5120 100644
--- a/sbin/isakmpd/udp.c
+++ b/sbin/isakmpd/udp.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: udp.c,v 1.26 2001/01/26 12:12:52 niklas Exp $	*/
+/*	$OpenBSD: udp.c,v 1.27 2001/01/27 12:03:36 niklas Exp $	*/
 /*	$EOM: udp.c,v 1.57 2001/01/26 10:09:57 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999, 2001 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
diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c
index d81080a1823..8890f607561 100644
--- a/sbin/isakmpd/x509.c
+++ b/sbin/isakmpd/x509.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: x509.c,v 1.38 2001/01/26 16:40:52 niklas Exp $	*/
+/*	$OpenBSD: x509.c,v 1.39 2001/01/27 12:03:36 niklas Exp $	*/
 /*	$EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho 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.
+ * Copyright (c) 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1999, 2000, 2001 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
@@ -48,10 +48,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#if MP_FLAVOUR == MP_FLAVOUR_GMP
-#include <gmp.h>
-#endif
-
 #ifdef USE_POLICY
 #include <regex.h>
 #include <keynote.h>
@@ -65,10 +61,11 @@
 #include "exchange.h"
 #include "hash.h"
 #include "ike_auth.h"
-#include "sa.h"
 #include "ipsec.h"
 #include "log.h"
+#include "math_mp.h"
 #include "policy.h"
+#include "sa.h"
 #include "x509.h"
 
 /* 
diff --git a/sbin/isakmpd/x509.h b/sbin/isakmpd/x509.h
index 85a7eddbadd..109512f7f52 100644
--- a/sbin/isakmpd/x509.h
+++ b/sbin/isakmpd/x509.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: x509.h,v 1.9 2001/01/26 16:40:52 niklas Exp $	*/
+/*	$OpenBSD: x509.h,v 1.10 2001/01/27 12:03:36 niklas Exp $	*/
 /*	$EOM: x509.h,v 1.11 2000/09/28 12:53:27 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niels Provos.  All rights reserved.
  * Copyright (c) 1999 Angelos D. Keromytis.  All rights reserved.
- * Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 2000, 2001 Niklas Hallqvist.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions