From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 22 Nov 2019 17:39:58 +0000 (+0100)
Subject: common/options: remove unused ms_msgr2_{sign,encrypt}_messages
X-Git-Tag: v14.2.8~20^2~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6856f696d0717bf9066f402baf694b254b9a3ce1;p=ceph.git

common/options: remove unused ms_msgr2_{sign,encrypt}_messages

These are unused since 1d29722f801c ("switch monc, daemons to use new
msgr2 auth frame exchange").  As they default to false, a confused user
might flip them to true and think that their client <-> OSD traffic is
encrypted.

The new set of options was added in c7ee66c3e54b
("auth,msg/async/ProtocolV2: negotiate connection modes").

Fixes: https://tracker.ceph.com/issues/42976
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 976d318b4892fb1ed5e5f8abaa94b4deef9b0ac8)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index cc10924dc511..32f3db9761ab 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1013,16 +1013,6 @@ std::vector<Option> get_global_options() {
     .set_default(100_M)
     .set_description("Limit messages that are read off the network but still being processed"),
 
-    Option("ms_msgr2_sign_messages", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(false)
-    .set_description("Sign msgr2 frames' payload")
-    .add_see_also("ms_msgr2_encrypt_messages"),
-
-    Option("ms_msgr2_encrypt_messages", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(false)
-    .set_description("Encrypt msgr2 frames' payload")
-    .add_see_also("ms_msgr2_sign_messages"),
-
     Option("ms_bind_ipv4", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .set_description("Bind servers to IPv4 address(es)")