diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-09-05 12:18:29 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-09-05 12:18:29 -0700 |
| commit | bb9ae2fcb1b34c77ebf7c5b7ef5f653329f89e80 (patch) | |
| tree | 8e7ec454d58688bc2d61e04062c131ce59921459 /libfscrypt | |
| parent | 9229017530bd86e2e61395d8c84aab603db1e230 (diff) | |
| download | extras-bb9ae2fcb1b34c77ebf7c5b7ef5f653329f89e80.tar.gz | |
libfscrypt: remove some hardcoded definitions
FS_ENCRYPTION_MODE_ADIANTUM and FS_POLICY_FLAG_DIRECT_KEY are in
Bionic's <linux/fs.h> now, so there's no need to define them in
libfscrypt anymore.
Test: compiled
Change-Id: I499a70a9f8fd3445098a1dd799b1aefe0fa374ce
Diffstat (limited to 'libfscrypt')
| -rw-r--r-- | libfscrypt/fscrypt.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libfscrypt/fscrypt.cpp b/libfscrypt/fscrypt.cpp index adeb66aa..8aee1bf6 100644 --- a/libfscrypt/fscrypt.cpp +++ b/libfscrypt/fscrypt.cpp @@ -41,16 +41,6 @@ #define FS_ENCRYPTION_MODE_AES_256_HEH 126 #define FS_ENCRYPTION_MODE_PRIVATE 127 -/* new definition, not yet in Bionic's <linux/fs.h> */ -#ifndef FS_ENCRYPTION_MODE_ADIANTUM -#define FS_ENCRYPTION_MODE_ADIANTUM 9 -#endif - -/* new definition, not yet in Bionic's <linux/fs.h> */ -#ifndef FS_POLICY_FLAG_DIRECT_KEY -#define FS_POLICY_FLAG_DIRECT_KEY 0x4 -#endif - #define HEX_LOOKUP "0123456789abcdef" bool fscrypt_is_native() { |