diff options
| author | Sage Weil <sage@newdream.net> | 2010-08-02 15:48:23 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-08-02 15:48:31 -0700 |
| commit | cbbfe499055f49c09210e04d9f88c2f483052384 (patch) | |
| tree | 055a42f950c68b6ecd47f61a80fa15e813fdb381 | |
| parent | 73a7e693f9da464b0df07643af3f8ffc04dcc0b5 (diff) | |
| download | kernel_goldelico_gta04-cbbfe499055f49c09210e04d9f88c2f483052384.zip kernel_goldelico_gta04-cbbfe499055f49c09210e04d9f88c2f483052384.tar.gz kernel_goldelico_gta04-cbbfe499055f49c09210e04d9f88c2f483052384.tar.bz2 | |
ceph: move AES iv definition to shared header
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/ceph_fs.h | 2 | ||||
| -rw-r--r-- | fs/ceph/crypto.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/ceph_fs.h b/fs/ceph/ceph_fs.h index bf7dea6..5bf4ec2 100644 --- a/fs/ceph/ceph_fs.h +++ b/fs/ceph/ceph_fs.h @@ -74,6 +74,8 @@ int ceph_file_layout_is_valid(const struct ceph_file_layout *layout); #define CEPH_CRYPTO_NONE 0x0 #define CEPH_CRYPTO_AES 0x1 +#define CEPH_AES_IV "cephsageyudagreg" + /* security/authentication protocols */ #define CEPH_AUTH_UNKNOWN 0x0 #define CEPH_AUTH_NONE 0x1 diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c index c931827..a3e627f 100644 --- a/fs/ceph/crypto.c +++ b/fs/ceph/crypto.c @@ -75,7 +75,7 @@ static struct crypto_blkcipher *ceph_crypto_alloc_cipher(void) return crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC); } -static const u8 *aes_iv = "cephsageyudagreg"; +static const u8 *aes_iv = (u8 *)CEPH_AES_IV; static int ceph_aes_encrypt(const void *key, int key_len, void *dst, size_t *dst_len, |