summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-20 16:30:30 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-20 16:30:30 +0000
commit90fc713f82fdf15eb5836671467efb188aee01b1 (patch)
tree41e8d11184efbcdb69e871905809aae7e9d7eba0
parent9eac55d78ac2d3eabece18053e5947d2b9373cdc (diff)
features/policy: Merge with EOM 1.3
features/x509: Merge with EOM 1.3 author: niklas add newline at eof author: niklas Correct funders name
-rw-r--r--sbin/isakmpd/features/policy8
-rw-r--r--sbin/isakmpd/features/x5098
2 files changed, 8 insertions, 8 deletions
diff --git a/sbin/isakmpd/features/policy b/sbin/isakmpd/features/policy
index 9b3a880ec5a..96046750737 100644
--- a/sbin/isakmpd/features/policy
+++ b/sbin/isakmpd/features/policy
@@ -1,5 +1,5 @@
-# $OpenBSD: policy,v 1.1 2000/02/19 19:31:34 niklas Exp $
-# $EOM: policy,v 1.1 2000/02/19 07:46:34 niklas Exp $
+# $OpenBSD: policy,v 1.2 2000/02/20 16:30:29 niklas Exp $
+# $EOM: policy,v 1.3 2000/02/20 16:27:50 niklas Exp $
#
# Copyright (c) 2000 Niklas Hallqvist. All rights reserved.
@@ -31,7 +31,7 @@
#
#
-# This code was written under funding by Wireless Networks
+# This code was written under funding by Wireless Networks Inc.
#
POLICY= policy.c
@@ -39,4 +39,4 @@ POLICY= policy.c
.if !defined (USE_KEYNOTE) && !defined (HAVE_DLOPEN)
#Force a syntax error
"KeyNote policy support wanted but no keynote library available"
-.endif \ No newline at end of file
+.endif
diff --git a/sbin/isakmpd/features/x509 b/sbin/isakmpd/features/x509
index 2a665dda726..2dc31a6577f 100644
--- a/sbin/isakmpd/features/x509
+++ b/sbin/isakmpd/features/x509
@@ -1,5 +1,5 @@
-# $OpenBSD: x509,v 1.1 2000/02/19 19:31:34 niklas Exp $
-# $EOM: x509,v 1.1 2000/02/19 07:46:34 niklas Exp $
+# $OpenBSD: x509,v 1.2 2000/02/20 16:30:29 niklas Exp $
+# $EOM: x509,v 1.3 2000/02/20 16:27:50 niklas Exp $
#
# Copyright (c) 2000 Niklas Hallqvist. All rights reserved.
@@ -31,7 +31,7 @@
#
#
-# This code was written under funding by Wireless Networks
+# This code was written under funding by Wireless Networks Inc.
#
X509= x509.c
@@ -39,4 +39,4 @@ X509= x509.c
.if !defined (USE_LIBCRYPTO) && !defined (HAVE_DLOPEN)
#Force a syntax error
"X.509 certificate support wanted but no libcrypto library available"
-.endif \ No newline at end of file
+.endif