From: Sage Weil <sage@newdream.net>
Date: Mon, 2 Aug 2010 22:48:23 +0000 (-0700)
Subject: ceph: move AES iv definition to shared header
X-Git-Tag: v2.6.36-rc1~99^2~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cbbfe499055f49c09210e04d9f88c2f483052384;p=linux.git

ceph: move AES iv definition to shared header

Signed-off-by: Sage Weil <sage@newdream.net>
---

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);
 #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 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)
 	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,