diff options
| -rw-r--r-- | sbin/isakmpd/util.c | 37 | ||||
| -rw-r--r-- | sbin/isakmpd/util.h | 8 |
2 files changed, 2 insertions, 43 deletions
diff --git a/sbin/isakmpd/util.c b/sbin/isakmpd/util.c index 4cfb2899d08..d621f9b61ba 100644 --- a/sbin/isakmpd/util.c +++ b/sbin/isakmpd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.51 2005/03/04 16:51:52 hshoexer Exp $ */ +/* $OpenBSD: util.c,v 1.52 2005/03/10 21:39:21 hshoexer Exp $ */ /* $EOM: util.c,v 1.23 2000/11/23 12:22:08 niklas Exp $ */ /* @@ -95,28 +95,6 @@ decode_64(u_int8_t *cp) cp[4] << 24 | cp[5] << 16 | cp[6] << 8 | cp[7]; } -#if 0 -/* - * XXX I severly doubt that we will need this. IPv6 does not have the legacy - * of representation in host byte order, AFAIK. - */ - -void -decode_128(u_int8_t *cp, u_int8_t *cpp) -{ -#if BYTE_ORDER == LITTLE_ENDIAN - int i; - - for (i = 0; i < 16; i++) - cpp[i] = cp[15 - i]; -#elif BYTE_ORDER == BIG_ENDIAN - bcopy(cp, cpp, 16); -#else -#error "Byte order unknown!" -#endif -} -#endif - void encode_16(u_int8_t *cp, u_int16_t x) { @@ -146,19 +124,6 @@ encode_64(u_int8_t *cp, u_int64_t x) *cp = x & 0xff; } -#if 0 -/* - * XXX I severly doubt that we will need this. IPv6 does not have the legacy - * of representation in host byte order, AFAIK. - */ - -void -encode_128(u_int8_t *cp, u_int8_t *cpp) -{ - decode_128(cpp, cp); -} -#endif - /* Check a buffer for all zeroes. */ int zero_test(const u_int8_t *p, size_t sz) diff --git a/sbin/isakmpd/util.h b/sbin/isakmpd/util.h index 7c9b96c1442..fe3da5b0eda 100644 --- a/sbin/isakmpd/util.h +++ b/sbin/isakmpd/util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: util.h,v 1.23 2005/03/04 16:51:52 hshoexer Exp $ */ +/* $OpenBSD: util.h,v 1.24 2005/03/10 21:39:21 hshoexer Exp $ */ /* $EOM: util.h,v 1.10 2000/10/24 13:33:39 niklas Exp $ */ /* @@ -46,15 +46,9 @@ extern int check_file_secrecy_fd(int, char *, size_t *); 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 ones_test(const u_int8_t *, size_t); |