*/
/*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012-2016 Eric Biggers
*
* This file is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* information. */
#define INTEGRITY_CHUNK_SIZE 10485760
-/* Only use a different chunk size for compatiblity with an existing integrity
+/* Only use a different chunk size for compatibility with an existing integrity
* table if the chunk size is between these two numbers. */
#define INTEGRITY_MIN_CHUNK_SIZE 4096
#define INTEGRITY_MAX_CHUNK_SIZE 134217728
u32 num_entries;
u32 chunk_size;
u8 sha1sums[][20];
-} _packed_attribute;
+} __attribute__((packed));
static int
calculate_chunk_sha1(struct filedes *in_fd, size_t this_chunk_size,
off_t offset, u8 sha1_md[])
{
u8 buf[BUFFER_SIZE];
- SHA_CTX ctx;
+ struct sha1_ctx ctx;
size_t bytes_remaining;
size_t bytes_to_read;
int ret;
bytes_remaining -= bytes_to_read;
offset += bytes_to_read;
} while (bytes_remaining);
- sha1_final(sha1_md, &ctx);
+ sha1_final(&ctx, sha1_md);
return 0;
}
struct integrity_table *table;
int ret;
- if (wim->hdr.integrity_table_reshdr.uncompressed_size < 8)
- goto invalid;
+ STATIC_ASSERT(sizeof(struct integrity_table) == 12);
+ if (wim->hdr.integrity_table_reshdr.uncompressed_size < 12)
+ return WIMLIB_ERR_INVALID_INTEGRITY_TABLE;
ret = wim_reshdr_to_data(&wim->hdr.integrity_table_reshdr, wim, &buf);
if (ret)
return ret;
table = buf;
- table->size = le32_to_cpu(table->size);
- table->num_entries = le32_to_cpu(table->num_entries);
- table->chunk_size = le32_to_cpu(table->chunk_size);
+ table->size = le32_to_cpu((_force_attr le32)table->size);
+ table->num_entries = le32_to_cpu((_force_attr le32)table->num_entries);
+ table->chunk_size = le32_to_cpu((_force_attr le32)table->chunk_size);
if (table->size != wim->hdr.integrity_table_reshdr.uncompressed_size ||
table->size != (u64)table->num_entries * SHA1_HASH_SIZE + 12 ||
table->num_entries != DIV_ROUND_UP(num_checked_bytes, table->chunk_size))
{
FREE(table);
- goto invalid;
+ return WIMLIB_ERR_INVALID_INTEGRITY_TABLE;
}
*table_ret = table;
return 0;
-
-invalid:
- return WIMLIB_ERR_INVALID_INTEGRITY_TABLE;
}
/*
new_table_size = new_table->size;
- new_table->size = cpu_to_le32(new_table->size);
- new_table->num_entries = cpu_to_le32(new_table->num_entries);
- new_table->chunk_size = cpu_to_le32(new_table->chunk_size);
+ new_table->size = (_force_attr u32)cpu_to_le32(new_table->size);
+ new_table->num_entries = (_force_attr u32)cpu_to_le32(new_table->num_entries);
+ new_table->chunk_size = (_force_attr u32)cpu_to_le32(new_table->chunk_size);
ret = write_wim_resource_from_buffer(new_table,
new_table_size,