From 9bfcd13657c197aec78035869dc42233b05361d3 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Sun, 31 Aug 2014 19:58:54 +0000 Subject: Fix incorrect behaviour by syncing with FreeBSD; reported by Jonas 'Sortie' Termansen, thanks! --- lib/libc/uuid/uuid_stream.c | 141 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 121 insertions(+), 20 deletions(-) (limited to 'lib/libc/uuid') diff --git a/lib/libc/uuid/uuid_stream.c b/lib/libc/uuid/uuid_stream.c index c22b9e850cb..96c6e2def7c 100644 --- a/lib/libc/uuid/uuid_stream.c +++ b/lib/libc/uuid/uuid_stream.c @@ -1,7 +1,7 @@ -/* $OpenBSD: uuid_stream.c,v 1.1 2014/08/31 09:36:39 miod Exp $ */ +/* $OpenBSD: uuid_stream.c,v 1.2 2014/08/31 19:58:53 miod Exp $ */ /* $NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $ */ -/* +/*- * Copyright (c) 2002 Marcel Moolenaar * All rights reserved. * @@ -26,11 +26,38 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/*- + * Copyright (c) 2002 Thomas Moestl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sys/endian.h,v 1.7 2010/05/20 06:16:13 phk Exp $ + */ #include "namespace.h" #include -#include +#include #include /* @@ -49,19 +76,93 @@ * | node (2-5) | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * - * NOTE: These routines are not part of the DCE RPC API. There are + * NOTE: These routines are not part of the DCE RPC API. They are * provided for convenience. */ +/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ + +static __inline uint16_t +be16dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return ((p[0] << 8) | p[1]); +} + +static __inline uint32_t +be32dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return (((unsigned)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]); +} + +static __inline uint16_t +le16dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return ((p[1] << 8) | p[0]); +} + +static __inline uint32_t +le32dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return (((unsigned)p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]); +} + +static __inline void +be16enc(void *pp, uint16_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = (u >> 8) & 0xff; + p[1] = u & 0xff; +} + +static __inline void +be32enc(void *pp, uint32_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = (u >> 24) & 0xff; + p[1] = (u >> 16) & 0xff; + p[2] = (u >> 8) & 0xff; + p[3] = u & 0xff; +} + +static __inline void +le16enc(void *pp, uint16_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = u & 0xff; + p[1] = (u >> 8) & 0xff; +} + +static __inline void +le32enc(void *pp, uint32_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = u & 0xff; + p[1] = (u >> 8) & 0xff; + p[2] = (u >> 16) & 0xff; + p[3] = (u >> 24) & 0xff; +} + void -uuid_enc_le(void *buf, const struct uuid *uuid) +uuid_enc_le(void *buf, const uuid_t *uuid) { uint8_t *p = buf; int i; - p[0] = htole32(uuid->time_low); - p[4] = htole16(uuid->time_mid); - p[6] = htole16(uuid->time_hi_and_version); + le32enc(p, uuid->time_low); + le16enc(p + 4, uuid->time_mid); + le16enc(p + 6, uuid->time_hi_and_version); p[8] = uuid->clock_seq_hi_and_reserved; p[9] = uuid->clock_seq_low; for (i = 0; i < _UUID_NODE_LEN; i++) @@ -69,14 +170,14 @@ uuid_enc_le(void *buf, const struct uuid *uuid) } void -uuid_dec_le(void const *buf, struct uuid *uuid) +uuid_dec_le(const void *buf, uuid_t *uuid) { const uint8_t *p = buf; int i; - uuid->time_low = le32toh(*(uint32_t*)p); - uuid->time_mid = le16toh(*(uint16_t*)(p + 4)); - uuid->time_hi_and_version = le16toh(*(uint16_t*)(p + 6)); + uuid->time_low = le32dec(p); + uuid->time_mid = le16dec(p + 4); + uuid->time_hi_and_version = le16dec(p + 6); uuid->clock_seq_hi_and_reserved = p[8]; uuid->clock_seq_low = p[9]; for (i = 0; i < _UUID_NODE_LEN; i++) @@ -84,14 +185,14 @@ uuid_dec_le(void const *buf, struct uuid *uuid) } void -uuid_enc_be(void *buf, const struct uuid *uuid) +uuid_enc_be(void *buf, const uuid_t *uuid) { uint8_t *p = buf; int i; - p[0] = htobe32(uuid->time_low); - p[4] = htobe16(uuid->time_mid); - p[6] = htobe16(uuid->time_hi_and_version); + be32enc(p, uuid->time_low); + be16enc(p + 4, uuid->time_mid); + be16enc(p + 6, uuid->time_hi_and_version); p[8] = uuid->clock_seq_hi_and_reserved; p[9] = uuid->clock_seq_low; for (i = 0; i < _UUID_NODE_LEN; i++) @@ -99,14 +200,14 @@ uuid_enc_be(void *buf, const struct uuid *uuid) } void -uuid_dec_be(void const *buf, struct uuid *uuid) +uuid_dec_be(const void *buf, uuid_t *uuid) { const uint8_t *p = buf; int i; - uuid->time_low = be32toh(*(uint32_t*)p); - uuid->time_mid = be16toh(*(uint16_t*)(p + 4)); - uuid->time_hi_and_version = be16toh(*(uint16_t*)(p + 6)); + uuid->time_low = be32dec(p); + uuid->time_mid = be16dec(p + 4); + uuid->time_hi_and_version = be16dec(p + 6); uuid->clock_seq_hi_and_reserved = p[8]; uuid->clock_seq_low = p[9]; for (i = 0; i < _UUID_NODE_LEN; i++) -- cgit v1.2.3