summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/sa.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-07 22:10:31 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-07 22:10:31 +0000
commit9734662102d38c4dd9171643aa6bea9e508f3e76 (patch)
tree37adf91a291e3dd697ac1852709498b121436956 /sbin/isakmpd/sa.c
parent2fe3d4cde9bb5353479aa17bbdaacc7470934215 (diff)
conf.c: Merge with EOM 1.22
gmp_util.c: Merge with EOM 1.5 gmp_util.h: Merge with EOM 1.3 math_mp.h: Merge with EOM 1.2 sa.c: Merge with EOM 1.101 ui.c: Merge with EOM 1.40 author: niklas (c) 2000
Diffstat (limited to 'sbin/isakmpd/sa.c')
-rw-r--r--sbin/isakmpd/sa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 4c314e8211b..62ddfbf0728 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: sa.c,v 1.26 2000/04/07 22:06:44 niklas Exp $ */
-/* $EOM: sa.c,v 1.100 2000/04/07 19:05:01 niklas Exp $ */
+/* $OpenBSD: sa.c,v 1.27 2000/04/07 22:10:30 niklas Exp $ */
+/* $EOM: sa.c,v 1.101 2000/04/07 22:05:57 niklas Exp $ */
/*
- * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
+ * Copyright (c) 1998, 1999, 2000 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