summaryrefslogtreecommitdiff
path: root/sbin/isakmpd
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-19 19:54:55 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-19 19:54:55 +0000
commit8cb95aa7c6d2ef81ae9c0f344296f945796f44cc (patch)
treea9bcd5286fbfc10ba246197f49c6ea7f4bfc8a20 /sbin/isakmpd
parent6e4f06f3fd737f3360199250b55be8cd5b1fef96 (diff)
./app.c: Merge with EOM 1.5
./gmp_util.c: Merge with EOM 1.3 ./asn_useful.c: Merge with EOM 1.11 ./attribute.c: Merge with EOM 1.9 ./constants.c: Merge with EOM 1.7 ./doi.h: Merge with EOM 1.25 ./doi.c: Merge with EOM 1.4 ./field.c: Merge with EOM 1.9 ./init.c: Merge with EOM 1.13 ./isakmp_doi.c: Merge with EOM 1.35 ./prf.c: Merge with EOM 1.6 ./util.c: Merge with EOM 1.14 ./app.h: Merge with EOM 1.4 ./conf.h: Merge with EOM 1.8 ./ipsec.h: Merge with EOM 1.34 ./ipsec_doi.h: Merge with EOM 1.10 ./pkcs.h: Merge with EOM 1.8 ./sysdep.h: Merge with EOM 1.15 1999 copyrights
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r--sbin/isakmpd/app.c6
-rw-r--r--sbin/isakmpd/app.h6
-rw-r--r--sbin/isakmpd/asn_useful.c5
-rw-r--r--sbin/isakmpd/attribute.c6
-rw-r--r--sbin/isakmpd/conf.h6
-rw-r--r--sbin/isakmpd/constants.c6
-rw-r--r--sbin/isakmpd/doi.c6
-rw-r--r--sbin/isakmpd/doi.h6
-rw-r--r--sbin/isakmpd/field.c6
-rw-r--r--sbin/isakmpd/gmp_util.c5
-rw-r--r--sbin/isakmpd/init.c6
-rw-r--r--sbin/isakmpd/ipsec.h6
-rw-r--r--sbin/isakmpd/ipsec_doi.h6
-rw-r--r--sbin/isakmpd/isakmp_doi.c6
-rw-r--r--sbin/isakmpd/pkcs.h5
-rw-r--r--sbin/isakmpd/prf.c7
-rw-r--r--sbin/isakmpd/sysdep.h6
-rw-r--r--sbin/isakmpd/util.c6
18 files changed, 55 insertions, 51 deletions
diff --git a/sbin/isakmpd/app.c b/sbin/isakmpd/app.c
index b31f56af947..bd3fc75a213 100644
--- a/sbin/isakmpd/app.c
+++ b/sbin/isakmpd/app.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: app.c,v 1.4 1999/02/26 03:30:46 niklas Exp $ */
-/* $EOM: app.c,v 1.4 1999/02/25 11:38:41 niklas Exp $ */
+/* $OpenBSD: app.c,v 1.5 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: app.c,v 1.5 1999/04/02 00:57:54 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/app.h b/sbin/isakmpd/app.h
index 51ea637b536..ddadaebe4bf 100644
--- a/sbin/isakmpd/app.h
+++ b/sbin/isakmpd/app.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: app.h,v 1.4 1999/02/26 03:31:42 niklas Exp $ */
-/* $EOM: app.h,v 1.3 1999/01/31 01:20:41 niklas Exp $ */
+/* $OpenBSD: app.h,v 1.5 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: app.h,v 1.4 1999/04/02 00:58:16 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/asn_useful.c b/sbin/isakmpd/asn_useful.c
index 3301576ec48..695917e6263 100644
--- a/sbin/isakmpd/asn_useful.c
+++ b/sbin/isakmpd/asn_useful.c
@@ -1,8 +1,9 @@
-/* $OpenBSD: asn_useful.c,v 1.6 1999/02/26 03:32:50 niklas Exp $ */
-/* $EOM: asn_useful.c,v 1.10 1999/02/25 16:19:36 niklas Exp $ */
+/* $OpenBSD: asn_useful.c,v 1.7 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: asn_useful.c,v 1.11 1999/04/02 00:57:27 niklas Exp $ */
/*
* Copyright (c) 1998 Niels Provos. All rights reserved.
+ * Copyright (c) 1999 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/attribute.c b/sbin/isakmpd/attribute.c
index 1ec1e749776..6b097fbf3b7 100644
--- a/sbin/isakmpd/attribute.c
+++ b/sbin/isakmpd/attribute.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: attribute.c,v 1.6 1999/03/31 23:46:11 niklas Exp $ */
-/* $EOM: attribute.c,v 1.8 1999/03/31 23:31:27 niklas Exp $ */
+/* $OpenBSD: attribute.c,v 1.7 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: attribute.c,v 1.9 1999/04/02 00:57:28 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/conf.h b/sbin/isakmpd/conf.h
index f2bca251062..6d31c31c1a8 100644
--- a/sbin/isakmpd/conf.h
+++ b/sbin/isakmpd/conf.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: conf.h,v 1.6 1999/03/02 15:35:12 niklas Exp $ */
-/* $EOM: conf.h,v 1.7 1999/03/02 15:33:19 niklas Exp $ */
+/* $OpenBSD: conf.h,v 1.7 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: conf.h,v 1.8 1999/04/02 00:57:30 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/constants.c b/sbin/isakmpd/constants.c
index 88785e52616..e587ee3626f 100644
--- a/sbin/isakmpd/constants.c
+++ b/sbin/isakmpd/constants.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: constants.c,v 1.5 1999/02/26 03:35:06 niklas Exp $ */
-/* $EOM: constants.c,v 1.6 1999/02/25 11:38:48 niklas Exp $ */
+/* $OpenBSD: constants.c,v 1.6 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: constants.c,v 1.7 1999/04/02 00:57:31 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/doi.c b/sbin/isakmpd/doi.c
index fbf1920c33d..8b86fe5290e 100644
--- a/sbin/isakmpd/doi.c
+++ b/sbin/isakmpd/doi.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: doi.c,v 1.4 1999/02/26 03:36:18 niklas Exp $ */
-/* $EOM: doi.c,v 1.3 1999/02/25 11:38:52 niklas Exp $ */
+/* $OpenBSD: doi.c,v 1.5 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: doi.c,v 1.4 1999/04/02 00:57:36 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/doi.h b/sbin/isakmpd/doi.h
index 92da624f44d..4db41e26b6d 100644
--- a/sbin/isakmpd/doi.h
+++ b/sbin/isakmpd/doi.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: doi.h,v 1.4 1999/02/26 03:36:34 niklas Exp $ */
-/* $EOM: doi.h,v 1.24 1999/02/25 10:21:29 niklas Exp $ */
+/* $OpenBSD: doi.h,v 1.5 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: doi.h,v 1.25 1999/04/02 00:57:24 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/field.c b/sbin/isakmpd/field.c
index b4c63cecfff..ea291521233 100644
--- a/sbin/isakmpd/field.c
+++ b/sbin/isakmpd/field.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: field.c,v 1.5 1999/02/26 03:38:56 niklas Exp $ */
-/* $EOM: field.c,v 1.8 1999/02/25 11:38:55 niklas Exp $ */
+/* $OpenBSD: field.c,v 1.6 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: field.c,v 1.9 1999/04/02 00:57:37 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/gmp_util.c b/sbin/isakmpd/gmp_util.c
index 30cae6ddde4..9ecb0fb425e 100644
--- a/sbin/isakmpd/gmp_util.c
+++ b/sbin/isakmpd/gmp_util.c
@@ -1,8 +1,9 @@
-/* $OpenBSD: gmp_util.c,v 1.4 1999/02/26 03:40:05 niklas Exp $ */
-/* $EOM: gmp_util.c,v 1.2 1999/02/25 11:38:58 niklas Exp $ */
+/* $OpenBSD: gmp_util.c,v 1.5 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: gmp_util.c,v 1.3 1999/04/02 00:57:39 niklas Exp $ */
/*
* Copyright (c) 1998 Niels Provos. All rights reserved.
+ * Copyright (c) 1999 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/init.c b/sbin/isakmpd/init.c
index ec25d5ce110..e1f04e15dc1 100644
--- a/sbin/isakmpd/init.c
+++ b/sbin/isakmpd/init.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: init.c,v 1.5 1999/03/31 20:30:11 niklas Exp $ */
-/* $EOM: init.c,v 1.12 1999/03/31 20:25:25 niklas Exp $ */
+/* $OpenBSD: init.c,v 1.6 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: init.c,v 1.13 1999/04/02 00:57:47 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/ipsec.h b/sbin/isakmpd/ipsec.h
index 56459512e19..8ba72c94b16 100644
--- a/sbin/isakmpd/ipsec.h
+++ b/sbin/isakmpd/ipsec.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: ipsec.h,v 1.6 1999/03/31 14:27:37 niklas Exp $ */
-/* $EOM: ipsec.h,v 1.33 1999/03/31 14:19:52 niklas Exp $ */
+/* $OpenBSD: ipsec.h,v 1.7 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: ipsec.h,v 1.34 1999/04/02 00:57:49 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/ipsec_doi.h b/sbin/isakmpd/ipsec_doi.h
index c27f05171ae..c41d1a7ba64 100644
--- a/sbin/isakmpd/ipsec_doi.h
+++ b/sbin/isakmpd/ipsec_doi.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: ipsec_doi.h,v 1.4 1999/03/24 14:59:20 niklas Exp $ */
-/* $EOM: ipsec_doi.h,v 1.9 1999/03/06 12:44:30 niklas Exp $ */
+/* $OpenBSD: ipsec_doi.h,v 1.5 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: ipsec_doi.h,v 1.10 1999/04/02 00:57:51 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/isakmp_doi.c b/sbin/isakmpd/isakmp_doi.c
index b73e931e5ea..749e038da4f 100644
--- a/sbin/isakmpd/isakmp_doi.c
+++ b/sbin/isakmpd/isakmp_doi.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: isakmp_doi.c,v 1.4 1999/02/26 03:44:24 niklas Exp $ */
-/* $EOM: isakmp_doi.c,v 1.34 1999/02/25 11:39:08 niklas Exp $ */
+/* $OpenBSD: isakmp_doi.c,v 1.5 1999/04/19 19:54:53 niklas Exp $ */
+/* $EOM: isakmp_doi.c,v 1.35 1999/04/02 00:57:52 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/pkcs.h b/sbin/isakmpd/pkcs.h
index 8845793448c..96fa435a096 100644
--- a/sbin/isakmpd/pkcs.h
+++ b/sbin/isakmpd/pkcs.h
@@ -1,8 +1,9 @@
-/* $OpenBSD: pkcs.h,v 1.4 1999/03/24 15:00:05 niklas Exp $ */
-/* $EOM: pkcs.h,v 1.7 1999/03/13 17:43:19 niklas Exp $ */
+/* $OpenBSD: pkcs.h,v 1.5 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: pkcs.h,v 1.8 1999/04/02 00:58:05 niklas Exp $ */
/*
* Copyright (c) 1998 Niels Provos. All rights reserved.
+ * Copyright (c) 1999 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.c b/sbin/isakmpd/prf.c
index d94a2175cd6..a940343fb3f 100644
--- a/sbin/isakmpd/prf.c
+++ b/sbin/isakmpd/prf.c
@@ -1,8 +1,9 @@
-/* $OpenBSD: prf.c,v 1.5 1999/03/31 20:30:55 niklas Exp $ */
-/* $EOM: prf.c,v 1.5 1999/03/31 20:17:38 niklas Exp $ */
+/* $OpenBSD: prf.c,v 1.6 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: prf.c,v 1.6 1999/04/02 00:58:06 niklas Exp $ */
/*
- * Copyright (c) 1998, 1999 Niels Provos. All rights reserved.
+ * Copyright (c) 1998 Niels Provos. All rights reserved.
+ * Copyright (c) 1999 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/sysdep.h b/sbin/isakmpd/sysdep.h
index e7769ef24a7..db74964d71a 100644
--- a/sbin/isakmpd/sysdep.h
+++ b/sbin/isakmpd/sysdep.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: sysdep.h,v 1.5 1999/03/24 14:45:17 niklas Exp $ */
-/* $EOM: sysdep.h,v 1.14 1999/03/24 11:05:08 niklas Exp $ */
+/* $OpenBSD: sysdep.h,v 1.6 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: sysdep.h,v 1.15 1999/04/02 00:58:08 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 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/util.c b/sbin/isakmpd/util.c
index b7032e45e71..43d23498dd7 100644
--- a/sbin/isakmpd/util.c
+++ b/sbin/isakmpd/util.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: util.c,v 1.4 1999/02/26 03:52:40 niklas Exp $ */
-/* $EOM: util.c,v 1.13 1999/02/25 11:39:27 niklas Exp $ */
+/* $OpenBSD: util.c,v 1.5 1999/04/19 19:54:54 niklas Exp $ */
+/* $EOM: util.c,v 1.14 1999/04/02 00:58:15 niklas Exp $ */
/*
- * Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions