diff options
| author | Zhihao Cheng <chengzhihao1@huawei.com> | 2024-11-11 16:36:33 +0800 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2024-11-11 10:32:45 +0100 |
| commit | 03ec75b9e6ad4cb372f86d1581c2b1b2ef987c72 (patch) | |
| tree | 4d5e45faa1772cbb5b07e5dc0a78a4398de11d11 /ubifs-utils/common/fscrypt.h | |
| parent | e7e19cd9d8cc0f54ca463c4aebf7c4ef5e4f84f8 (diff) | |
ubifs-utils: Decouple mkfs.ubifs.h out of other modules
Header file mkfs.ubifs.h is included in other modules(eg. compr.c, lpt.c,
fscrypt.h, sign.c), decouple it out of other modules.
There are two parts in mkfs.ubifs.h:
1. common functions, for example dbg_msg, err_msg and write_leb, move
these functions into common/defs.h and common/ubifs.h.
2. devtable related definations, move them into a new header file
common/devtable.h.
Splitting common functions from mkfs.ubifs.h is also a preparation for
importing libubifs(from linux kernel) to replace current UBIFS libs.
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'ubifs-utils/common/fscrypt.h')
| -rw-r--r-- | ubifs-utils/common/fscrypt.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ubifs-utils/common/fscrypt.h b/ubifs-utils/common/fscrypt.h index ff3d326..908a504 100644 --- a/ubifs-utils/common/fscrypt.h +++ b/ubifs-utils/common/fscrypt.h @@ -21,9 +21,11 @@ #ifndef FSCRYPT_H #define FSCRYPT_H - -#include "mkfs.ubifs.h" -#include <sys/types.h> +#ifdef WITH_CRYPTO +#include <openssl/rand.h> +#endif +#include <assert.h> +#include "ubifs.h" #include "crypto.h" #ifndef FS_KEY_DESCRIPTOR_SIZE |