diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:10:31 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:10:31 +0000 |
| commit | 9734662102d38c4dd9171643aa6bea9e508f3e76 (patch) | |
| tree | 37adf91a291e3dd697ac1852709498b121436956 | |
| parent | 2fe3d4cde9bb5353479aa17bbdaacc7470934215 (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
| -rw-r--r-- | sbin/isakmpd/conf.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/gmp_util.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/gmp_util.h | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/math_mp.h | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/sa.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/ui.c | 6 |
6 files changed, 18 insertions, 17 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c index 34ed58f250f..aac6dbced88 100644 --- a/sbin/isakmpd/conf.c +++ b/sbin/isakmpd/conf.c @@ -1,8 +1,8 @@ -/* $OpenBSD: conf.c,v 1.12 2000/04/07 22:06:44 niklas Exp $ */ -/* $EOM: conf.c,v 1.21 2000/04/07 19:03:25 niklas Exp $ */ +/* $OpenBSD: conf.c,v 1.13 2000/04/07 22:10:30 niklas Exp $ */ +/* $EOM: conf.c,v 1.22 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. * * 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 22e9c724592..f12e90467a7 100644 --- a/sbin/isakmpd/gmp_util.c +++ b/sbin/isakmpd/gmp_util.c @@ -1,9 +1,9 @@ -/* $OpenBSD: gmp_util.c,v 1.6 2000/04/07 22:03:51 niklas Exp $ */ -/* $EOM: gmp_util.c,v 1.4 2000/04/07 19:40:15 niklas Exp $ */ +/* $OpenBSD: gmp_util.c,v 1.7 2000/04/07 22:10:30 niklas Exp $ */ +/* $EOM: gmp_util.c,v 1.5 2000/04/07 22:05:57 niklas Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. - * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1999, 2000 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.h b/sbin/isakmpd/gmp_util.h index 7d064694984..87453964600 100644 --- a/sbin/isakmpd/gmp_util.h +++ b/sbin/isakmpd/gmp_util.h @@ -1,8 +1,9 @@ -/* $OpenBSD: gmp_util.h,v 1.4 2000/04/07 22:03:51 niklas Exp $ */ -/* $EOM: gmp_util.h,v 1.2 2000/04/07 19:40:15 niklas Exp $ */ +/* $OpenBSD: gmp_util.h,v 1.5 2000/04/07 22:10:30 niklas Exp $ */ +/* $EOM: gmp_util.h,v 1.3 2000/04/07 22:05:57 niklas Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. + * Copyright (c) 2000 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/math_mp.h b/sbin/isakmpd/math_mp.h index 65483cc52be..730186ff6ea 100644 --- a/sbin/isakmpd/math_mp.h +++ b/sbin/isakmpd/math_mp.h @@ -1,8 +1,8 @@ -/* $OpenBSD: math_mp.h,v 1.1 2000/04/07 21:44:16 niklas Exp $ */ -/* $EOM: math_mp.h,v 1.1 2000/04/07 19:38:16 niklas Exp $ */ +/* $OpenBSD: math_mp.h,v 1.2 2000/04/07 22:10:30 niklas Exp $ */ +/* $EOM: math_mp.h,v 1.2 2000/04/07 22:05:57 niklas Exp $ */ /* - * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1999, 2000 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/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 diff --git a/sbin/isakmpd/ui.c b/sbin/isakmpd/ui.c index 8b28963f9eb..baca4f6d128 100644 --- a/sbin/isakmpd/ui.c +++ b/sbin/isakmpd/ui.c @@ -1,8 +1,8 @@ -/* $OpenBSD: ui.c,v 1.14 2000/04/07 22:06:44 niklas Exp $ */ -/* $EOM: ui.c,v 1.39 2000/04/07 19:05:01 niklas Exp $ */ +/* $OpenBSD: ui.c,v 1.15 2000/04/07 22:10:30 niklas Exp $ */ +/* $EOM: ui.c,v 1.40 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. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |