openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-26 19:51:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/f2fscrypt.c: Fix build without uuid/uuid.h header file

Browse Source 
commit 93c6483b85141551e6a5fea339ab4c6cc1f9cc8c
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
This commit is contained in:
Bart Van Assche 2022-04-21 15:18:27 -07:00 committed by dongsenhao
parent 0026d6bb58
commit 989594261b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/f2fscrypt.c
View File

@ -45,6 +45,8 @@
#endif
#ifdef HAVE_UUID_UUID_H
#include <uuid/uuid.h>
#else
typedef unsigned char uuid_t[16];
#endif
#if !defined(HAVE_ADD_KEY) || !defined(HAVE_KEYCTL)
@ -354,11 +356,13 @@ static void parse_salt(char *salt_str, int flags)
perror("F2FS_IOC_GET_ENCRYPTION_PWSALT");
exit(1);
}
#ifdef HAVE_UUID_UUID_H
if (options & OPT_VERBOSE) {
char tmp[80];
uuid_unparse(buf, tmp);
printf("%s has pw salt %s\n", cp, tmp);
}
#endif
salt_len = 16;
} else if (strncmp(cp, "f:", 2) == 0) {
cp += 2;
@ -380,8 +384,10 @@ static void parse_salt(char *salt_str, int flags)
(((unsigned char)(h - hexchars) << 4) +
(unsigned char)(l - hexchars));
}
#ifdef HAVE_UUID_UUID_H
} else if (uuid_parse(cp, buf) == 0) {
salt_len = 16;
#endif
} else {
invalid_salt:
fprintf(stderr, "Invalid salt: %s\n", salt_str);