From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 22 Jan 2019 20:37:49 +0000 (+0100)
Subject: auth: drop {en,de}crypt_message() from AuthSessionHandler.
X-Git-Tag: v14.1.1~157^2~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fc0b2036d224b4f82ded40f97174869c48d1193;p=ceph.git

auth: drop {en,de}crypt_message() from AuthSessionHandler.

Yeah, this means wire encryption isn't supposed for V1 anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/auth/AuthSessionHandler.h b/src/auth/AuthSessionHandler.h
index a2e688ffe8c..abc733cace1 100644
--- a/src/auth/AuthSessionHandler.h
+++ b/src/auth/AuthSessionHandler.h
@@ -30,8 +30,6 @@ struct AuthSessionHandler {
   virtual ~AuthSessionHandler() = default;
   virtual int sign_message(Message *message) = 0;
   virtual int check_message_signature(Message *message) = 0;
-  virtual int encrypt_message(Message *message) = 0;
-  virtual int decrypt_message(Message *message) = 0;
 
   virtual int encrypt_bufferlist(bufferlist &in, bufferlist &out) {
     return 0;
@@ -48,12 +46,6 @@ struct DummyAuthSessionHandler : AuthSessionHandler {
   int check_message_signature(Message*) final {
     return 0;
   }
-  int encrypt_message(Message*) final {
-    return 0;
-  }
-  int decrypt_message(Message*) final {
-    return 0;
-  }
 };
 
 extern AuthSessionHandler *get_auth_session_handler(
diff --git a/src/auth/cephx/CephxSessionHandler.h b/src/auth/cephx/CephxSessionHandler.h
index 03a6ef50c89..92a8f7fa968 100644
--- a/src/auth/cephx/CephxSessionHandler.h
+++ b/src/auth/cephx/CephxSessionHandler.h
@@ -46,16 +46,5 @@ public:
 
   int encrypt_bufferlist(bufferlist &in, bufferlist &out) override;
   int decrypt_bufferlist(bufferlist &in, bufferlist &out) override;
-
-  // Cephx does not currently encrypt messages, so just return 0 if called.  PLR
-
-  int encrypt_message(Message *m) override {
-    return 0;
-  }
-
-  int decrypt_message(Message *m) override {
-    return 0;
-  }
-
 };