]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #37083 from orozery/librbd-data-cryptor
authorJason Dillaman <dillaman@redhat.com>
Tue, 22 Sep 2020 23:14:07 +0000 (19:14 -0400)
committerGitHub <noreply@github.com>
Tue, 22 Sep 2020 23:14:07 +0000 (19:14 -0400)
librbd: add data encryptor/decryptor using openssl

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
src/librbd/CMakeLists.txt
src/librbd/crypto/CryptoObjectDispatch.cc
src/test/librbd/CMakeLists.txt

index 735ead7896da1af13b391399f62628bbfa7883d7,9a570bcfbb9a677b5dd4f4c7b6f11f014f9227b7..e828107ddcff9b4076c832cebdc11f6635dd3ac7
@@@ -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
Simple merge