Skip to content

Refactor aes encryptor #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofia-tekdatum merged 2 commits into from
Aug 21, 2025
Merged

Refactor aes encryptor #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3b5514
Starting rename work
sofia-tekdatum Aug 20, 2025
f89f2a6
Renaming encryption_internal to aes_encryption
sofia-tekdatum Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cpp/src/parquet/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ endif()

if(PARQUET_REQUIRE_ENCRYPTION)
list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS ${ARROW_OPENSSL_LIBS})
set(PARQUET_SRCS ${PARQUET_SRCS} encryption/encryption_internal.cc
set(PARQUET_SRCS ${PARQUET_SRCS} encryption/aes_encryption.cc
encryption/encryption_utils.cc
encryption/openssl_internal.cc)
# Encryption key management
Expand All @@ -255,7 +255,7 @@ if(PARQUET_REQUIRE_ENCRYPTION)
encryption/key_toolkit_internal.cc
encryption/local_wrap_kms_client.cc)
else()
set(PARQUET_SRCS ${PARQUET_SRCS} encryption/encryption_internal_nossl.cc)
set(PARQUET_SRCS ${PARQUET_SRCS} encryption/aes_encryption_nossl.cc)
endif()

if(NOT PARQUET_MINIMAL_DEPENDENCY)
Expand Down Expand Up @@ -410,7 +410,7 @@ add_parquet_test(arrow-internals-test SOURCES arrow/path_internal_test.cc
if(PARQUET_REQUIRE_ENCRYPTION)
add_parquet_test(encryption-test
SOURCES
encryption/encryption_internal_test.cc
encryption/aes_encryption_test.cc
encryption/write_configurations_test.cc
encryption/read_configurations_test.cc
encryption/properties_test.cc
Expand Down
2 changes: 1 addition & 1 deletion ...parquet/encryption/encryption_internal.cc → cpp/src/parquet/encryption/aes_encryption.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "parquet/encryption/encryption_internal.h"
#include "parquet/encryption/aes_encryption.h"

#include <openssl/evp.h>
#include <openssl/rand.h>
Expand Down
3 changes: 0 additions & 3 deletions .../parquet/encryption/encryption_internal.h → cpp/src/parquet/encryption/aes_encryption.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@
#pragma once

#include <memory>
#include <string>
#include <vector>

#include "arrow/util/span.h"
#include "parquet/properties.h"
#include "parquet/types.h"

using parquet::ParquetCipher;
Expand Down
2 changes: 1 addition & 1 deletion ...t/encryption/encryption_internal_nossl.cc → ...arquet/encryption/aes_encryption_nossl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "parquet/encryption/encryption_internal.h"
#include "parquet/encryption/aes_encryption.h"
#include "parquet/exception.h"

namespace parquet::encryption {
Expand Down
3 changes: 2 additions & 1 deletion ...et/encryption/encryption_internal_test.cc → ...parquet/encryption/aes_encryption_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

#include <gtest/gtest.h>

#include "parquet/encryption/encryption_internal.h"
#include "parquet/encryption/aes_encryption.h"
#include "parquet/encryption/encryption.h"

namespace parquet::encryption::test {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/encryption/internal_file_decryptor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include "parquet/encryption/internal_file_decryptor.h"

#include "arrow/util/logging.h"
#include "parquet/encryption/aes_encryption.h"
#include "parquet/encryption/encryption.h"
#include "parquet/encryption/encryption_internal.h"
#include "parquet/encryption/encryption_utils.h"
#include "parquet/metadata.h"

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/parquet/encryption/internal_file_encryptor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
// under the License.

#include "parquet/encryption/internal_file_encryptor.h"

#include "parquet/encryption/aes_encryption.h"
#include "parquet/encryption/encryption.h"
#include "parquet/encryption/encryption_internal.h"
#include "parquet/encryption/encryption_utils.h"

namespace parquet {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/encryption/internal_file_encryptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <memory>
#include <string>

#include "parquet/encryption/aes_encryption.h"
#include "parquet/encryption/encryption.h"
#include "parquet/encryption/encryption_internal.h"
#include "parquet/metadata.h"

namespace parquet {
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/parquet/encryption/key_toolkit_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

#include "arrow/util/base64.h"

#include "parquet/encryption/encryption_internal.h"
#include "parquet/encryption/encryption.h"
#include "parquet/encryption/aes_encryption.h"
#include "parquet/encryption/key_toolkit_internal.h"

namespace parquet::encryption::internal {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/metadata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "arrow/util/key_value_metadata.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/pcg_random.h"
#include "parquet/encryption/encryption_internal.h"
#include "parquet/encryption/aes_encryption.h"
#include "parquet/encryption/encryption_utils.h"
#include "parquet/encryption/internal_file_decryptor.h"
#include "parquet/exception.h"
Expand Down
Loading