This is an automated email from the ASF dual-hosted git repository. wjones127 pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/arrow.git
from c2e8f253e6 MINOR: [Python][Docs] Fix typo (#34362) add 33ed1dbbf7 GH-25986: [C++] Enable external material and rotation for encryption keys (#34181) No new revisions were added by this update. Summary of changes: cpp/cmake_modules/DefineOptions.cmake | 5 +- cpp/src/arrow/json/object_parser.cc | 22 ++ cpp/src/arrow/json/object_parser.h | 5 + cpp/src/parquet/CMakeLists.txt | 1 + cpp/src/parquet/encryption/crypto_factory.cc | 38 ++- cpp/src/parquet/encryption/crypto_factory.h | 25 +- .../parquet/encryption/file_key_material_store.h | 42 +++- cpp/src/parquet/encryption/file_key_unwrapper.cc | 44 +++- cpp/src/parquet/encryption/file_key_unwrapper.h | 26 +- cpp/src/parquet/encryption/file_key_wrapper.cc | 29 ++- cpp/src/parquet/encryption/file_key_wrapper.h | 10 +- .../encryption/file_system_key_material_store.cc | 143 +++++++++++ .../encryption/file_system_key_material_store.h | 91 +++++++ cpp/src/parquet/encryption/key_management_test.cc | 268 +++++++++++++++++---- cpp/src/parquet/encryption/key_toolkit.cc | 71 ++++++ cpp/src/parquet/encryption/key_toolkit.h | 32 +++ cpp/src/parquet/encryption/key_toolkit_internal.h | 15 -- cpp/src/parquet/encryption/key_wrapping_test.cc | 83 ++++--- cpp/src/parquet/encryption/test_encryption_util.h | 11 +- cpp/src/parquet/encryption/test_in_memory_kms.cc | 32 ++- cpp/src/parquet/encryption/test_in_memory_kms.h | 9 +- .../encryption/write_configurations_test.cc | 4 +- cpp/submodules/parquet-testing | 2 +- 23 files changed, 855 insertions(+), 153 deletions(-) create mode 100644 cpp/src/parquet/encryption/file_system_key_material_store.cc create mode 100644 cpp/src/parquet/encryption/file_system_key_material_store.h