---

yaml --- r: 208853 b: refs/heads/master c: cbbfe49 h: refs/heads/master i: 208851: 5f8df2d v: v3
git-mirror · Aug 2, 2010 · 6c4e66a · 6c4e66a
1 parent 5843acd
commit 6c4e66a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73a7e693f9da464b0df07643af3f8ffc04dcc0b5
+refs/heads/master: cbbfe499055f49c09210e04d9f88c2f483052384
diff --git a/trunk/fs/ceph/ceph_fs.h b/trunk/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/trunk/fs/ceph/crypto.c b/trunk/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,