diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-03-10 23:08:50 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-03-10 23:08:50 +0000 |
| commit | 1d6249865212270a6e6a513a2f656690e7b5c042 (patch) | |
| tree | e2aa46a32ebd4bd44808de572c5041d559699a99 /sbin/isakmpd/isakmp_doi.c | |
| parent | 269e9b0ceb4a217d7841ca9a9f66e153e6d6e863 (diff) | |
Fix payload handling flaws found by cloder@. Based on initial patch by
cloder@. Testing by markus@ cloder@ hshoexer@.
ok ho@
Diffstat (limited to 'sbin/isakmpd/isakmp_doi.c')
| -rw-r--r-- | sbin/isakmpd/isakmp_doi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/isakmp_doi.c b/sbin/isakmpd/isakmp_doi.c index 5d6de9a6f07..0aab1c83712 100644 --- a/sbin/isakmpd/isakmp_doi.c +++ b/sbin/isakmpd/isakmp_doi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isakmp_doi.c,v 1.17 2003/10/14 14:29:15 ho Exp $ */ +/* $OpenBSD: isakmp_doi.c,v 1.18 2004/03/10 23:08:49 hshoexer Exp $ */ /* $EOM: isakmp_doi.c,v 1.42 2000/09/12 16:29:41 ho Exp $ */ /* @@ -67,7 +67,7 @@ static int isakmp_validate_id_information (u_int8_t, u_int8_t *, u_int8_t *, static int isakmp_validate_key_information (u_int8_t *, size_t); static int isakmp_validate_notification (u_int16_t); static int isakmp_validate_proto (u_int8_t); -static int isakmp_validate_situation (u_int8_t *, size_t *); +static int isakmp_validate_situation (u_int8_t *, size_t *, size_t); static int isakmp_validate_transform_id (u_int8_t, u_int8_t); static struct doi isakmp_doi = { @@ -197,7 +197,7 @@ isakmp_validate_proto (u_int8_t proto) } static int -isakmp_validate_situation (u_int8_t *buf, size_t *sz) +isakmp_validate_situation (u_int8_t *buf, size_t *sz, size_t len) { /* There are no situations in the ISAKMP DOI. */ *sz = 0; |