Properly handle multiple CERTREQ payloads in CA process. Only for the

last CERTREQ a mismatch should trigger the fallback case, otherwise the
following CERTREQs are ignored.

ok markus@

1 files changed, 5 insertions, 5 deletions

diff --git a/regress/sbin/iked/parser/common.c b/regress/sbin/iked/parser/common.c
index 894c8a759a1..bc376ac34e6 100644
--- a/regress/sbin/iked/parser/common.c
+++ b/regress/sbin/iked/parser/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.4 2019/11/14 18:40:23 tobhe Exp $ */
+/*	$OpenBSD: common.c,v 1.5 2020/04/01 21:09:27 tobhe Exp $ */
 /*
  * A bunch of stub functions so we can compile and link ikev2_pld.c
  * in a standalone program for testing purposes.
@@ -40,7 +40,7 @@ void	 timer_del(struct iked *, struct iked_timer *);
 ssize_t	 ikev2_nat_detection(struct iked *, struct iked_message *,
 	     void *, size_t, u_int);
 int	 ca_setreq(struct iked *, struct iked_sa *, struct iked_static_id *,
-	     u_int8_t, u_int8_t *, size_t, enum privsep_procid);
+	     u_int8_t, u_int8_t, u_int8_t *, size_t, enum privsep_procid);
 int	 ikev2_print_id(struct iked_id *, char *, size_t);
 struct iked_transform *
 	 config_add_transform(struct iked_proposal *, u_int, u_int, u_int,
@@ -146,9 +146,9 @@ ikev2_nat_detection(struct iked *env, struct iked_message *msg,
 }
 
 int
-ca_setreq(struct iked *env, struct iked_sa *sh,
-    struct iked_static_id *localid, u_int8_t type, u_int8_t *data,
-    size_t len, enum privsep_procid procid)
+ca_setreq(struct iked *env, struct iked_sa *sh, struct iked_static_id *localid,
+    u_int8_t type, u_int8_t more, u_int8_t *data, size_t len,
+    enum privsep_procid procid)
 {
 	return (0);
 }