diff options
| author |   millert <millert@openbsd.org> | 2013-11-21 17:46:17 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2013-11-21 17:46:17 +0000 |
| commit | 2e9c6580da7b30718795869232d0c4daf7eb814c (patch) | |
| tree | 816ebd552be0ca3bdf5160c3e45ad8dc0d14292e | |
| parent | remove dead assignment as reported by llvm. (diff) | |
| download | wireguard-openbsd-2e9c6580da7b30718795869232d0c4daf7eb814c.tar.xz wireguard-openbsd-2e9c6580da7b30718795869232d0c4daf7eb814c.zip | |
Make the bit string u_char * in print_bits(). In practice we
shouldn't have chars > 127 in these but it is better not to assume
this. OK deraadt@
| -rw-r--r-- | sbin/iked/iked.h | 4 | ||||
| -rw-r--r-- | sbin/iked/util.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h index 84b8f70fe97..d23ab9a5734 100644 --- a/sbin/iked/iked.h +++ b/sbin/iked/iked.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iked.h,v 1.57 2013/11/14 12:38:20 markus Exp $ */ +/* $OpenBSD: iked.h,v 1.58 2013/11/21 17:46:17 millert Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -829,7 +829,7 @@ void lc_string(char *); void print_hex(u_int8_t *, off_t, size_t); void print_hexval(u_int8_t *, off_t, size_t); const char * - print_bits(u_short, char *); + print_bits(u_short, u_char *); int sockaddr_cmp(struct sockaddr *, struct sockaddr *, int); u_int8_t mask2prefixlen(struct sockaddr *); u_int8_t mask2prefixlen6(struct sockaddr *); diff --git a/sbin/iked/util.c b/sbin/iked/util.c index 39458a56813..3238f7a0db9 100644 --- a/sbin/iked/util.c +++ b/sbin/iked/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.19 2013/10/24 02:55:50 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.20 2013/11/21 17:46:17 millert Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -447,12 +447,12 @@ print_hexval(u_int8_t *buf, off_t offset, size_t length) } const char * -print_bits(u_short v, char *bits) +print_bits(u_short v, u_char *bits) { static char buf[IKED_CYCLE_BUFFERS][BUFSIZ]; static int idx = 0; u_int i, any = 0, j = 0; - char c; + u_char c; if (!bits) return (""); |