f2fscrypt: show more information of policy
PATCH 1/1 f2fscrypt: show more information of policy
From: Jaegeuk Kim <[email protected]>
This patch gives more information of encryption policy.
--- tools/f2fscrypt.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
tools/f2fscrypt.c +34 -0
@@ -63,6 +63,8 @@#define F2FS_ENCRYPTION_MODE_AES_256_GCM 2#define F2FS_ENCRYPTION_MODE_AES_256_CBC 3#define F2FS_ENCRYPTION_MODE_AES_256_CTS 4 +#define F2FS_ENCRYPTION_MODE_ADIANTUM 9 +#define F2FS_ENCRYPTION_MODE_PRIVATE 127#define F2FS_AES_256_XTS_KEY_SIZE 64#define F2FS_AES_256_GCM_KEY_SIZE 32
@@ -531,6 +533,33 @@ static void get_passphrase(char *passphrase, int len) *p ='\0' ; } +struct enc_mode_map { +int mode; +char name[255 ]; +}; + +static const struct enc_mode_map enc_mode_str[] = { + {F2FS_ENCRYPTION_MODE_INVALID ,"invalid" }, + {F2FS_ENCRYPTION_MODE_AES_256_XTS ,"aes_256_xts" }, + {F2FS_ENCRYPTION_MODE_AES_256_GCM ,"aes_256_gcm" }, + {F2FS_ENCRYPTION_MODE_AES_256_CBC ,"aes_256_cbc" }, + {F2FS_ENCRYPTION_MODE_AES_256_CTS ,"aes_256_cts" }, + {F2FS_ENCRYPTION_MODE_ADIANTUM ,"adiantum" }, + {F2FS_ENCRYPTION_MODE_PRIVATE ,"ice" }, +}; + +static const char *get_crypt_mode (int mode) +{ +int i; + +for (i =0 ; i < (sizeof (enc_mode_str) /sizeof (enc_mode_str[0 ])); ++i) { +if (mode == enc_mode_str[i].mode) { +return enc_mode_str[i].name; + } + } +return "N/A" ; +} +struct keyring_map {char name[4 ];size_t name_len;
@@ -827,6 +856,11 @@ static void do_get_policy(int argc, char **argv, const struct cmd_desc *cmd)for (j =0 ; j <F2FS_KEY_DESCRIPTOR_SIZE ; j++) {printf ("%02x" , (unsigned char ) policy.master_key_descriptor[j]); } +printf ("\tversion: %u\n" , policy.version); +printf ("\tcontents_encryption_mode : %s\n" , +get_crypt_mode (policy.contents_encryption_mode)); +printf ("\tfilenames_encryption_mode: %s\n" , +get_crypt_mode (policy.filenames_encryption_mode));fputc ('\n' , stdout); }exit (0 );
Signature · 8 lines
2.26.0.rc2.310.g2932bb562d-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
tools/f2fscrypt.c
Quoted 14 lines · Jaegeuk Kim
From: Jaegeuk Kim <[email protected]>
This patch gives more information of encryption policy.
Signed-off-by Jaegeuk Kim <[email protected]>Change-Id I04a6826aa4497554ce79d884d495b3dda1b64fac--- tools/f2fscrypt.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tools/f2fscrypt.c +0
-0
I'm a little confused why the f2fscrypt tool even exists? Who is using it? It looks like this code was all copied from e4crypt, which is no longer being maintained either as there are now better filesystem-independent tools:
- https://github.com/google/fscrypt
- https://github.com/google/fscryptctl
- https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/io/encrypt.c
Would one of those work for you instead?
tools/f2fscrypt.c line 67
Quoted 6 lines
tools/f2fscrypt.c +2
-0@@ -63,6 +63,8 @@#define F2FS_ENCRYPTION_MODE_AES_256_GCM 2#define F2FS_ENCRYPTION_MODE_AES_256_CBC 3#define F2FS_ENCRYPTION_MODE_AES_256_CTS 4 +#define F2FS_ENCRYPTION_MODE_ADIANTUM 9 +#define F2FS_ENCRYPTION_MODE_PRIVATE 127
This doesn't match the list of encryption modes from the UAPI header.
tools/f2fscrypt.c static void get_passphrase(char *passphrase, int len) · line 561
Quoted 11 lines
tools/f2fscrypt.c +11
-0+static const char *get_crypt_mode (int mode) +{ +int i; + +for (i =0 ; i < (sizeof (enc_mode_str) /sizeof (enc_mode_str[0 ])); ++i) { +if (mode == enc_mode_str[i].mode) { +return enc_mode_str[i].name; + } + } +return "N/A" ; +}
If the mode number is unrecognized, it should show the number.
- Eric
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 20 lines · Eric Biggers
tools/f2fscrypt.c
Quoted 14 lines · Jaegeuk Kim
From: Jaegeuk Kim <[email protected]>
This patch gives more information of encryption policy.
Signed-off-by Jaegeuk Kim <[email protected]>Change-Id I04a6826aa4497554ce79d884d495b3dda1b64fac--- tools/f2fscrypt.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tools/f2fscrypt.c +0
-0I'm a little confused why the f2fscrypt tool even exists? Who is using it? It looks like this code was all copied from e4crypt, which is no longer being maintained either as there are now better filesystem-independent tools:
Quoted 5 lines
- https://github.com/google/fscrypt
- https://github.com/google/fscryptctl
- https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/io/encrypt.cWould one of those work for you instead?
I'm using it occasionally in Android. I think it'd be great to add it in f2fs_io likewise xfs_io tho, it'd be also okay to add one of projects in AOSP, if you have some bandwidth. If you have any plan, I'd okay to remove f2fscrypt in f2fs-tools.
Quoted 9 lines
tools/f2fscrypt.c line 67
Quoted 7 lines
tools/f2fscrypt.c +2
-0@@ -63,6 +63,8 @@#define F2FS_ENCRYPTION_MODE_AES_256_GCM 2#define F2FS_ENCRYPTION_MODE_AES_256_CBC 3#define F2FS_ENCRYPTION_MODE_AES_256_CTS 4 +#define F2FS_ENCRYPTION_MODE_ADIANTUM 9 +#define F2FS_ENCRYPTION_MODE_PRIVATE 127This doesn't match the list of encryption modes from the UAPI header.
Will fix.
Quoted 14 lines
tools/f2fscrypt.c static void get_passphrase(char *passphrase, int len) · line 561
Quoted 12 lines
tools/f2fscrypt.c +11
-0+static const char *get_crypt_mode (int mode) +{ +int i; + +for (i =0 ; i < (sizeof (enc_mode_str) /sizeof (enc_mode_str[0 ])); ++i) { +if (mode == enc_mode_str[i].mode) { +return enc_mode_str[i].name; + } + } +return "N/A" ; +}If the mode number is unrecognized, it should show the number.
Will fix.
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 25 lines · Jaegeuk Kim
Quoted 24 lines · Eric Biggers
tools/f2fscrypt.c
Quoted 14 lines · Jaegeuk Kim
From: Jaegeuk Kim <[email protected]>
This patch gives more information of encryption policy.
Signed-off-by Jaegeuk Kim <[email protected]>Change-Id I04a6826aa4497554ce79d884d495b3dda1b64fac--- tools/f2fscrypt.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tools/f2fscrypt.c +0
-0I'm a little confused why the f2fscrypt tool even exists? Who is using it? It looks like this code was all copied from e4crypt, which is no longer being maintained either as there are now better filesystem-independent tools:
- https://github.com/google/fscrypt
- https://github.com/google/fscryptctl
- https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/io/encrypt.c
Quoted 7 lines
Quoted 1 line
Would one of those work for you instead?
I'm using it occasionally in Android. I think it'd be great to add it in
f2fs_iolikewisexfs_iotho, it'd be also okay to add one of projects in AOSP, if you have some bandwidth. If you have any plan, I'd okay to remove f2fscrypt in f2fs-tools.
Does it actually need to be part of the Android source tree, or would it suffice to build it locally?
Either way, building xfs_io for Android might be difficult, so fscryptctl might be the best option.
Note that fscryptctl doesn't yet support v2 encryption policies, but I'll probably add it eventually. I don't have any plans to update e4crypt and f2fscrypt too.
- Eric
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 28 lines · Eric Biggers
Quoted 27 lines · Jaegeuk Kim
Quoted 25 lines · Eric Biggers
tools/f2fscrypt.c
Quoted 14 lines · Jaegeuk Kim
From: Jaegeuk Kim <[email protected]>
This patch gives more information of encryption policy.
Signed-off-by Jaegeuk Kim <[email protected]>Change-Id I04a6826aa4497554ce79d884d495b3dda1b64fac--- tools/f2fscrypt.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)tools/f2fscrypt.c +0
-0I'm a little confused why the f2fscrypt tool even exists? Who is using it? It looks like this code was all copied from e4crypt, which is no longer being maintained either as there are now better filesystem-independent tools:
- https://github.com/google/fscrypt
- https://github.com/google/fscryptctl
- https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/io/encrypt.cWould one of those work for you instead?
Quoted 8 lines
Quoted 5 lines
I'm using it occasionally in Android. I think it'd be great to add it in
f2fs_iolikewisexfs_iotho, it'd be also okay to add one of projects in AOSP, if you have some bandwidth. If you have any plan, I'd okay to remove f2fscrypt in f2fs-tools.Does it actually need to be part of the Android source tree, or would it suffice to build it locally?
Well, it's upto you. I just prefer to get the binary from AOSP build simply.
Quoted 7 lines
Either way, building
xfs_iofor Android might be difficult, so fscryptctl might be the best option.Note that fscryptctl doesn't yet support v2 encryption policies, but I'll probably add it eventually. I don't have any plans to update e4crypt and f2fscrypt too.
Okay.
Quoted 2 lines
- Eric
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel