summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/apps
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-01 02:46:20 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-02-01 02:46:20 +0000
commit3f6dffc08fd1386299c959a6613728c3c7925414 (patch)
tree08f77ad5375913afd7d48eac5a4763b6e9a302d7 /sbin/isakmpd/apps
parenta9ef0055d23c9d5f4840c2efb1c4585b5892f1ae (diff)
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
Diffstat (limited to 'sbin/isakmpd/apps')
-rw-r--r--sbin/isakmpd/apps/certpatch/certpatch.85
-rw-r--r--sbin/isakmpd/apps/certpatch/certpatch.c5
2 files changed, 6 insertions, 4 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