sysdep/openbsd/sysdep.c: Merge with EOM 1.9

pf_encap.h: Merge with EOM 1.13
pf_key_v2.h: Merge with EOM 1.4
sysdep.h: Merge with EOM 1.17

author: angelos
Pass the local/remote Phase 1 ID to the flow, so it can be reused when
an SA is re-negotiated.

4 files changed, 13 insertions, 13 deletions

diff --git a/sbin/isakmpd/pf_encap.h b/sbin/isakmpd/pf_encap.h
index 5d959e9863e..167d912b098 100644
--- a/sbin/isakmpd/pf_encap.h
+++ b/sbin/isakmpd/pf_encap.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: pf_encap.h,v 1.7 1999/05/01 20:43:44 niklas Exp $	*/
-/*	$EOM: pf_encap.h,v 1.12 1999/05/01 20:21:13 niklas Exp $	*/
+/*	$OpenBSD: pf_encap.h,v 1.8 2000/12/12 01:46:17 niklas Exp $	*/
+/*	$EOM: pf_encap.h,v 1.13 2000/12/04 04:46:35 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -58,7 +58,7 @@ struct pf_encap_node {
 
 extern void pf_encap_connection_check (char *);
 extern int pf_encap_delete_spi (struct sa *, struct proto *, int);
-extern int pf_encap_enable_sa (struct sa *);
+extern int pf_encap_enable_sa (struct sa *, struct sa *);
 extern int pf_encap_enable_spi (in_addr_t, in_addr_t, in_addr_t, in_addr_t,
 				u_int8_t *, u_int8_t, in_addr_t);
 extern u_int8_t *pf_encap_get_spi (size_t *, u_int8_t, struct sockaddr *, int,
diff --git a/sbin/isakmpd/pf_key_v2.h b/sbin/isakmpd/pf_key_v2.h
index 8e66dd33edb..2c578997ed9 100644
--- a/sbin/isakmpd/pf_key_v2.h
+++ b/sbin/isakmpd/pf_key_v2.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: pf_key_v2.h,v 1.3 1999/05/01 20:43:44 niklas Exp $	*/
-/*	$EOM: pf_key_v2.h,v 1.3 1999/05/01 20:21:15 niklas Exp $	*/
+/*	$OpenBSD: pf_key_v2.h,v 1.4 2000/12/12 01:46:17 niklas Exp $	*/
+/*	$EOM: pf_key_v2.h,v 1.4 2000/12/04 04:46:35 angelos Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -46,7 +46,7 @@ struct sockaddr;
 
 extern void pf_key_v2_connection_check (char *);
 extern int pf_key_v2_delete_spi (struct sa *, struct proto *, int);
-extern int pf_key_v2_enable_sa (struct sa *);
+extern int pf_key_v2_enable_sa (struct sa *, struct sa *);
 extern int pf_key_v2_enable_spi (in_addr_t, in_addr_t, in_addr_t, in_addr_t,
 				 u_int8_t *, u_int8_t, in_addr_t);
 extern u_int8_t *pf_key_v2_get_spi (size_t *, u_int8_t, struct sockaddr *, int,
diff --git a/sbin/isakmpd/sysdep.h b/sbin/isakmpd/sysdep.h
index 45027c40f7d..d3c193db13b 100644
--- a/sbin/isakmpd/sysdep.h
+++ b/sbin/isakmpd/sysdep.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: sysdep.h,v 1.7 1999/05/01 20:43:45 niklas Exp $	*/
-/*	$EOM: sysdep.h,v 1.16 1999/05/01 20:21:16 niklas Exp $	*/
+/*	$OpenBSD: sysdep.h,v 1.8 2000/12/12 01:46:17 niklas Exp $	*/
+/*	$EOM: sysdep.h,v 1.17 2000/12/04 04:46:35 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -50,7 +50,7 @@ extern int sysdep_app_open (void);
 extern int sysdep_cleartext (int);
 extern void sysdep_connection_check (char *);
 extern int sysdep_ipsec_delete_spi (struct sa *, struct proto *, int);
-extern int sysdep_ipsec_enable_sa (struct sa *);
+extern int sysdep_ipsec_enable_sa (struct sa *, struct sa *);
 extern u_int8_t *sysdep_ipsec_get_spi (size_t *, u_int8_t, struct sockaddr *,
 				       int, struct sockaddr *, int);
 extern int sysdep_ipsec_group_spis (struct sa *, struct proto *,
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep.c b/sbin/isakmpd/sysdep/openbsd/sysdep.c
index 459af34bab9..f50055707db 100644
--- a/sbin/isakmpd/sysdep/openbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/openbsd/sysdep.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: sysdep.c,v 1.6 1999/08/05 22:40:37 niklas Exp $	*/
-/*	$EOM: sysdep.c,v 1.8 1999/08/05 15:00:06 niklas Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.7 2000/12/12 01:46:17 niklas Exp $	*/
+/*	$EOM: sysdep.c,v 1.9 2000/12/04 04:46:35 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -179,11 +179,11 @@ sysdep_ipsec_delete_spi (struct sa *sa, struct proto *proto, int incoming)
 }
 
 int
-sysdep_ipsec_enable_sa (struct sa *sa)
+sysdep_ipsec_enable_sa (struct sa *sa, struct sa *isakmp_sa)
 {
   if (app_none)
     return 0;
-  return KEY_API (enable_sa) (sa);
+  return KEY_API (enable_sa) (sa, isakmp_sa);
 }
 
 int