Skip to content

Commit 3e67123

Browse files
lriggslriggs
committed
Run clang-format
1 parent 8b8c48a commit 3e67123

5 files changed

+53
-42
lines changed

‎cpp/src/gandiva/encrypt_utils.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace gandiva {
2424
GANDIVA_EXPORT
25-
int32_t aes_encrypt(const char* plaintext, int32_t plaintext_len, const char* key,
25+
int32_t aes_encrypt(const char* plaintext, int32_t plaintext_len, const char* key,
2626
int32_t key_len, unsigned char* cipher) {
2727
int32_t cipher_len = 0;
2828
int32_t len = 0;
@@ -57,7 +57,7 @@ int32_t aes_encrypt(const char* plaintext, int32_t plaintext_len, const char* ke
5757
}
5858

5959
GANDIVA_EXPORT
60-
int32_t aes_decrypt(const char* ciphertext, int32_t ciphertext_len, const char* key,
60+
int32_t aes_decrypt(const char* ciphertext, int32_t ciphertext_len, const char* key,
6161
int32_t key_len, unsigned char* plaintext) {
6262
int32_t plaintext_len = 0;
6363
int32_t len = 0;
@@ -91,7 +91,7 @@ int32_t aes_decrypt(const char* ciphertext, int32_t ciphertext_len, const char*
9191
return plaintext_len;
9292
}
9393

94-
const EVP_CIPHER* get_cipher_algo(int32_t key_length){
94+
const EVP_CIPHER* get_cipher_algo(int32_t key_length) {
9595
switch (key_length) {
9696
case 16:
9797
return EVP_aes_128_ecb();

‎cpp/src/gandiva/encrypt_utils_test.cc

+18-16
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) {
2929
static_cast<int32_t>(strlen(reinterpret_cast<const char*>(to_encrypt)));
3030
unsigned char cipher_1[64];
3131

32-
int32_t cipher_1_len = gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_1);
32+
int32_t cipher_1_len =
33+
gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_1);
3334

3435
unsigned char decrypted_1[64];
3536
int32_t decrypted_1_len = gandiva::aes_decrypt(reinterpret_cast<const char*>(cipher_1),
@@ -47,7 +48,8 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) {
4748
static_cast<int32_t>(strlen(reinterpret_cast<const char*>(to_encrypt)));
4849
unsigned char cipher_2[64];
4950

50-
int32_t cipher_2_len = gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_2);
51+
int32_t cipher_2_len =
52+
gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_2);
5153

5254
unsigned char decrypted_2[64];
5355
int32_t decrypted_2_len = gandiva::aes_decrypt(reinterpret_cast<const char*>(cipher_2),
@@ -65,7 +67,8 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) {
6567
static_cast<int32_t>(strlen(reinterpret_cast<const char*>(to_encrypt)));
6668
unsigned char cipher_3[64];
6769

68-
int32_t cipher_3_len = gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_3);
70+
int32_t cipher_3_len =
71+
gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_3);
6972

7073
unsigned char decrypted_3[64];
7174
int32_t decrypted_3_len = gandiva::aes_decrypt(reinterpret_cast<const char*>(cipher_3),
@@ -76,7 +79,8 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) {
7679

7780
// check exception
7881
char cipher[64] = "JBB7oJAQuqhDCx01fvBRi8PcljW1+nbnOSMk+R0Sz7E==";
79-
int32_t cipher_len = static_cast<int32_t>(strlen(reinterpret_cast<const char*>(cipher)));
82+
int32_t cipher_len =
83+
static_cast<int32_t>(strlen(reinterpret_cast<const char*>(cipher)));
8084
unsigned char plain_text[64];
8185

8286
key = "12345678abcdefgh12345678abcdefgh12345678abcdefgh12345678abcdefgh";
@@ -86,13 +90,12 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) {
8690
to_encrypt_len =
8791
static_cast<int32_t>(strlen(reinterpret_cast<const char*>(to_encrypt)));
8892
unsigned char cipher_4[64];
89-
ASSERT_THROW({
90-
gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_4);
91-
}, std::runtime_error);
93+
ASSERT_THROW(
94+
{ gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_4); },
95+
std::runtime_error);
9296

93-
ASSERT_THROW({
94-
gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text);
95-
}, std::runtime_error);
97+
ASSERT_THROW({ gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text); },
98+
std::runtime_error);
9699

97100
key = "12345678";
98101
to_encrypt = "New\ntest\nstring";
@@ -101,10 +104,9 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) {
101104
to_encrypt_len =
102105
static_cast<int32_t>(strlen(reinterpret_cast<const char*>(to_encrypt)));
103106
unsigned char cipher_5[64];
104-
ASSERT_THROW({
105-
gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_5);
106-
}, std::runtime_error);
107-
ASSERT_THROW({
108-
gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text);
109-
}, std::runtime_error);
107+
ASSERT_THROW(
108+
{ gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_5); },
109+
std::runtime_error);
110+
ASSERT_THROW({ gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text); },
111+
std::runtime_error);
110112
}

