mirror of
https://github.com/systemd/systemd.git
synced 2025-01-26 14:04:03 +03:00
volume_id: hfs - calculate proper uuid
This commit is contained in:
Kay Sievers
parent
e407720bba
commit
ac877d7cf4
@ -7,6 +7,11 @@ include_HEADERS =\
|
||||
|
||||
libvolume_id_la_SOURCES =\
|
||||
libvolume_id-private.h \
|
||||
volume_id.c \
|
||||
util.h \
|
||||
util.c \
|
||||
md5.h \
|
||||
md5.c \
|
||||
ext.c \
|
||||
fat.c \
|
||||
hfs.c \
|
||||
@ -41,10 +46,7 @@ libvolume_id_la_SOURCES =\
|
||||
vxfs.c \
|
||||
squashfs.c \
|
||||
netware.c \
|
||||
oracleasm.c \
|
||||
volume_id.c \
|
||||
util.h \
|
||||
util.c
|
||||
oracleasm.c
|
||||
|
||||
libvolume_id_la_LDFLAGS = \
|
||||
-version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
#include "libvolume_id.h"
|
||||
#include "libvolume_id-private.h"
|
||||
#include "util.h"
|
||||
#include "md5.h"
|
||||
|
||||
struct hfs_finder_info{
|
||||
uint32_t boot_folder;
|
||||
@ -140,8 +141,7 @@ static struct hfsplus_vol_header {
|
||||
|
||||
static void hfsid_set_uuid(struct volume_id *id, const uint8_t *hfs_id)
|
||||
{
|
||||
#if 0
|
||||
MD5_CTX md5c;
|
||||
struct md5_ctx md5c;
|
||||
static const uint8_t hash_init[16] = {
|
||||
0xb3, 0xe2, 0x0f, 0x39, 0xf2, 0x92, 0x11, 0xd6,
|
||||
0x97, 0xa4, 0x00, 0x30, 0x65, 0x43, 0xec, 0xac
|
||||
@ -151,17 +151,14 @@ static void hfsid_set_uuid(struct volume_id *id, const uint8_t *hfs_id)
|
||||
if (*((uint64_t *)hfs_id) == 0)
|
||||
return;
|
||||
|
||||
MD5_Init(&md5c);
|
||||
MD5_Update(&md5c, &hash_init, 16);
|
||||
MD5_Update(&md5c, hfs_id, 8);
|
||||
MD5_Final(uuid, &md5c);
|
||||
md5_init(&md5c);
|
||||
md5_update(&md5c, hash_init, 16);
|
||||
md5_update(&md5c, hfs_id, 8);
|
||||
md5_final(&md5c, uuid);
|
||||
|
||||
uuid[6] = 0x30 | (uuid[6] & 0x0f);
|
||||
uuid[8] = 0x80 | (uuid[8] & 0x3f);
|
||||
volume_id_set_uuid(id, uuid, UUID_DCE);
|
||||
#endif
|
||||
|
||||
volume_id_set_uuid(id, hfs_id, 0, UUID_64BIT_BE);
|
||||
volume_id_set_uuid(id, uuid, 0, UUID_DCE);
|
||||
}
|
||||
|
||||
int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off, uint64_t size)
|
||||
|
||||
205
extras/volume_id/lib/md5.c
Normal file
205
extras/volume_id/lib/md5.c
Normal file
@ -0,0 +1,205 @@
|
||||
/*
|
||||
* MD5 Message Digest Algorithm (RFC1321).
|
||||
*
|
||||
* Derived from cryptoapi implementation, originally based on the
|
||||
* public domain implementation written by Colin Plumb in 1993.
|
||||
*
|
||||
* Copyright (c) Cryptoapi developers.
|
||||
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 of the License, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
*/
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <endian.h>
|
||||
#include <byteswap.h>
|
||||
|
||||
#include "md5.h"
|
||||
|
||||
#if !(__BYTE_ORDER == __LITTLE_ENDIAN) && !(__BYTE_ORDER == __BIG_ENDIAN)
|
||||
#error missing __BYTE_ORDER
|
||||
#endif
|
||||
|
||||
#define F1(x, y, z) (z ^ (x & (y ^ z)))
|
||||
#define F2(x, y, z) F1(z, x, y)
|
||||
#define F3(x, y, z) (x ^ y ^ z)
|
||||
#define F4(x, y, z) (y ^ (x | ~z))
|
||||
|
||||
#define MD5STEP(f, w, x, y, z, in, s) \
|
||||
(w += f(x, y, z) + in, w = (w<<s | w>>(32-s)) + x)
|
||||
|
||||
static void md5_transform(uint32_t *hash, uint32_t const *in)
|
||||
{
|
||||
uint32_t a, b, c, d;
|
||||
|
||||
a = hash[0];
|
||||
b = hash[1];
|
||||
c = hash[2];
|
||||
d = hash[3];
|
||||
|
||||
MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
|
||||
MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
|
||||
MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
|
||||
MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
|
||||
|
||||
MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
|
||||
MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
|
||||
MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
|
||||
MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
|
||||
|
||||
MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
|
||||
MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
|
||||
MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
|
||||
MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
|
||||
|
||||
MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
|
||||
MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
|
||||
MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
|
||||
MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
|
||||
|
||||
hash[0] += a;
|
||||
hash[1] += b;
|
||||
hash[2] += c;
|
||||
hash[3] += d;
|
||||
}
|
||||
|
||||
static inline void swab32_array(uint32_t *buf, unsigned int words)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < words; i++)
|
||||
buf[i] = bswap_32(buf[i]);
|
||||
}
|
||||
|
||||
static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words)
|
||||
{
|
||||
#if (__BYTE_ORDER == __BIG_ENDIAN)
|
||||
swab32_array(buf, words);
|
||||
#endif
|
||||
}
|
||||
static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words)
|
||||
{
|
||||
#if (__BYTE_ORDER == __BIG_ENDIAN)
|
||||
swab32_array(buf, words);
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline void md5_transform_helper(struct md5_ctx *ctx)
|
||||
{
|
||||
le32_to_cpu_array(ctx->block, sizeof(ctx->block) / sizeof(uint32_t));
|
||||
md5_transform(ctx->hash, ctx->block);
|
||||
}
|
||||
|
||||
void md5_init(struct md5_ctx *mctx)
|
||||
{
|
||||
mctx->hash[0] = 0x67452301;
|
||||
mctx->hash[1] = 0xefcdab89;
|
||||
mctx->hash[2] = 0x98badcfe;
|
||||
mctx->hash[3] = 0x10325476;
|
||||
mctx->byte_count = 0;
|
||||
}
|
||||
|
||||
void md5_update(struct md5_ctx *mctx, const uint8_t *data, unsigned int len)
|
||||
{
|
||||
const uint32_t avail = sizeof(mctx->block) - (mctx->byte_count & 0x3f);
|
||||
|
||||
mctx->byte_count += len;
|
||||
|
||||
if (avail > len) {
|
||||
memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
|
||||
data, len);
|
||||
return;
|
||||
}
|
||||
|
||||
memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, avail);
|
||||
|
||||
md5_transform_helper(mctx);
|
||||
data += avail;
|
||||
len -= avail;
|
||||
|
||||
while (len >= sizeof(mctx->block)) {
|
||||
memcpy(mctx->block, data, sizeof(mctx->block));
|
||||
md5_transform_helper(mctx);
|
||||
data += sizeof(mctx->block);
|
||||
len -= sizeof(mctx->block);
|
||||
}
|
||||
|
||||
memcpy(mctx->block, data, len);
|
||||
}
|
||||
|
||||
void md5_final(struct md5_ctx *mctx, uint8_t *out)
|
||||
{
|
||||
const unsigned int offset = mctx->byte_count & 0x3f;
|
||||
char *p = (char *)mctx->block + offset;
|
||||
int padding = 56 - (offset + 1);
|
||||
|
||||
*p++ = 0x80;
|
||||
if (padding < 0) {
|
||||
memset(p, 0x00, padding + sizeof (uint64_t));
|
||||
md5_transform_helper(mctx);
|
||||
p = (char *)mctx->block;
|
||||
padding = 56;
|
||||
}
|
||||
|
||||
memset(p, 0, padding);
|
||||
mctx->block[14] = mctx->byte_count << 3;
|
||||
mctx->block[15] = mctx->byte_count >> 29;
|
||||
le32_to_cpu_array(mctx->block, (sizeof(mctx->block) -
|
||||
sizeof(uint64_t)) / sizeof(uint32_t));
|
||||
md5_transform(mctx->hash, mctx->block);
|
||||
cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t));
|
||||
memcpy(out, mctx->hash, sizeof(mctx->hash));
|
||||
memset(mctx, 0, sizeof(*mctx));
|
||||
}
|
||||
30
extras/volume_id/lib/md5.h
Normal file
30
extras/volume_id/lib/md5.h
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* MD5 Message Digest Algorithm (RFC1321).
|
||||
*
|
||||
* Derived from cryptoapi implementation, originally based on the
|
||||
* public domain implementation written by Colin Plumb in 1993.
|
||||
*
|
||||
* Copyright (c) Cryptoapi developers.
|
||||
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 of the License, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
*/
|
||||
|
||||
#define MD5_DIGEST_SIZE 16
|
||||
#define MD5_HMAC_BLOCK_SIZE 64
|
||||
#define MD5_BLOCK_WORDS 16
|
||||
#define MD5_HASH_WORDS 4
|
||||
|
||||
struct md5_ctx {
|
||||
uint32_t hash[MD5_HASH_WORDS];
|
||||
uint32_t block[MD5_BLOCK_WORDS];
|
||||
uint64_t byte_count;
|
||||
};
|
||||
|
||||
extern void md5_init(struct md5_ctx *mctx);
|
||||
extern void md5_update(struct md5_ctx *mctx, const uint8_t *data, unsigned int len);
|
||||
extern void md5_final(struct md5_ctx *mctx, uint8_t *out);
|
||||
@ -269,7 +269,6 @@ void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, en
|
||||
count = 4;
|
||||
break;
|
||||
case UUID_64BIT_LE:
|
||||
case UUID_64BIT_BE:
|
||||
count = 8;
|
||||
break;
|
||||
case UUID_DCE:
|
||||
@ -302,11 +301,6 @@ set:
|
||||
buf[7], buf[6], buf[5], buf[4],
|
||||
buf[3], buf[2], buf[1], buf[0]);
|
||||
break;
|
||||
case UUID_64BIT_BE:
|
||||
sprintf(id->uuid,"%02X%02X%02X%02X%02X%02X%02X%02X",
|
||||
buf[0], buf[1], buf[2], buf[3],
|
||||
buf[4], buf[5], buf[6], buf[7]);
|
||||
break;
|
||||
case UUID_DCE:
|
||||
sprintf(id->uuid,
|
||||
"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
|
||||
|
||||
@ -70,7 +70,6 @@ enum uuid_format {
|
||||
UUID_DCE,
|
||||
UUID_DOS,
|
||||
UUID_64BIT_LE,
|
||||
UUID_64BIT_BE,
|
||||
UUID_MD,
|
||||
UUID_LVM,
|
||||
};
|
||||
@ -91,4 +90,3 @@ extern uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t
|
||||
extern void volume_id_free_buffer(struct volume_id *id);
|
||||
|
||||
#endif /* _VOLUME_ID_UTIL_ */
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user