diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-08-03 07:23:01 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-08-03 07:23:01 +0000 |
| commit | 9ed59ad66fb040cebf5f4c63a8380ec1f4517c2b (patch) | |
| tree | 3a795e3f98ad376708bd1711bd7f118be78b7e41 /sbin/isakmpd | |
| parent | 9082a6e85be827a483d4543fa67621fb5763930c (diff) | |
isakmp_doi.c: Merge with EOM 1.41
doi.h: Merge with EOM 1.29
author: provos
make a DOI specific decode_ids, but have isakmp doi decode point to
ipsec.
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/doi.h | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/isakmp_doi.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sbin/isakmpd/doi.h b/sbin/isakmpd/doi.h index 24b9e51c428..07d2798f432 100644 --- a/sbin/isakmpd/doi.h +++ b/sbin/isakmpd/doi.h @@ -1,5 +1,5 @@ -/* $OpenBSD: doi.h,v 1.8 2000/02/25 17:23:39 niklas Exp $ */ -/* $EOM: doi.h,v 1.28 2000/02/20 19:58:37 niklas Exp $ */ +/* $OpenBSD: doi.h,v 1.9 2000/08/03 07:23:00 niklas Exp $ */ +/* $EOM: doi.h,v 1.29 2000/07/02 18:47:15 provos Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -92,6 +92,7 @@ struct doi { int (*validate_transform_id) (u_int8_t, u_int8_t); int (*initiator) (struct message *msg); int (*responder) (struct message *msg); + char *(*decode_ids) (char *, u_int8_t *, size_t, u_int8_t *, size_t, int); }; extern void doi_init (void); diff --git a/sbin/isakmpd/isakmp_doi.c b/sbin/isakmpd/isakmp_doi.c index de9f506e5aa..e3de955b0cf 100644 --- a/sbin/isakmpd/isakmp_doi.c +++ b/sbin/isakmpd/isakmp_doi.c @@ -1,5 +1,5 @@ -/* $OpenBSD: isakmp_doi.c,v 1.9 2000/02/25 17:23:40 niklas Exp $ */ -/* $EOM: isakmp_doi.c,v 1.40 2000/02/20 19:58:39 niklas Exp $ */ +/* $OpenBSD: isakmp_doi.c,v 1.10 2000/08/03 07:23:00 niklas Exp $ */ +/* $EOM: isakmp_doi.c,v 1.41 2000/07/02 18:47:16 provos Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -47,6 +47,7 @@ #include "doi.h" #include "exchange.h" #include "isakmp.h" +#include "ipsec.h" #include "log.h" #include "message.h" #include "sa.h" @@ -103,7 +104,8 @@ static struct doi isakmp_doi = { isakmp_validate_situation, isakmp_validate_transform_id, isakmp_initiator, - isakmp_responder + isakmp_responder, + ipsec_decode_ids }; /* Requires doi_init to already have been called. */ |