‎cpp/src/gandiva/gdv_function_stubs.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,15 @@ const char* gdv_fn_aes_encrypt(int64_t context, const char* data, int32_t data_l
324324
*out_len = 0;
325325
return nullptr;
326326
}
327-
327+
328328
*out_len =
329329
static_cast<int32_t>(arrow::bit_util::RoundUpToPowerOf2(data_len, kAesBlockSize));
330330
char* ret = reinterpret_cast<char*>(gdv_fn_context_arena_malloc(context, *out_len));
331331
if (ret == nullptr) {
332332
std::string err_msg =
333333
"Could not allocate memory for returning aes encrypt cypher text";
334334
gdv_fn_context_set_error_msg(context, err_msg.data());
335-
*out_len = 0;
335+
*out_len = 0;
336336
return nullptr;
337337
}
338338

@@ -341,7 +341,7 @@ const char* gdv_fn_aes_encrypt(int64_t context, const char* data, int32_t data_l
341341
reinterpret_cast<unsigned char*>(ret));
342342
} catch (const std::runtime_error& e) {
343343
gdv_fn_context_set_error_msg(context, e.what());
344-
*out_len = 0;
344+
*out_len = 0;
345345
return nullptr;
346346
}
347347

@@ -374,7 +374,7 @@ const char* gdv_fn_aes_decrypt(int64_t context, const char* data, int32_t data_l
374374
std::string err_msg =
375375
"Could not allocate memory for returning aes encrypt cypher text";
376376
gdv_fn_context_set_error_msg(context, err_msg.data());
377-
*out_len = 0;
377+
*out_len = 0;
378378
return nullptr;
379379
}
380380

@@ -383,7 +383,7 @@ const char* gdv_fn_aes_decrypt(int64_t context, const char* data, int32_t data_l
383383
reinterpret_cast<unsigned char*>(ret));
384384
} catch (const std::runtime_error& e) {
385385
gdv_fn_context_set_error_msg(context, e.what());
386-
*out_len = 0;
386+
*out_len = 0;
387387
return nullptr;
388388
}
389389
ret[*out_len] = '\0';

‎cpp/src/gandiva/gdv_function_stubs_test.cc

+24-14
Original file line numberDiff line numberDiff line change
@@ -1355,10 +1355,13 @@ TEST(TestGdvFnStubs, TestAesEncryptDecrypt16) {
13551355
auto data_len = static_cast<int32_t>(data.length());
13561356
int64_t ctx_ptr = reinterpret_cast<int64_t>(&ctx);
13571357

1358-
const char* cipher = gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key16.c_str(), key16_len, &cipher_len);
1359-
const char* decrypted_value = gdv_fn_aes_decrypt(ctx_ptr, cipher, cipher_len, key16.c_str(), key16_len, &decrypted_len);
1358+
const char* cipher = gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key16.c_str(),
1359+
key16_len, &cipher_len);
1360+
const char* decrypted_value = gdv_fn_aes_decrypt(
1361+
ctx_ptr, cipher, cipher_len, key16.c_str(), key16_len, &decrypted_len);
13601362

1361-
EXPECT_EQ(data, std::string(reinterpret_cast<const char*>(decrypted_value), decrypted_len));
1363+
EXPECT_EQ(data,
1364+
std::string(reinterpret_cast<const char*>(decrypted_value), decrypted_len));
13621365
}
13631366

13641367
TEST(TestGdvFnStubs, TestAesEncryptDecrypt24) {
@@ -1371,11 +1374,14 @@ TEST(TestGdvFnStubs, TestAesEncryptDecrypt24) {
13711374
auto data_len = static_cast<int32_t>(data.length());
13721375
int64_t ctx_ptr = reinterpret_cast<int64_t>(&ctx);
13731376

1374-
const char* cipher = gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key24.c_str(), key24_len, &cipher_len);
1377+
const char* cipher = gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key24.c_str(),
1378+
key24_len, &cipher_len);
13751379

