diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2010-12-13 16:53:13 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-12-15 01:44:34 -0500 |
| commit | 3b1826cebe1d534ec05417a29b9a9f82651a5cb5 (patch) | |
| tree | 38fc352e647df90c86a0b03722eff8f66b7eb607 /security/keys/encrypted_defined.h | |
| parent | 1f35065a9e2573427ce3fd6c4a40b355c2ddfb92 (diff) | |
encrypted-keys: style and other cleanup
Cleanup based on David Howells suggestions:
- use static const char arrays instead of #define
- rename init_sdesc to alloc_sdesc
- convert 'unsigned int' definitions to 'size_t'
- revert remaining 'const unsigned int' definitions to 'unsigned int'
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/encrypted_defined.h')
| -rw-r--r-- | security/keys/encrypted_defined.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/keys/encrypted_defined.h b/security/keys/encrypted_defined.h index c298a3f1cf70..cef5e2f2b7d1 100644 --- a/security/keys/encrypted_defined.h +++ b/security/keys/encrypted_defined.h | |||
| @@ -4,8 +4,7 @@ | |||
| 4 | #define ENCRYPTED_DEBUG 0 | 4 | #define ENCRYPTED_DEBUG 0 |
| 5 | 5 | ||
| 6 | #if ENCRYPTED_DEBUG | 6 | #if ENCRYPTED_DEBUG |
| 7 | static inline void dump_master_key(const u8 *master_key, | 7 | static inline void dump_master_key(const u8 *master_key, size_t master_keylen) |
| 8 | unsigned int master_keylen) | ||
| 9 | { | 8 | { |
| 10 | print_hex_dump(KERN_ERR, "master key: ", DUMP_PREFIX_NONE, 32, 1, | 9 | print_hex_dump(KERN_ERR, "master key: ", DUMP_PREFIX_NONE, 32, 1, |
| 11 | master_key, master_keylen, 0); | 10 | master_key, master_keylen, 0); |
| @@ -34,8 +33,7 @@ static inline void dump_hmac(const char *str, const u8 *digest, | |||
| 34 | hmac_size, 0); | 33 | hmac_size, 0); |
| 35 | } | 34 | } |
| 36 | #else | 35 | #else |
| 37 | static inline void dump_master_key(const u8 *master_key, | 36 | static inline void dump_master_key(const u8 *master_key, size_t master_keylen) |
| 38 | unsigned int master_keylen) | ||
| 39 | { | 37 | { |
| 40 | } | 38 | } |
| 41 | 39 | ||