OpenBSD CVS

CVS log for src/sbin/isakmpd/isakmpd.c


[BACK] Up to [local] / src / sbin / isakmpd

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.109 / (download) - annotate - [select for diffs], Wed Mar 8 04:43:06 2023 UTC (15 months ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, HEAD
Changes since 1.108: +1 -3 lines
Diff to previous 1.108 (colored)

Delete obsolete /* ARGSUSED */ lint comments.

ok miod@ millert@

Revision 1.108 / (download) - annotate - [select for diffs], Sun Dec 4 23:50:46 2022 UTC (18 months ago) by cheloha
Branch: MAIN
Changes since 1.107: +1 -2 lines
Diff to previous 1.107 (colored)

userspace: remove vestigial '?' cases from top-level getopt(3) loops

getopt(3) returns '?' when it encounters a flag not present in the in
the optstring or if a flag is missing its option argument.  We can
handle this case with the "default" failure case with no loss of
legibility.  Hence, remove all the redundant "case '?':" lines.

Prompted by dlg@.  With help from dlg@ and millert@.

Link: https://marc.info/?l=openbsd-tech&m=167011979726449&w=2

ok naddy@ millert@ dlg@

Revision 1.107 / (download) - annotate - [select for diffs], Mon Jan 15 09:54:48 2018 UTC (6 years, 4 months ago) by mpi
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.106: +2 -2 lines
Diff to previous 1.106 (colored)

Spacing, no object change.

Revision 1.106 / (download) - annotate - [select for diffs], Thu Jan 4 14:21:00 2018 UTC (6 years, 5 months ago) by mpi
Branch: MAIN
Changes since 1.105: +2 -2 lines
Diff to previous 1.105 (colored)

space -> tab

No object change.

Revision 1.105 / (download) - annotate - [select for diffs], Tue Dec 5 20:31:45 2017 UTC (6 years, 6 months ago) by jca
Branch: MAIN
Changes since 1.104: +4 -4 lines
Diff to previous 1.104 (colored)

Use clock_gettime(CLOCK_MONOTONIC) to schedule timers

From Scott Cheloha, ok tb@

Revision 1.104 / (download) - annotate - [select for diffs], Sat Apr 2 14:37:42 2016 UTC (8 years, 2 months ago) by krw
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.103: +27 -4 lines
Diff to previous 1.103 (colored)

Another use for fcntl() and thus of the superfluous 3rd parameter
is when sanitising standard fd's before calling daemon().

Use a tweaked version of the ssh(1) function in all three places
found using fcntl() this way.

ok jca@ beck@

Revision 1.103 / (download) - annotate - [select for diffs], Thu Aug 20 22:02:21 2015 UTC (8 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.102: +3 -3 lines
Diff to previous 1.102 (colored)

<stdlib.h> is included, so do not need to cast result from
malloc, calloc, realloc*
ok krw millert

Revision 1.102 / (download) - annotate - [select for diffs], Sat Feb 7 02:09:13 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.101: +2 -2 lines
Diff to previous 1.101 (colored)

When getopt processing flags, many should be flag=1 instead of flag++
ok tedu miod

Revision 1.101 / (download) - annotate - [select for diffs], Thu Sep 26 15:31:14 2013 UTC (10 years, 8 months ago) by patrick
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.100: +1 -2 lines
Diff to previous 1.100 (colored)

Removed a break of a switch-case, which had not been removed in the last commit.
No functional change.

Revision 1.100 / (download) - annotate - [select for diffs], Wed Apr 24 13:46:09 2013 UTC (11 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.99: +2 -16 lines
Diff to previous 1.99 (colored)

remove old backwards random junk
ok mikeb

Revision 1.99 / (download) - annotate - [select for diffs], Thu Mar 21 04:30:14 2013 UTC (11 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.98: +1 -2 lines
Diff to previous 1.98 (colored)

remove excessive includes

Revision 1.98 / (download) - annotate - [select for diffs], Thu Apr 15 07:51:17 2010 UTC (14 years, 1 month ago) by lum
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.97: +2 -1 lines
Diff to previous 1.97 (colored)

Log when isakmpd starts - patch from Toni Mueller
ok ho@ mpf@ krw@ sthen@ kjell@

Revision 1.97 / (download) - annotate - [select for diffs], Mon May 12 19:15:02 2008 UTC (16 years, 1 month ago) by pyr
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.96: +4 -1 lines
Diff to previous 1.96 (colored)

Error out with usage line if additional arguments are given after the
option parsing. Found out the hard way by jdixon on ifstated.

ok sobrado@, jdixon@, millert@

Revision 1.96 / (download) - annotate - [select for diffs], Mon Apr 2 08:08:32 2007 UTC (17 years, 2 months ago) by moritz
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.95: +2 -2 lines
Diff to previous 1.95 (colored)

Don't let -r fall through to the next case block,
if INSECURE_RAND is defined.

ok hshoexer@

Revision 1.95 / (download) - annotate - [select for diffs], Fri Sep 1 00:24:06 2006 UTC (17 years, 9 months ago) by mpf
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.94: +2 -1 lines
Diff to previous 1.94 (colored)

Add a new UI command to force isakmpd into passive only mode.
Will be used by sasyncd to prevent two talking isakmpd's in an HA setup.
Based on a diff by ho@.
OK ho@, hshoexer@, deraadt@

Revision 1.94 / (download) - annotate - [select for diffs], Wed Aug 30 16:56:56 2006 UTC (17 years, 9 months ago) by hshoexer
Branch: MAIN
Changes since 1.93: +5 -5 lines
Diff to previous 1.93 (colored)

Make SA deletion on shutdown the default again.  Use -S for failover
situations where you do not want this.

Discussed and agreed on with ho, mcbride, markus, cloder,...  We
will have to teach sasyncd to deal with this.

Testing by msf and hshoexer with help from mtu

ok markus cloder

Revision 1.93 / (download) - annotate - [select for diffs], Sat Jun 10 21:15:45 2006 UTC (18 years ago) by hshoexer
Branch: MAIN
Changes since 1.92: +21 -11 lines
Diff to previous 1.92 (colored)

Make deletion of SAs on shutdown optional.  The default behaviour
now is to not delete SAs.  Needed for reliable ipsec failover.
Suggested by mtu@.  Moreover, this ensures that packets do not leak
when isakmpd is shutdown.

ok mcbride@, testing mtu@

Revision 1.92 / (download) - annotate - [select for diffs], Thu Jun 1 01:39:16 2006 UTC (18 years ago) by hshoexer
Branch: MAIN
Changes since 1.91: +2 -2 lines
Diff to previous 1.91 (colored)

Fix a comment

Revision 1.91 / (download) - annotate - [select for diffs], Mon Mar 20 16:43:22 2006 UTC (18 years, 2 months ago) by hshoexer
Branch: MAIN
Changes since 1.90: +4 -1 lines
Diff to previous 1.90 (colored)

make sure the command fifo is ready before isakmpd returns.  This
resolves a startup race when interacting with ipsecctl.  Suggested
by and discussed with moritz@

ok moritz@

Revision 1.90 / (download) - annotate - [select for diffs], Tue Dec 20 22:03:53 2005 UTC (18 years, 5 months ago) by moritz
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.89: +5 -9 lines
Diff to previous 1.89 (colored)

let isakmpd(8) remove it's pid/fifo file on exit.
rework signal handling in the monitor process to
let this work. testing and ok hshoexer@

Revision 1.89 / (download) - annotate - [select for diffs], Sat Jun 25 23:20:43 2005 UTC (18 years, 11 months ago) by hshoexer
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.88: +2 -2 lines
Diff to previous 1.88 (colored)

/* Fallthrough. */ -> /* FALLTHROUGH */
now that's useable with lint

Revision 1.88 / (download) - annotate - [select for diffs], Thu May 26 20:40:50 2005 UTC (19 years ago) by hshoexer
Branch: MAIN
Changes since 1.87: +5 -1 lines
Diff to previous 1.87 (colored)

Add ARGSUSED for lint, one comment for me

Revision 1.87 / (download) - annotate - [select for diffs], Tue May 3 14:03:11 2005 UTC (19 years, 1 month ago) by moritz
Branch: MAIN
Changes since 1.86: +1 -35 lines
Diff to previous 1.86 (colored)

Remove SIGUSR2-related stuff as suggested by ho@.
SA rehashing won't happen anytime soon. ok hshoexer@

Revision 1.86 / (download) - annotate - [select for diffs], Tue May 3 13:09:45 2005 UTC (19 years, 1 month ago) by moritz
Branch: MAIN
Changes since 1.85: +29 -21 lines
Diff to previous 1.85 (colored)

fix signal race, when child dies before the monitor
sets it's signal handlers. ok hshoexer@ ho@

Revision 1.85 / (download) - annotate - [select for diffs], Sun Apr 10 14:17:49 2005 UTC (19 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.84: +4 -5 lines
Diff to previous 1.84 (colored)

- sort synopsis + options list
- sync usage()
- tidy up lists and displays
- misc tweaks

Revision 1.84 / (download) - annotate - [select for diffs], Fri Apr 8 22:32:10 2005 UTC (19 years, 2 months ago) by cloder
Branch: MAIN
Changes since 1.83: +7 -4 lines
Diff to previous 1.83 (colored)

Make deterministic randomness (only ever used for testing) a compile-time
option.  Reduces chances of somehow setting regrand when it's not supposed
to be set.  Remove "-r" option from man page.  Also xref certpatch(8) while
we are in there.  And remove some include sysdep.h where it is no longer
needed.
OK hshoexer

Revision 1.83 / (download) - annotate - [select for diffs], Fri Apr 8 19:40:03 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.82: +1 -15 lines
Diff to previous 1.82 (colored)

USE_DEBUG is bye bye

Revision 1.82 / (download) - annotate - [select for diffs], Fri Apr 8 17:15:01 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.81: +1 -5 lines
Diff to previous 1.81 (colored)

keynote and policy always compiled in

Revision 1.81 / (download) - annotate - [select for diffs], Fri Apr 8 16:37:14 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.80: +1 -5 lines
Diff to previous 1.80 (colored)

nat-traversal always

Revision 1.80 / (download) - annotate - [select for diffs], Fri Apr 8 16:24:12 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.79: +2 -6 lines
Diff to previous 1.79 (colored)

privsep always

Revision 1.79 / (download) - annotate - [select for diffs], Fri Apr 8 16:11:58 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.78: +1 -7 lines
Diff to previous 1.78 (colored)

kill HAVE_CLOSEFROM

Revision 1.78 / (download) - annotate - [select for diffs], Fri Apr 8 15:47:24 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.77: +3 -1 lines
Diff to previous 1.77 (colored)

more __progname

Revision 1.77 / (download) - annotate - [select for diffs], Fri Apr 8 15:44:13 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.76: +2 -2 lines
Diff to previous 1.76 (colored)

use __progname

Revision 1.76 / (download) - annotate - [select for diffs], Tue Apr 5 18:06:06 2005 UTC (19 years, 2 months ago) by cloder
Branch: MAIN
Changes since 1.75: +12 -4 lines
Diff to previous 1.75 (colored)

Add -T flag to isakmpd to disable NAT-T support from the command line.
This lets binat setups work again without having to recompile isakmpd.
OK ho, hshoexer.

Revision 1.75 / (download) - annotate - [select for diffs], Mon Apr 4 19:31:11 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.74: +8 -8 lines
Diff to previous 1.74 (colored)

spacing; ok cloder

Revision 1.74 / (download) - annotate - [select for diffs], Tue Mar 22 17:27:59 2005 UTC (19 years, 2 months ago) by cloder
Branch: MAIN
Changes since 1.73: +3 -1 lines
Diff to previous 1.73 (colored)

Compile when nat_traversal is disabled.
OK hshoexer

Revision 1.73 / (download) - annotate - [select for diffs], Sun Feb 27 13:12:12 2005 UTC (19 years, 3 months ago) by hshoexer
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE, OPENBSD_3_7
Changes since 1.72: +3 -3 lines
Diff to previous 1.72 (colored)

where possible, use bzero instead of memset

ok cloder henning

Revision 1.72 / (download) - annotate - [select for diffs], Fri Feb 25 14:21:20 2005 UTC (19 years, 3 months ago) by hshoexer
Branch: MAIN
Changes since 1.71: +2 -2 lines
Diff to previous 1.71 (colored)

forgot to remove -P from getopt().

Revision 1.71 / (download) - annotate - [select for diffs], Fri Feb 25 14:14:31 2005 UTC (19 years, 3 months ago) by hshoexer
Branch: MAIN
Changes since 1.70: +3 -7 lines
Diff to previous 1.70 (colored)

Zap -P option.  It has never done anything.  While there tweak descripton of
-N.

zap -P ok ho@

Revision 1.70 / (download) - annotate - [select for diffs], Thu Feb 24 13:55:51 2005 UTC (19 years, 3 months ago) by hshoexer
Branch: MAIN
Changes since 1.69: +10 -5 lines
Diff to previous 1.69 (colored)

Add -N switch to select port for udpencap.  Thus it's possible to run multiple
isakmpds on different ports specified with -p and -N.

ok ho@

Revision 1.69 / (download) - annotate - [select for diffs], Wed Feb 16 22:00:14 2005 UTC (19 years, 3 months ago) by hshoexer
Branch: MAIN
Changes since 1.68: +15 -5 lines
Diff to previous 1.68 (colored)

On shutdown also send delete messages for isakmp SAs.

ok ho

Revision 1.68 / (download) - annotate - [select for diffs], Fri Sep 17 14:54:09 2004 UTC (19 years, 8 months ago) by hshoexer
Branch: MAIN
Changes since 1.67: +4 -6 lines
Diff to previous 1.67 (colored)

avoid signal race.

ok ho@ otto@

Revision 1.67 / (download) - annotate - [select for diffs], Fri Jun 25 20:25:34 2004 UTC (19 years, 11 months ago) by hshoexer
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.66: +8 -2 lines
Diff to previous 1.66 (colored)

Keynote policy checking can now be disabled by "-K" switch and config tag
"Use-Keynote".  Default is to use keynote.

ok henning@ ho@

Revision 1.66 / (download) - annotate - [select for diffs], Wed Jun 23 00:55:59 2004 UTC (19 years, 11 months ago) by hshoexer
Branch: MAIN
Changes since 1.65: +10 -3 lines
Diff to previous 1.65 (colored)

Add commandline switch -a / config tag "Acquire-Only" to tell isakmpd to not
touch flows.

initial work by markus
ok markus@ ho@ henning@

Revision 1.65 / (download) - annotate - [select for diffs], Sun Jun 20 15:03:35 2004 UTC (19 years, 11 months ago) by ho
Branch: MAIN
Changes since 1.64: +2 -2 lines
Diff to previous 1.64 (colored)

To make debugging the unprivileged child process easier, make 'isakmpd -dd'
pause just after privsep; print the PIDs and wait for SIGCONT.
hshoexer@ ok

Revision 1.64 / (download) - annotate - [select for diffs], Mon Jun 14 09:55:41 2004 UTC (19 years, 11 months ago) by ho
Branch: MAIN
Changes since 1.63: +5 -4 lines
Diff to previous 1.63 (colored)

KNF, style, 80c, etc. hshoexer@ ok

Revision 1.63 / (download) - annotate - [select for diffs], Sun May 23 18:17:56 2004 UTC (20 years ago) by hshoexer
Branch: MAIN
Changes since 1.62: +31 -22 lines
Diff to previous 1.62 (colored)

More KNF.  Mainly spaces and line-wraps, no binary change.

ok ho@

Revision 1.62 / (download) - annotate - [select for diffs], Wed May 19 14:30:26 2004 UTC (20 years ago) by ho
Branch: MAIN
Changes since 1.61: +6 -1 lines
Diff to previous 1.61 (colored)

Permit symbolic protocol and service names, such as "Protocol= tcp", in the
<IPsec-ID> sections. hshoexer@ ok

Revision 1.61 / (download) - annotate - [select for diffs], Thu Apr 15 18:39:26 2004 UTC (20 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.60: +317 -340 lines
Diff to previous 1.60 (colored)

partial move to KNF.  More to come.  This has happened because there
are a raft of source code auditors who are willing to help improve this
code only if this is done, and hey, isakmpd does need our standard
auditing process.  ok ho hshoexer

Revision 1.60 / (download) - annotate - [select for diffs], Thu Apr 8 10:05:54 2004 UTC (20 years, 2 months ago) by hshoexer
Branch: MAIN
Changes since 1.59: +5 -1 lines
Diff to previous 1.59 (colored)

Set timezone before privsep, child uses now correct timezone.
Noticed by david@

ok ho@ david@

Revision 1.59 / (download) - annotate - [select for diffs], Wed Mar 31 10:47:16 2004 UTC (20 years, 2 months ago) by ho
Branch: MAIN
Changes since 1.58: +7 -1 lines
Diff to previous 1.58 (colored)

Don't assume closefrom(2) exists everywhere. hshoexer@, markus@ ok.

Revision 1.58 / (download) - annotate - [select for diffs], Fri Mar 19 14:04:43 2004 UTC (20 years, 2 months ago) by hshoexer
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.57: +16 -11 lines
Diff to previous 1.57 (colored)

Add missing bits to make already present privsep code work.  Enable privsep.

ok ho@ deraadt@ markus@

Revision 1.57 / (download) - annotate - [select for diffs], Thu Feb 19 15:35:16 2004 UTC (20 years, 3 months ago) by hshoexer
Branch: MAIN
Changes since 1.56: +6 -5 lines
Diff to previous 1.56 (colored)

small cleanup of log messages.
ok ho@

Revision 1.56 / (download) - annotate - [select for diffs], Thu Feb 19 09:54:52 2004 UTC (20 years, 3 months ago) by ho
Branch: MAIN
Changes since 1.55: +14 -12 lines
Diff to previous 1.55 (colored)

With -d, SIGINT should do a clean shutdown.
Without -d, logs should be sent to syslog, level LOG_INFO.

Revision 1.55 / (download) - annotate - [select for diffs], Thu Feb 19 09:46:19 2004 UTC (20 years, 3 months ago) by ho
Branch: MAIN
Changes since 1.54: +5 -5 lines
Diff to previous 1.54 (colored)

Cleanup.

Revision 1.54 / (download) - annotate - [select for diffs], Fri Jan 16 10:51:57 2004 UTC (20 years, 4 months ago) by hshoexer
Branch: MAIN
Changes since 1.53: +7 -3 lines
Diff to previous 1.53 (colored)

Added -v option.  Enables logging of successful exchange completion.
ok ho@

Revision 1.53 / (download) - annotate - [select for diffs], Wed Jun 4 07:31:17 2003 UTC (21 years ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.52: +1 -6 lines
Diff to previous 1.52 (colored)

Remove the rest of clauses 3 and 4. Approved by Niklas Hallqvist, Angelos
D. Keromytis and Niels Provos.

Revision 1.52 / (download) - annotate - [select for diffs], Sun May 18 19:37:46 2003 UTC (21 years ago) by ho
Branch: MAIN
Changes since 1.51: +3 -3 lines
Diff to previous 1.51 (colored)

More isakmpd privsep work. X509 private keys are now kept in the privileged
process only. Various cleanup and bugfixes.
markus@ ok

Revision 1.51 / (download) - annotate - [select for diffs], Thu May 15 00:28:53 2003 UTC (21 years, 1 month ago) by ho
Branch: MAIN
Changes since 1.50: +29 -10 lines
Diff to previous 1.50 (colored)

Start of privilege separation for isakmpd.
There are some kinks left, so keep it default disabled for now.
markus@ says ok to commit.

Revision 1.50 / (download) - annotate - [select for diffs], Wed May 14 18:08:27 2003 UTC (21 years, 1 month ago) by ho
Branch: MAIN
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)

Fix a typo (in unused code).

Revision 1.49 / (download) - annotate - [select for diffs], Mon Apr 14 13:08:42 2003 UTC (21 years, 2 months ago) by ho
Branch: MAIN
Changes since 1.48: +4 -1 lines
Diff to previous 1.48 (colored)

Unlink FIFO and pid files on clean shutdown. PR#3199

Revision 1.48 / (download) - annotate - [select for diffs], Tue Dec 3 20:05:10 2002 UTC (21 years, 6 months ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.47: +14 -5 lines
Diff to previous 1.47 (colored)

Add -4/-6 cmdline options to select what address family (IPv4,v6) to use.
niklas@ ok.

Revision 1.47 / (download) - annotate - [select for diffs], Wed Nov 27 15:29:20 2002 UTC (21 years, 6 months ago) by ho
Branch: MAIN
Changes since 1.46: +9 -1 lines
Diff to previous 1.46 (colored)

Make sure daemon() does not close any fd opened during initialization.
niklas@ ok.

Revision 1.46 / (download) - annotate - [select for diffs], Thu Nov 21 12:09:20 2002 UTC (21 years, 6 months ago) by ho
Branch: MAIN
Changes since 1.45: +6 -6 lines
Diff to previous 1.45 (colored)

-Wshadow nits.

Revision 1.45 / (download) - annotate - [select for diffs], Fri Jul 5 13:58:50 2002 UTC (21 years, 11 months ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.44: +5 -5 lines
Diff to previous 1.44 (colored)

volatile sig_atomic_t, suggested by Theo.

Revision 1.44 / (download) - annotate - [select for diffs], Fri Jun 14 21:34:58 2002 UTC (22 years ago) by todd
Branch: MAIN
Changes since 1.43: +2 -2 lines
Diff to previous 1.43 (colored)

spelling; from Brian Poole <raj@cerias.purdue.edu>

Revision 1.43 / (download) - annotate - [select for diffs], Sun Jun 9 08:13:06 2002 UTC (22 years ago) by todd
Branch: MAIN
Changes since 1.42: +4 -4 lines
Diff to previous 1.42 (colored)

rm trailing whitespace

Revision 1.42 / (download) - annotate - [select for diffs], Fri Jun 7 01:07:18 2002 UTC (22 years ago) by ho
Branch: MAIN
Changes since 1.41: +2 -1 lines
Diff to previous 1.41 (colored)

Before detaching, log output should go to stderr, not syslog.

Revision 1.41 / (download) - annotate - [select for diffs], Sat Jun 1 07:44:21 2002 UTC (22 years ago) by deraadt
Branch: MAIN
Changes since 1.40: +3 -3 lines
Diff to previous 1.40 (colored)

size_t must be cast to (unsigned long) and printed using %lu

Revision 1.40 / (download) - annotate - [select for diffs], Sun May 26 09:24:35 2002 UTC (22 years ago) by deraadt
Branch: MAIN
Changes since 1.39: +2 -2 lines
Diff to previous 1.39 (colored)

pid_t cleanup

Revision 1.39 / (download) - annotate - [select for diffs], Tue Dec 11 01:54:34 2001 UTC (22 years, 6 months ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.38: +4 -3 lines
Diff to previous 1.38 (colored)

Don't hang waiting for select() with SIGTERM + no active SAs.

Revision 1.38 / (download) - annotate - [select for diffs], Mon Dec 10 03:34:51 2001 UTC (22 years, 6 months ago) by ho
Branch: MAIN
Changes since 1.37: +14 -57 lines
Diff to previous 1.37 (colored)

Add UI option 'R' to trigger isakmpd reinit (same as SIGHUP).

Revision 1.37 / (download) - annotate - [select for diffs], Fri Oct 26 11:37:16 2001 UTC (22 years, 7 months ago) by ho
Branch: MAIN
Changes since 1.36: +9 -18 lines
Diff to previous 1.36 (colored)

Sometimes the daemon will not die promptly on SIGTERM, even though
all DELETE notifications is sent out.  Create a prioritized send-queue
for the DELETE messages to solve this. Some (C)-2001.
niklas@ ok.

Revision 1.36 / (download) - annotate - [select for diffs], Fri Aug 24 13:53:02 2001 UTC (22 years, 9 months ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.35: +88 -8 lines
Diff to previous 1.35 (colored)

Send DELETE notifications for all active SAs when we shut down the daemon.
This "clean" shutdown happens on SIGTERM ('kill <pid>') or if a 'Q' command
is input to the fifo UI. Suggested by <Ghislaine.Labouret@hsc.fr>.

Revision 1.35 / (download) - annotate - [select for diffs], Thu Aug 23 23:11:02 2001 UTC (22 years, 9 months ago) by angelos
Branch: MAIN
Changes since 1.34: +3 -4 lines
Diff to previous 1.34 (colored)

Reinitialize transports on SIGUP.

Revision 1.34 / (download) - annotate - [select for diffs], Thu Aug 23 14:17:08 2001 UTC (22 years, 9 months ago) by aaron
Branch: MAIN
Changes since 1.33: +2 -2 lines
Diff to previous 1.33 (colored)

recieve -> receive

Revision 1.33 / (download) - annotate - [select for diffs], Thu Jul 5 12:36:53 2001 UTC (22 years, 11 months ago) by ho
Branch: MAIN
Changes since 1.32: +4 -2 lines
Diff to previous 1.32 (colored)

Add prototypes and some other various cleanup.

Revision 1.32 / (download) - annotate - [select for diffs], Sun Jul 1 19:59:13 2001 UTC (22 years, 11 months ago) by niklas
Branch: MAIN
Changes since 1.31: +15 -11 lines
Diff to previous 1.31 (colored)

strict strtol checking.  text2sockaddr/sockaddr2text implementations
for systems without get{addr,name}info calls.  Some style police.

Revision 1.31 / (download) - annotate - [select for diffs], Fri Jun 29 19:41:43 2001 UTC (22 years, 11 months ago) by ho
Branch: MAIN
Changes since 1.30: +3 -7 lines
Diff to previous 1.30 (colored)

IPv6 support, by niklas@ and me.

Revision 1.25.2.1 / (download) - annotate - [select for diffs], Tue May 8 12:45:23 2001 UTC (23 years, 1 month ago) by ho
Branch: OPENBSD_2_8
Changes since 1.25: +39 -12 lines
Diff to previous 1.25 (colored) next main 1.26 (colored)

Pull in isakmpd from 2.9 to 2.8 branch.

Revision 1.30 / (download) - annotate - [select for diffs], Mon Apr 9 22:09:52 2001 UTC (23 years, 2 months ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.29: +4 -4 lines
Diff to previous 1.29 (colored)

More style fixes...

Revision 1.29 / (download) - annotate - [select for diffs], Mon Apr 9 21:21:57 2001 UTC (23 years, 2 months ago) by ho
Branch: MAIN
Changes since 1.28: +31 -4 lines
Diff to previous 1.28 (colored)

isakmpd can now capture un-encrypted IKE negotiation packets to a
file. In pcap(3) format, so tcpdump(8) can read it.
Idea by Tim Newsham <newsham@lava.net>, work by him and me.
Ok angelos@, niklas@

Revision 1.28 / (download) - annotate - [select for diffs], Sat Apr 7 20:36:47 2001 UTC (23 years, 2 months ago) by ho
Branch: MAIN
Changes since 1.27: +2 -2 lines
Diff to previous 1.27 (colored)

Add missing filename argument.

Revision 1.27 / (download) - annotate - [select for diffs], Sat Jan 27 12:03:33 2001 UTC (23 years, 4 months ago) by niklas
Branch: MAIN
Changes since 1.26: +2 -2 lines
Diff to previous 1.26 (colored)

(c) 2001

Revision 1.26 / (download) - annotate - [select for diffs], Fri Jan 26 12:12:52 2001 UTC (23 years, 4 months ago) by niklas
Branch: MAIN
Changes since 1.25: +4 -4 lines
Diff to previous 1.25 (colored)

Pedantic style police

Revision 1.25 / (download) - annotate - [select for diffs], Sat Oct 7 06:58:37 2000 UTC (23 years, 8 months ago) by niklas
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE
Branch point for: OPENBSD_2_8
Changes since 1.24: +4 -3 lines
Diff to previous 1.24 (colored)

isakmp_doi.h: Merge with EOM 1.1
isakmpd.c: Merge with EOM 1.54

Revision 1.24 / (download) - annotate - [select for diffs], Thu Jun 8 20:51:31 2000 UTC (24 years ago) by niklas
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)

Merge with EOM 1.52

author: angelos
Add the -R option in getopt!!!

Revision 1.23 / (download) - annotate - [select for diffs], Wed May 3 13:47:27 2000 UTC (24 years, 1 month ago) by niklas
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_7
Changes since 1.22: +10 -4 lines
Diff to previous 1.22 (colored)

Merge with EOM 1.51

author: ho
style fix

author: ho
Create report files with umask 077

Revision 1.22 / (download) - annotate - [select for diffs], Tue May 2 14:36:30 2000 UTC (24 years, 1 month ago) by niklas
Branch: MAIN
Changes since 1.21: +39 -6 lines
Diff to previous 1.21 (colored)

Merge with EOM 1.49

author: niklas
Consolidate PID writers

author: niklas
save pid in a pidfile, based on code from Lawrence A. Wimble.  Also retry
to dlopen libcrypto after SIGHUP, useful if /usr was mounted in between.

author: ho
Write pid file on start. (angelos@ ok)

Revision 1.21 / (download) - annotate - [select for diffs], Fri Apr 7 22:06:44 2000 UTC (24 years, 2 months ago) by niklas
Branch: MAIN
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)

conf.c: Merge with EOM 1.21
isakmpd.c: Merge with EOM 1.46
sa.c: Merge with EOM 1.100
ui.c: Merge with EOM 1.39

author: niklas
error message style

Revision 1.20 / (download) - annotate - [select for diffs], Fri Feb 25 17:23:39 2000 UTC (24 years, 3 months ago) by niklas
Branch: MAIN
Changes since 1.19: +17 -3 lines
Diff to previous 1.19 (colored)

regress/crypto/Makefile: Merge with EOM 1.5
regress/dh/Makefile: Merge with EOM 1.7
regress/group/Makefile: Merge with EOM 1.9
regress/prf/Makefile: Merge with EOM 1.4
regress/rsakeygen/Makefile: Merge with EOM 1.8
regress/x509/Makefile: Merge with EOM 1.10
Makefile: Merge with EOM 1.62
attribute.c: Merge with EOM 1.10
sa.c: Merge with EOM 1.99
conf.c: Merge with EOM 1.20
crypto.c: Merge with EOM 1.28
isakmpd.c: Merge with EOM 1.45
connection.c: Merge with EOM 1.19
doi.h: Merge with EOM 1.28
field.c: Merge with EOM 1.11
exchange.c: Merge with EOM 1.116
ike_auth.c: Merge with EOM 1.44
pf_key_v2.c: Merge with EOM 1.37
ike_phase_1.c: Merge with EOM 1.22
ipsec.c: Merge with EOM 1.118
isakmp_doi.c: Merge with EOM 1.40
log.c: Merge with EOM 1.26
log.h: Merge with EOM 1.18
math_group.c: Merge with EOM 1.23
message.c: Merge with EOM 1.144
pf_encap.c: Merge with EOM 1.70
policy.c: Merge with EOM 1.18
timer.c: Merge with EOM 1.13
transport.c: Merge with EOM 1.41
udp.c: Merge with EOM 1.47
ui.c: Merge with EOM 1.37
x509.c: Merge with EOM 1.36

author: niklas
Made debug logging a compile time selectable feature

Revision 1.19 / (download) - annotate - [select for diffs], Sat Feb 19 19:32:53 2000 UTC (24 years, 3 months ago) by niklas
Branch: MAIN
Changes since 1.18: +5 -5 lines
Diff to previous 1.18 (colored)

cert.c: Merge with EOM 1.14
ike_auth.c: Merge with EOM 1.43
ike_phase_1.c: Merge with EOM 1.21
init.c: Merge with EOM 1.24
ipsec.c: Merge with EOM 1.117
isakmpd.c: Merge with EOM 1.44
math_group.c: Merge with EOM 1.22

author: niklas
Copyright 2000

author: niklas
Allow isakmpd builders to remove optional parts and save bytes.

Revision 1.18 / (download) - annotate - [select for diffs], Tue Feb 1 02:46:18 2000 UTC (24 years, 4 months ago) by niklas
Branch: MAIN
Changes since 1.17: +3 -2 lines
Diff to previous 1.17 (colored)

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

Revision 1.17 / (download) - annotate - [select for diffs], Mon Jan 31 08:18:54 2000 UTC (24 years, 4 months ago) by niklas
Branch: MAIN
Changes since 1.16: +7 -3 lines
Diff to previous 1.16 (colored)

Merge with EOM 1.41

author: angelos
Make x509_cert_init() able to re-initialize.

author: angelos
Reinitialize certificates as well.

Revision 1.16 / (download) - annotate - [select for diffs], Wed Jan 26 15:21:08 2000 UTC (24 years, 4 months ago) by niklas
Branch: MAIN
Changes since 1.15: +5 -2 lines
Diff to previous 1.15 (colored)

isakmpd.c: Merge with EOM 1.39
init.c: Merge with EOM 1.19

author: angelos
GMTTimeOfDay and LocalTimeOfDay attributes, comment in x509.c.

Revision 1.15 / (download) - annotate - [select for diffs], Fri Oct 1 14:09:20 1999 UTC (24 years, 8 months ago) by niklas
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.14: +11 -3 lines
Diff to previous 1.14 (colored)

isakmpd.8: Merge with EOM 1.17
isakmpd.c: Merge with EOM 1.38

author: angelos
Allow "-DA=xx" to mean "set all debug classes to level xx"

Revision 1.14 / (download) - annotate - [select for diffs], Thu Aug 26 22:31:45 1999 UTC (24 years, 9 months ago) by niklas
Branch: MAIN
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

Merge with EOM 1.37

author: niklas
Support dynamic loading of libkeynote too.  Build isakmpd static by default.
Stylistic cleanup of keynote policy code.  Correct some libcrypto calls.

Revision 1.13 / (download) - annotate - [select for diffs], Thu Aug 5 22:40:57 1999 UTC (24 years, 10 months ago) by niklas
Branch: MAIN
Changes since 1.12: +10 -9 lines
Diff to previous 1.12 (colored)

Merge with EOM 1.36

author: niklas
regrand is in util.h now.  Use new conf_reinit API at SIGHUP time.  Fix
timeout handling in deteerministic mode.

Revision 1.12 / (download) - annotate - [select for diffs], Wed Jul 7 22:11:45 1999 UTC (24 years, 11 months ago) by niklas
Branch: MAIN
Changes since 1.11: +45 -2 lines
Diff to previous 1.11 (colored)

Merge with EOM 1.35

author: ho
Add trap for SIGUSR2. Preliminary use to rehash soft exp. timers.

author: ho
Add keynote policy support (with USE_KEYNOTE). angelos@openbsd.org

Revision 1.11 / (download) - annotate - [select for diffs], Wed Jun 2 06:28:34 1999 UTC (25 years ago) by niklas
Branch: MAIN
Changes since 1.10: +28 -6 lines
Diff to previous 1.10 (colored)

Merge with EOM 1.33

author: ho
Add missing #include

author: ho
Add connection_reinit to SIGHUP handler. Add comments.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Apr 19 21:09:36 1999 UTC (25 years, 1 month ago) by niklas
Branch: MAIN
Changes since 1.9: +7 -4 lines
Diff to previous 1.9 (colored)

./isakmpd.c: Merge with EOM 1.31

Style.  alloc error reporting.  Math error propagation.  Allocate right
sizes.

Log any SIGHUPs looking our way.

1999 copyrights

Revision 1.9 / (download) - annotate - [select for diffs], Wed Mar 24 14:43:37 1999 UTC (25 years, 2 months ago) by niklas
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE, OPENBSD_2_5
Changes since 1.8: +4 -4 lines
Diff to previous 1.8 (colored)

Merge with EOM 1.28
Allow the application socket to not exist

Revision 1.8 / (download) - annotate - [select for diffs], Fri Feb 26 03:44:42 1999 UTC (25 years, 3 months ago) by niklas
Branch: MAIN
Changes since 1.7: +4 -3 lines
Diff to previous 1.7 (colored)

Merge from the Ericsson repository
| revision 1.27
| date: 1999/02/25 11:39:09;  author: niklas;  state: Exp;  lines: +3 -2
| include sysdep.h everywhere
| ----------------------------

Revision 1.7 / (download) - annotate - [select for diffs], Tue Dec 22 15:27:40 1998 UTC (25 years, 5 months ago) by niklas
Branch: MAIN
Changes since 1.6: +26 -15 lines
Diff to previous 1.6 (colored)

Size the fd sets from the descriptor table

Revision 1.6 / (download) - annotate - [select for diffs], Tue Dec 22 02:25:16 1998 UTC (25 years, 5 months ago) by niklas
Branch: MAIN
Changes since 1.5: +8 -7 lines
Diff to previous 1.5 (colored)

Generalize udp port decoding.  Remove unneeded decls.

Revision 1.5 / (download) - annotate - [select for diffs], Mon Dec 21 01:02:25 1998 UTC (25 years, 5 months ago) by niklas
Branch: MAIN
Changes since 1.4: +51 -3 lines
Diff to previous 1.4 (colored)

Last months worth of work on isakmpd, lots done

Revision 1.4 / (download) - annotate - [select for diffs], Fri Nov 20 07:33:45 1998 UTC (25 years, 6 months ago) by niklas
Branch: MAIN
Changes since 1.3: +14 -9 lines
Diff to previous 1.3 (colored)

Do not report select errors on EINTR

Revision 1.3 / (download) - annotate - [select for diffs], Tue Nov 17 11:10:15 1998 UTC (25 years, 6 months ago) by niklas
Branch: MAIN
Changes since 1.2: +2 -1 lines
Diff to previous 1.2 (colored)

Add RCS Ids from the EOM repository

Revision 1.2 / (download) - annotate - [select for diffs], Sun Nov 15 00:43:57 1998 UTC (25 years, 7 months ago) by niklas
Branch: MAIN
Changes since 1.1: +1 -1 lines
Diff to previous 1.1 (colored)

openBSD RCS IDs

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Sun Nov 15 00:03:49 1998 UTC (25 years, 7 months ago) by niklas
Branch: NIKLAS
CVS Tags: NIKLAS_981114
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

Initial import of isakmpd, an IKE (ISAKMP/Oakley) implementation for the
OpenBSD IPSEC stack by me, Niklas Hallqvist and Niels Provos, funded by
Ericsson Radio Systems.  It is not yet complete or usable in a real scenario
but the missing pieces will soon be there.  The early commit is for people
who wants early access and who are not afraid of looking at source.
isakmpd interops with Cisco, Timestep, SSH & Pluto (Linux FreeS/WAN) so
far, so it is not that incomplete.  It is really mostly configuration that
is lacking.

Revision 1.1 / (download) - annotate - [select for diffs], Sun Nov 15 00:03:49 1998 UTC (25 years, 7 months ago) by niklas
Branch: MAIN

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.