summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-27 21:02:58 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-27 21:02:58 +0000
commit87913cf4ca3b26bd5ab60ddd1fa41f56bb4bf74c (patch)
treec16b353f133a8342d53bf1e761f7b1504813ec9f
parenteb9f7042f2c9b99330027af20a5448efe6441ee2 (diff)
regress/exchange/Makefile: Merge with EOM 1.6
regress/exchange/run.sh: Merge with EOM 1.5 regress/rsakeygen/rsakeygen.c: Merge with EOM 1.7 genconstants.sh: Merge with EOM 1.6 genfields.sh: Merge with EOM 1.5 author: niklas 1999
-rw-r--r--sbin/isakmpd/genconstants.sh6
-rw-r--r--sbin/isakmpd/genfields.sh6
-rw-r--r--sbin/isakmpd/regress/exchange/Makefile6
-rw-r--r--sbin/isakmpd/regress/exchange/run.sh6
-rw-r--r--sbin/isakmpd/regress/rsakeygen/rsakeygen.c5
5 files changed, 15 insertions, 14 deletions
diff --git a/sbin/isakmpd/genconstants.sh b/sbin/isakmpd/genconstants.sh
index f641680bc39..e883980d672 100644
--- a/sbin/isakmpd/genconstants.sh
+++ b/sbin/isakmpd/genconstants.sh
@@ -1,8 +1,8 @@
-# $OpenBSD: genconstants.sh,v 1.5 1999/02/26 03:39:24 niklas Exp $
-# $EOM: genconstants.sh,v 1.5 1999/02/25 11:38:56 niklas Exp $
+# $OpenBSD: genconstants.sh,v 1.6 1999/04/27 21:02:57 niklas Exp $
+# $EOM: genconstants.sh,v 1.6 1999/04/02 01:15:53 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/genfields.sh b/sbin/isakmpd/genfields.sh
index 9ee8cb9728d..f53cdcb00ef 100644
--- a/sbin/isakmpd/genfields.sh
+++ b/sbin/isakmpd/genfields.sh
@@ -1,8 +1,8 @@
-# $OpenBSD: genfields.sh,v 1.3 1999/02/26 03:39:49 niklas Exp $
-# $EOM: genfields.sh,v 1.4 1999/02/25 11:38:57 niklas Exp $
+# $OpenBSD: genfields.sh,v 1.4 1999/04/27 21:02:57 niklas Exp $
+# $EOM: genfields.sh,v 1.5 1999/04/02 01:15:55 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/regress/exchange/Makefile b/sbin/isakmpd/regress/exchange/Makefile
index 28e08bdd6b6..f4fe8a7ed97 100644
--- a/sbin/isakmpd/regress/exchange/Makefile
+++ b/sbin/isakmpd/regress/exchange/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 1999/02/26 03:27:44 niklas Exp $
-# $EOM: Makefile,v 1.5 1999/02/25 15:10:09 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 1999/04/27 21:02:55 niklas Exp $
+# $EOM: Makefile,v 1.6 1999/04/05 18:27:35 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/regress/exchange/run.sh b/sbin/isakmpd/regress/exchange/run.sh
index 725cb9f857b..9021a72a05a 100644
--- a/sbin/isakmpd/regress/exchange/run.sh
+++ b/sbin/isakmpd/regress/exchange/run.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-# $OpenBSD: run.sh,v 1.4 1999/02/26 03:28:05 niklas Exp $
-# $EOM: run.sh,v 1.4 1999/01/31 01:26:55 niklas Exp $
+# $OpenBSD: run.sh,v 1.5 1999/04/27 21:02:56 niklas Exp $
+# $EOM: run.sh,v 1.5 1999/04/05 18:27: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/regress/rsakeygen/rsakeygen.c b/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
index 4e4bafd3e08..fbc4be408c1 100644
--- a/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
+++ b/sbin/isakmpd/regress/rsakeygen/rsakeygen.c
@@ -1,8 +1,9 @@
-/* $OpenBSD: rsakeygen.c,v 1.6 1999/03/24 14:58:15 niklas Exp $ */
-/* $EOM: rsakeygen.c,v 1.6 1999/03/13 17:43:24 niklas Exp $ */
+/* $OpenBSD: rsakeygen.c,v 1.7 1999/04/27 21:02:56 niklas Exp $ */
+/* $EOM: rsakeygen.c,v 1.7 1999/04/05 18:27:38 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