RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-11 03:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: add sha256 as supported checksumming algorithm

Browse Source 
Add the definition to the checksum types and let mkfs accept it.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Johannes Thumshirn 2019-10-07 13:13:26 +02:00 committed by David Sterba
parent 785073f658
commit ae9f8bff30
9 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -157,7 +157,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
kernel-lib/raid56.o kernel-lib/tables.o \
common/device-scan.o common/path-utils.o \
common/utils.o libbtrfsutil/subvolume.o libbtrfsutil/stubs.o \
crypto/hash.o crypto/xxhash.o
crypto/hash.o crypto/xxhash.o crypto/sha224-256.o
libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
crypto/crc32c.h kernel-lib/list.h kerncompat.h \
kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \

1
cmds/inspect-dump-super.c
View File

@ -316,6 +316,7 @@ static bool is_valid_csum_type(u16 csum_type)
switch (csum_type) {
case BTRFS_CSUM_TYPE_CRC32:
case BTRFS_CSUM_TYPE_XXHASH:
case BTRFS_CSUM_TYPE_SHA256:
return true;
default:
return false;

12
crypto/hash.c
View File

@ -1,6 +1,7 @@
#include "crypto/hash.h"
#include "crypto/crc32c.h"
#include "crypto/xxhash.h"
#include "crypto/sha.h"
int hash_crc32c(const u8* buf, size_t length, u8 *out)
{
@ -25,3 +26,14 @@ int hash_xxhash(const u8 *buf, size_t length, u8 *out)
return 0;
}
int hash_sha256(const u8 *buf, size_t len, u8 *out)
{
SHA256Context context;
SHA256Reset(&context);
SHA256Input(&context, buf, len);
SHA256Result(&context, out);
return 0;
}

1
crypto/hash.h
View File

@ -7,5 +7,6 @@
int hash_crc32c(const u8 *buf, size_t length, u8 *out);
int hash_xxhash(const u8 *buf, size_t length, u8 *out);
int hash_sha256(const u8 *buf, size_t length, u8 *out);
#endif

4
crypto/sha224-256.c
View File

@ -40,8 +40,8 @@
* to hash the final few bits of the input.
*/
#include "tests/sha.h"
#include "tests/sha-private.h"
#include "crypto/sha.h"
#include "crypto/sha-private.h"
/* Define the SHA shift, rotate left, and rotate right macros */
#define SHA256_SHR(bits,word) ((word) >> (bits))

1
ctree.c
View File

@ -44,6 +44,7 @@ static const struct btrfs_csum {
} btrfs_csums[] = {
[BTRFS_CSUM_TYPE_CRC32] = { 4, "crc32c" },
[BTRFS_CSUM_TYPE_XXHASH] = { 8, "xxhash64" },
[BTRFS_CSUM_TYPE_SHA256] = { 32, "sha256" },
};
u16 btrfs_super_csum_size(const struct btrfs_super_block *sb)

1
ctree.h
View File

@ -168,6 +168,7 @@ struct btrfs_free_space_ctl;
enum btrfs_csum_type {
BTRFS_CSUM_TYPE_CRC32 = 0,
BTRFS_CSUM_TYPE_XXHASH = 1,
BTRFS_CSUM_TYPE_SHA256 = 2,
};
#define BTRFS_EMPTY_DIR_SIZE 0

2
disk-io.c
View File

@ -148,6 +148,8 @@ int btrfs_csum_data(u16 csum_type, const u8 *data, u8 *out, size_t len)
return hash_crc32c(data, len, out);
case BTRFS_CSUM_TYPE_XXHASH:
return hash_xxhash(data, len, out);
case BTRFS_CSUM_TYPE_SHA256:
return hash_sha256(data, len, out);
default:
fprintf(stderr, "ERROR: unknown csum type: %d\n", csum_type);
ASSERT(0);

2
mkfs/main.c
View File

@ -395,6 +395,8 @@ static enum btrfs_csum_type parse_csum_type(const char *s)
} else if (strcasecmp(s, "xxhash64") == 0 ||
strcasecmp(s, "xxhash") == 0) {
return BTRFS_CSUM_TYPE_XXHASH;
} else if (strcasecmp(s, "sha256") == 0) {
return BTRFS_CSUM_TYPE_SHA256;
} else {
error("unknown csum type %s", s);
exit(1);