From 3f6dffc08fd1386299c959a6613728c3c7925414 Mon Sep 17 00:00:00 2001 From: Niklas Hallqvist Date: Tue, 1 Feb 2000 02:46:20 +0000 Subject: 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 --- sbin/isakmpd/pf_key_v2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sbin/isakmpd/pf_key_v2.c') diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index 31140812edd..1e4c4f2b1f9 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,8 +1,9 @@ -/* $OpenBSD: pf_key_v2.c,v 1.22 2000/01/31 08:38:29 niklas Exp $ */ -/* $EOM: pf_key_v2.c,v 1.35 2000/01/31 08:39:45 niklas Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.23 2000/02/01 02:46:18 niklas Exp $ */ +/* $EOM: pf_key_v2.c,v 1.36 2000/01/31 22:33:48 niklas Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. 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 -- cgit v1.2.3