diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-11-23 12:56:16 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-11-23 12:56:16 +0000 |
| commit | 42b2c2b050c7617bac2ebc3684b81226b0aa9d43 (patch) | |
| tree | 9aa51550393c2847dcf9317a934abb12ccecc631 /sbin | |
| parent | 1f760de3683ed43491402f80918e452cff38c9aa (diff) | |
policy.c: Merge with EOM 1.49
util.h: Merge with EOM 1.10
author: niklas
style and removal of unused, unneeded code
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/policy.c | 31 | ||||
| -rw-r--r-- | sbin/isakmpd/util.h | 8 |
2 files changed, 26 insertions, 13 deletions
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c index 0ab47e14ece..5d307f82a0f 100644 --- a/sbin/isakmpd/policy.c +++ b/sbin/isakmpd/policy.c @@ -1,5 +1,5 @@ -/* $OpenBSD: policy.c,v 1.17 2000/10/16 23:28:43 niklas Exp $ */ -/* $EOM: policy.c,v 1.48 2000/10/14 20:19:51 angelos Exp $ */ +/* $OpenBSD: policy.c,v 1.18 2000/11/23 12:56:15 niklas Exp $ */ +/* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */ /* * Copyright (c) 1999, 2000 Angelos D. Keromytis. All rights reserved. @@ -733,15 +733,18 @@ policy_callback (char *name) remote_id_addr_upper); break; - case IPSEC_ID_IPV6_ADDR: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_ADDR: + /* XXX Not yet implemented. */ remote_id_type = "IPv6 address"; break; - case IPSEC_ID_IPV6_RANGE: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_RANGE: + /* XXX Not yet implemented. */ remote_id_type = "IPv6 range"; break; - case IPSEC_ID_IPV6_ADDR_SUBNET: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_ADDR_SUBNET: + /* XXX Not yet implemented. */ remote_id_type = "IPv6 address"; break; @@ -910,15 +913,18 @@ policy_callback (char *name) remote_filter_addr_upper); break; - case IPSEC_ID_IPV6_ADDR: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_ADDR: + /* XXX Not yet implemented. */ remote_filter_type = "IPv6 address"; break; - case IPSEC_ID_IPV6_RANGE: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_RANGE: + /* XXX Not yet implemented. */ remote_filter_type = "IPv6 range"; break; - case IPSEC_ID_IPV6_ADDR_SUBNET: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_ADDR_SUBNET: + /* XXX Not yet implemented. */ remote_filter_type = "IPv6 address"; break; @@ -1090,15 +1096,18 @@ policy_callback (char *name) local_filter_addr_upper); break; - case IPSEC_ID_IPV6_ADDR: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_ADDR: + /* XXX Not yet implemented. */ local_filter_type = "IPv6 address"; break; - case IPSEC_ID_IPV6_RANGE: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_RANGE: + /* XXX Not yet implemented. */ local_filter_type = "IPv6 range"; break; - case IPSEC_ID_IPV6_ADDR_SUBNET: /* XXX we need decode_128 (). */ + case IPSEC_ID_IPV6_ADDR_SUBNET: + /* XXX Not yet implemented. */ local_filter_type = "IPv6 address"; break; diff --git a/sbin/isakmpd/util.h b/sbin/isakmpd/util.h index f91a1ba9fd8..41f4e4307e8 100644 --- a/sbin/isakmpd/util.h +++ b/sbin/isakmpd/util.h @@ -1,5 +1,5 @@ -/* $OpenBSD: util.h,v 1.6 2000/10/16 23:28:13 niklas Exp $ */ -/* $EOM: util.h,v 1.9 2000/10/14 23:40:08 angelos Exp $ */ +/* $OpenBSD: util.h,v 1.7 2000/11/23 12:56:15 niklas Exp $ */ +/* $EOM: util.h,v 1.10 2000/10/24 13:33:39 niklas Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -48,11 +48,15 @@ struct message; extern u_int16_t decode_16 (u_int8_t *); extern u_int32_t decode_32 (u_int8_t *); extern u_int64_t decode_64 (u_int8_t *); +#if 0 extern void decode_128 (u_int8_t *, u_int8_t *); +#endif extern void encode_16 (u_int8_t *, u_int16_t); extern void encode_32 (u_int8_t *, u_int32_t); extern void encode_64 (u_int8_t *, u_int64_t); +#if 0 extern void encode_128 (u_int8_t *, u_int8_t *); +#endif extern u_int8_t *getrandom (u_int8_t *, size_t); extern int hex2raw (char *, u_int8_t *, size_t); extern int zero_test (const u_int8_t *, size_t); |