WIP

Author: timhurskidremio

cpp/src/gandiva/encrypt_mode_dispatcher.cc

@@ -25,13 +25,13 @@
 
 namespace gandiva {
 
-int32_t EncryptModeDispatcher::encrypt(const char* plaintext, int32_t plaintext_len,
-                                       const char* key, int32_t key_len,
-                                       const char* mode, int32_t mode_len,
-                                       const char* iv, int32_t iv_len,
-                                       const char* fifth_argument, int32_t fifth_argument_len,
-                                       unsigned char* cipher) {
-  std::string mode_str = arrow::AsciiToUpper(std::string_view(mode, mode_len));
+int32_t EncryptModeDispatcher::encrypt(
+    const char* plaintext, int32_t plaintext_len, const char* key,
+    int32_t key_len, const char* mode, int32_t mode_len, const char* iv,
+    int32_t iv_len, const char* fifth_argument, int32_t fifth_argument_len,
+    unsigned char* cipher) {
+  std::string mode_str =
+      arrow::internal::AsciiToUpper(std::string_view(mode, mode_len));
 
   if (mode_str == "AES-ECB") {
     return aes_encrypt_ecb(plaintext, plaintext_len, key, key_len, cipher);
@@ -46,18 +46,18 @@ int32_t EncryptModeDispatcher::encrypt(const char* plaintext, int32_t plaintext_
   } else {
     std::ostringstream oss;
     oss << "Unsupported encryption mode: " << mode_str
-        << ". Supported modes: AES-ECB, AES-CBC-PKCS7, AES-CBC-NONE (AES-GCM coming soon)";
+        << ". Supported modes: AES-ECB, AES-CBC-PKCS7, AES-CBC-NONE";
     throw std::runtime_error(oss.str());
   }
 }
 
-int32_t EncryptModeDispatcher::decrypt(const char* ciphertext, int32_t ciphertext_len,
-                                       const char* key, int32_t key_len,
-                                       const char* mode, int32_t mode_len,
-                                       const char* iv, int32_t iv_len,
-                                       const char* fifth_argument, int32_t fifth_argument_len,
-                                       unsigned char* plaintext) {
-  std::string mode_str = arrow::AsciiToUpper(std::string_view(mode, mode_len));
+int32_t EncryptModeDispatcher::decrypt(
+    const char* ciphertext, int32_t ciphertext_len, const char* key,
+    int32_t key_len, const char* mode, int32_t mode_len, const char* iv,
+    int32_t iv_len, const char* fifth_argument, int32_t fifth_argument_len,
+    unsigned char* plaintext) {
+  std::string mode_str =
+      arrow::internal::AsciiToUpper(std::string_view(mode, mode_len));
 
   if (mode_str == "AES-ECB") {
     return aes_decrypt_ecb(ciphertext, ciphertext_len, key, key_len, plaintext);
@@ -72,7 +72,7 @@ int32_t EncryptModeDispatcher::decrypt(const char* ciphertext, int32_t ciphertex
   } else {
     std::ostringstream oss;
     oss << "Unsupported decryption mode: " << mode_str
-        << ". Supported modes: AES-ECB, AES-CBC-PKCS7, AES-CBC-NONE (AES-GCM coming soon)";
+        << ". Supported modes: AES-ECB, AES-CBC-PKCS7, AES-CBC-NONE";
     throw std::runtime_error(oss.str());
   }
 }

cpp/src/gandiva/function_registry_string.cc

@@ -504,7 +504,6 @@ std::vector<NativeFunction> GetStringFunctionRegistry() {
                      kResultNullIfNull, "gdv_fn_aes_decrypt_ecb_legacy",
                      NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
 
-      // Signature 1: (VARBINARY, VARBINARY, UTF8) -> VARBINARY
       // Parameters: data, key, mode (e.g. ECB mode)
       NativeFunction("aes_encrypt", {}, DataTypeVector{binary(), binary(), utf8()}, binary(),
                      kResultNullIfNull, "gdv_fn_aes_encrypt_dispatcher_3args",
@@ -514,7 +513,6 @@ std::vector<NativeFunction> GetStringFunctionRegistry() {
                      kResultNullIfNull, "gdv_fn_aes_decrypt_dispatcher_3args",
                      NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
 
-      // Signature 2: (VARBINARY, VARBINARY, UTF8, VARBINARY) -> VARBINARY
       // Parameters: data, key, mode, iv (e.g. CBC mode)
       NativeFunction("aes_encrypt", {}, DataTypeVector{binary(), binary(), utf8(), binary()}, binary(),
                      kResultNullIfNull, "gdv_fn_aes_encrypt_dispatcher_4args",
@@ -524,7 +522,6 @@ std::vector<NativeFunction> GetStringFunctionRegistry() {
                      kResultNullIfNull, "gdv_fn_aes_decrypt_dispatcher_4args",
                      NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
 
-      // Signature 3: (VARBINARY, VARBINARY, UTF8, VARBINARY, VARBINARY) -> VARBINARY
       // Parameters: data, key, mode, iv, fifth_argument (e.g. GCM mode)
       NativeFunction("aes_encrypt", {}, DataTypeVector{binary(), binary(), utf8(), binary(), binary()}, binary(),
                      kResultNullIfNull, "gdv_fn_aes_encrypt_dispatcher_5args",