librbd: crypto alignment support

This commit extents the recently added CryptoObjectDispatch layer to support block ciphers (as opposed to stream ciphers).
In other words, the crypto layer now handles the necessary data alignments before data is passed on to the crypto engine.

Signed-off-by: Or Ozeri <oro@il.ibm.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/librbd/crypto/BlockCrypto.cc b/src/librbd/crypto/BlockCrypto.cc
index 5bb4cfee498..a8203e13647 100644
--- a/src/librbd/crypto/BlockCrypto.cc
+++ b/src/librbd/crypto/BlockCrypto.cc
@@ -12,9 +12,10 @@ namespace crypto {
 
 template <typename T>
 BlockCrypto<T>::BlockCrypto(CephContext* cct, DataCryptor<T>* data_cryptor,
-                            uint32_t block_size)
+                            uint64_t block_size)
      : m_cct(cct), m_data_cryptor(data_cryptor), m_block_size(block_size),
        m_iv_size(data_cryptor->get_iv_size()) {
+  ceph_assert(isp2(block_size));
   ceph_assert((block_size % data_cryptor->get_block_size()) == 0);
 }