From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 20 Feb 2019 01:24:24 +0000 (+0100)
Subject: msg/async, v2: get rid of magic number in SignedEncryptedFrame.
X-Git-Tag: v14.1.1~157^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50b51746370001b80588e90ee22df5eb417ed63e;p=ceph.git

msg/async, v2: get rid of magic number in SignedEncryptedFrame.

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

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index ae373436bb9f..b3f47d2d39d1 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -385,7 +385,8 @@ struct SignedEncryptedFrame : public PayloadFrame<T, Args...> {
     ceph::bufferlist plain_bl = \
       protocol.session_stream_handlers.rx->authenticated_decrypt_update_final(
         std::move(bl), ProtocolV2::segment_t::DEFAULT_ALIGNMENT);
-    ceph_assert(plain_bl.length() + 16 == length);
+    ceph_assert(plain_bl.length() == length - \
+       protocol.session_stream_handlers.rx->get_extra_size_at_final());
     this->decode_frame(plain_bl.c_str(), plain_bl.length());
   }
 };