From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 22 Sep 2020 23:14:07 +0000 (-0400)
Subject: Merge pull request #37083 from orozery/librbd-data-cryptor
X-Git-Tag: v16.1.0~1011
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3baecb86146ef6050975c945dcb54904277e704a;p=ceph-ci.git

Merge pull request #37083 from orozery/librbd-data-cryptor

librbd: add data encryptor/decryptor using openssl

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

3baecb86146ef6050975c945dcb54904277e704a
diff --cc src/librbd/CMakeLists.txt
index 735ead7896d,9a570bcfbb9..e828107ddcf
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@@ -43,10 -43,13 +43,13 @@@ set(librbd_internal_src
    cache/ObjectCacherObjectDispatch.cc
    cache/ObjectCacherWriteback.cc
    cache/PassthroughImageCache.cc
 -  cache/rwl/InitRequest.cc
 -  cache/rwl/ShutdownRequest.cc
 +  cache/pwl/InitRequest.cc
 +  cache/pwl/ShutdownRequest.cc
    cache/WriteAroundObjectDispatch.cc
+   crypto/BlockCrypto.cc
+   crypto/CryptoContextPool.cc
    crypto/CryptoObjectDispatch.cc
+   crypto/openssl/DataCryptor.cc
    deep_copy/ImageCopyRequest.cc
    deep_copy/MetadataCopyRequest.cc
    deep_copy/ObjectCopyRequest.cc