crimson: fix build

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index c139adba7a7f442ff3c50aa77d96f4e5a6054282..0ce65a5cfc79a58db5844fd7464d5fe8869e8b75 100644 (file)
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -169,7 +169,9 @@ seastar::future<bool> Connection::do_auth()
                    conn->get_peer_addr(), *m, m->result);
     reply = decltype(reply){};
     auto p = m->result_bl.cbegin();
-    auto ret = auth->handle_response(m->result, p);
+    auto ret = auth->handle_response(m->result, p,
+#warning fix crimson: session_key, connection_secret
+                                    nullptr, nullptr);
     if (ret != 0 && ret != -EAGAIN) {
       throw std::system_error(make_error_code(
         ceph::net::error::negotiation_failure));
@@ -193,7 +195,9 @@ Connection::authenticate(epoch_t epoch,
     auth = create_auth(m, name, want_keys);
     global_id = m->global_id;
     switch (auto p = m->result_bl.cbegin();
-            auth->handle_response(m->result, p)) {
+            auth->handle_response(m->result, p,
+#warning fix crimson: session_key, connection_secret
+                                 nullptr, nullptr)) {
     case 0:
       // none
       return seastar::now();

diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc
index 4492f9639acff3c51d90f5f5272d2294836680d0..d58b2c94e6d8065a853a9eeac57fc0e260525785 100644 (file)
--- a/src/test/crimson/test_alien_echo.cc
+++ b/src/test/crimson/test_alien_echo.cc
@@ -29,10 +29,10 @@ struct DummyAuthAuthorizer : public AuthAuthorizer {
     : AuthAuthorizer(CEPH_AUTH_CEPHX)
   {}
   bool verify_reply(bufferlist::const_iterator&,
-                    CryptoKey *connection_secret) override {
+                    std::string *connection_secret) override {
     return true;
   }
-  bool add_challenge(CephContext*, bufferlist&) override {
+  bool add_challenge(CephContext*, const bufferlist&) override {
     return true;
   }
 };