From: Sage Weil <sage@newdream.net>
Date: Fri, 30 Jul 2010 17:24:45 +0000 (-0700)
Subject: auth: define AES iv in common header
X-Git-Tag: v0.22~359
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b8fd7e9c22153024b1ce1438b8737b37df6f3aa;p=ceph.git

auth: define AES iv in common header

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

diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc
index bca39bfa6d2e..102c8d234c02 100644
--- a/src/auth/Crypto.cc
+++ b/src/auth/Crypto.cc
@@ -107,7 +107,7 @@ public:
   int decrypt(bufferptr& secret, const bufferlist& in, bufferlist& out);
 };
 
-static const unsigned char *aes_iv = (const unsigned char *)"cephsageyudagreg";
+static const unsigned char *aes_iv = CEPH_AES_IV;
 
 int CryptoAES::create(bufferptr& secret)
 {
diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 70a451ccbc9f..9247c238c252 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -76,6 +76,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