aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-08-02 18:48:23 -0400
committerSage Weil <sage@newdream.net>2010-08-02 18:48:31 -0400
commitcbbfe499055f49c09210e04d9f88c2f483052384 (patch)
tree055a42f950c68b6ecd47f61a80fa15e813fdb381
parent73a7e693f9da464b0df07643af3f8ffc04dcc0b5 (diff)
ceph: move AES iv definition to shared header
Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/ceph_fs.h2
-rw-r--r--fs/ceph/crypto.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/ceph_fs.h b/fs/ceph/ceph_fs.h
index bf7dea673237..5bf4ec2cf9eb 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);
74#define CEPH_CRYPTO_NONE 0x0 74#define CEPH_CRYPTO_NONE 0x0
75#define CEPH_CRYPTO_AES 0x1 75#define CEPH_CRYPTO_AES 0x1
76 76
77#define CEPH_AES_IV "cephsageyudagreg"
78
77/* security/authentication protocols */ 79/* security/authentication protocols */
78#define CEPH_AUTH_UNKNOWN 0x0 80#define CEPH_AUTH_UNKNOWN 0x0
79#define CEPH_AUTH_NONE 0x1 81#define CEPH_AUTH_NONE 0x1
diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
index c9318278f419..a3e627f63293 100644
--- a/fs/ceph/crypto.c
+++ b/fs/ceph/crypto.c
@@ -75,7 +75,7 @@ static struct crypto_blkcipher *ceph_crypto_alloc_cipher(void)
75 return crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC); 75 return crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);
76} 76}
77 77
78static const u8 *aes_iv = "cephsageyudagreg"; 78static const u8 *aes_iv = (u8 *)CEPH_AES_IV;
79 79
80static int ceph_aes_encrypt(const void *key, int key_len, 80static int ceph_aes_encrypt(const void *key, int key_len,
81 void *dst, size_t *dst_len, 81 void *dst, size_t *dst_len,