1376-
const char* decrypted_value = gdv_fn_aes_decrypt(ctx_ptr, cipher, cipher_len, key24.c_str(), key24_len, &decrypted_len);
1380+
const char* decrypted_value = gdv_fn_aes_decrypt(
1381+
ctx_ptr, cipher, cipher_len, key24.c_str(), key24_len, &decrypted_len);
13771382

1378-
EXPECT_EQ(data, std::string(reinterpret_cast<const char*>(decrypted_value), decrypted_len));
1383+
EXPECT_EQ(data,
1384+
std::string(reinterpret_cast<const char*>(decrypted_value), decrypted_len));
13791385
}
13801386

13811387
TEST(TestGdvFnStubs, TestAesEncryptDecrypt32) {
@@ -1388,11 +1394,14 @@ TEST(TestGdvFnStubs, TestAesEncryptDecrypt32) {
13881394
auto data_len = static_cast<int32_t>(data.length());
13891395
int64_t ctx_ptr = reinterpret_cast<int64_t>(&ctx);
13901396

1391-
const char* cipher = gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key32.c_str(), key32_len, &cipher_len);
1397+
const char* cipher = gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key32.c_str(),
1398+
key32_len, &cipher_len);
13921399

1393-
const char* decrypted_value = gdv_fn_aes_decrypt(ctx_ptr, cipher, cipher_len, key32.c_str(), key32_len, &decrypted_len);
1400+
const char* decrypted_value = gdv_fn_aes_decrypt(
1401+
ctx_ptr, cipher, cipher_len, key32.c_str(), key32_len, &decrypted_len);
13941402

1395-
EXPECT_EQ(data, std::string(reinterpret_cast<const char*>(decrypted_value), decrypted_len));
1403+
EXPECT_EQ(data,
1404+
std::string(reinterpret_cast<const char*>(decrypted_value), decrypted_len));
13961405
}
13971406

13981407
TEST(TestGdvFnStubs, TestAesEncryptDecryptValidation) {
@@ -1406,13 +1415,14 @@ TEST(TestGdvFnStubs, TestAesEncryptDecryptValidation) {
14061415
std::string cipher = "12345678abcdefgh12345678abcdefghb";
14071416
auto cipher_len = static_cast<int32_t>(cipher.length());
14081417

1409-
gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key33.c_str(), key33_len, &cipher_len);
1410-
EXPECT_THAT(ctx.get_error(),
1411-
::testing::HasSubstr("invalid key length"));
1418+
gdv_fn_aes_encrypt(ctx_ptr, data.c_str(), data_len, key33.c_str(), key33_len,
1419+
&cipher_len);
1420+
EXPECT_THAT(ctx.get_error(), ::testing::HasSubstr("invalid key length"));
14121421
ctx.Reset();
14131422

1414-
gdv_fn_aes_decrypt(ctx_ptr, cipher.c_str(), cipher_len, key33.c_str(), key33_len, &decrypted_len); EXPECT_THAT(ctx.get_error(),
1415-
::testing::HasSubstr("invalid key length"));
1423+
gdv_fn_aes_decrypt(ctx_ptr, cipher.c_str(), cipher_len, key33.c_str(), key33_len,
1424+
&decrypted_len);
1425+
EXPECT_THAT(ctx.get_error(), ::testing::HasSubstr("invalid key length"));
14161426
ctx.Reset();
14171427
}
14181428
} // namespace gandiva

‎cpp/src/gandiva/tests/projector_test.cc

+3-4
Original file line numberDiff line numberDiff line change
@@ -2823,11 +2823,10 @@ TEST_F(TestProjector, TestAesEncryptDecrypt) {
28232823
const char* key_24_bytes = "12345678abcdefgh12345678";
28242824
const char* key_32_bytes = "12345678abcdefgh12345678abcdefgh";
28252825

2826-
auto array_data = MakeArrowArrayUtf8({"abc", "some words", "to be encrypted"},
2827-
{true, true, true});
2826+
auto array_data =
2827+
MakeArrowArrayUtf8({"abc", "some words", "to be encrypted"}, {true, true, true});
28282828
auto array_key =
2829-
MakeArrowArrayUtf8({key_16_bytes, key_24_bytes, key_32_bytes},
2830-
{true, true, true});
2829+
MakeArrowArrayUtf8({key_16_bytes, key_24_bytes, key_32_bytes}, {true, true, true});
28312830

28322831
auto array_holder_en = MakeArrowArrayUtf8({"", "", ""}, {true, true, true});
28332832

0 commit comments

Comments
 (0)