From 9b7482fce950b91b12cb25fcb2ba4e2bdc816dd1 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Thu, 16 Aug 2012 16:28:24 -0700
Subject: [PATCH] auth: move Crypto{None,AES} definitions to header

CephContext will need this.

Signed-off-by: Sage Weil <sage@inktank.com>
---
 src/auth/Crypto.cc | 24 ------------------------
 src/auth/Crypto.h  | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc
index 9b5cc2aa902..0e78b8bf357 100644
--- a/src/auth/Crypto.cc
+++ b/src/auth/Crypto.cc
@@ -58,18 +58,6 @@ static int get_random_bytes(int len, bufferlist& bl)
 
 // ---------------------------------------------------
 
-class CryptoNone : public CryptoHandler {
-public:
-  CryptoNone() { }
-  ~CryptoNone() {}
-  int create(bufferptr& secret);
-  int validate_secret(bufferptr& secret);
-  void encrypt(const bufferptr& secret, const bufferlist& in,
-	      bufferlist& out, std::string &error) const;
-  void decrypt(const bufferptr& secret, const bufferlist& in,
-	      bufferlist& out, std::string &error) const;
-};
-
 int CryptoNone::
 create(bufferptr& secret)
 {
@@ -222,18 +210,6 @@ static void nss_aes_operation(CK_ATTRIBUTE_TYPE op, const bufferptr& secret,
 # error "No supported crypto implementation found."
 #endif
 
-class CryptoAES : public CryptoHandler {
-public:
-  CryptoAES() { }
-  ~CryptoAES() {}
-  int create(bufferptr& secret);
-  int validate_secret(bufferptr& secret);
-  void encrypt(const bufferptr& secret, const bufferlist& in,
-	       bufferlist& out, std::string &error) const;
-  void decrypt(const bufferptr& secret, const bufferlist& in, 
-	      bufferlist& out, std::string &error) const;
-};
-
 int CryptoAES::create(bufferptr& secret)
 {
   bufferlist bl;
diff --git a/src/auth/Crypto.h b/src/auth/Crypto.h
index 0bf0df25ab9..52fa50e37b7 100644
--- a/src/auth/Crypto.h
+++ b/src/auth/Crypto.h
@@ -115,4 +115,28 @@ extern CryptoHandler *get_crypto_handler(int type);
 extern int get_random_bytes(char *buf, int len);
 
 
+class CryptoNone : public CryptoHandler {
+public:
+  CryptoNone() { }
+  ~CryptoNone() {}
+  int create(bufferptr& secret);
+  int validate_secret(bufferptr& secret);
+  void encrypt(const bufferptr& secret, const bufferlist& in,
+	      bufferlist& out, std::string &error) const;
+  void decrypt(const bufferptr& secret, const bufferlist& in,
+	      bufferlist& out, std::string &error) const;
+};
+
+class CryptoAES : public CryptoHandler {
+public:
+  CryptoAES() { }
+  ~CryptoAES() {}
+  int create(bufferptr& secret);
+  int validate_secret(bufferptr& secret);
+  void encrypt(const bufferptr& secret, const bufferlist& in,
+	       bufferlist& out, std::string &error) const;
+  void decrypt(const bufferptr& secret, const bufferlist& in, 
+	      bufferlist& out, std::string &error) const;
+};
+
 #endif