diff options
| author | Richard Weinberger <richard@nod.at> | 2018-10-18 16:36:41 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2018-11-01 12:33:11 +0100 |
| commit | 2fd902f11823433ba9332da3106253b674563542 (patch) | |
| tree | 188bab125011bfb896224bb6b81bb824561d1003 | |
| parent | 29ef97363d352ab157c1c5422ac5de43c038e60e (diff) | |
mkfs.ubifs: Make r5 hash binary string aware
As of now all filenames known by UBIFS are strings with a NUL
terminator. With encrypted filenames a filename can be any binary
string and the r5 function cannot search for the NUL terminator.
UBIFS always knows how long a filename is, therefore we can change
the hash function to iterate over the filename length to work
correctly with binary strings.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | ubifs-utils/mkfs.ubifs/key.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h index c16d0a8..0c7922b 100644 --- a/ubifs-utils/mkfs.ubifs/key.h +++ b/ubifs-utils/mkfs.ubifs/key.h @@ -64,9 +64,8 @@ static inline uint32_t key_r5_hash(const char *s, int len) { uint32_t a = 0; const signed char *str = (const signed char *)s; - (void)len; - while (*str) { + while (len--) { a += *str << 4; a += *str >> 4; a *= 11; |