sudo_uuid_create: Convert 16 and 32-bit fields to network byte order.

Fixes a problem where the version and variant were not being
parsed correctly (since they were set in host byte order).

Author: millert

lib/util/regress/uuid/uuid_test.c

@@ -75,6 +75,7 @@ main(int argc, char *argv[])
 
     /* Do 16 passes. */
     for (ntests = 0; ntests < 16; ntests++) {
+	uint16_t time_hi_and_version;
 	unsigned char uuid_buf[16];
 	char uuid_str[37];
 
@@ -93,8 +94,9 @@ main(int argc, char *argv[])
 	}
 
 	/* Version: bits 12-15 are 0010. */
-	if ((uuid.id.time_hi_and_version & 0xf000) != 0x4000) {
-	    sudo_warnx("bad version: 0x%x", uuid.id.time_hi_and_version & 0xf000);
+	time_hi_and_version = ntohs(uuid.id.time_hi_and_version);
+	if ((time_hi_and_version & 0xf000) != 0x4000) {
+	    sudo_warnx("bad version: 0x%x", (unsigned int)time_hi_and_version);
 	    errors++;
 	    continue;
 	}

lib/util/uuid.c

@@ -59,6 +59,11 @@ sudo_uuid_create_v1(unsigned char uuid_out[restrict static 16])
     uuid.clock_seq_hi_and_reserved &= 0x3f;
     uuid.clock_seq_hi_and_reserved |= 0x80;
 
+    /* Convert 16 and 32-bit fields to network byte order. */
+    uuid.time_low = ntohl(uuid.time_low);
+    uuid.time_mid = ntohs(uuid.time_mid);
+    uuid.time_hi_and_version = ntohs(uuid.time_hi_and_version);
+
     memcpy(uuid_out, &uuid, 16);
 }