Revert "MDEV-25343 add read secret size in file key plugin"

This reverts commit cee7175.
MariaDB · Oct 19, 2022 · 3a62ff7 · 3a62ff7
1 parent cee7175
commit 3a62ff7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 33 deletions.
diff --git a/mysql-test/suite/encryption/r/filekeys_secret_too_long.result b/mysql-test/suite/encryption/r/filekeys_secret_too_long.result
diff --git a/mysql-test/suite/encryption/t/filekeys-data-too-long.key b/mysql-test/suite/encryption/t/filekeys-data-too-long.key
diff --git a/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt b/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
diff --git a/mysql-test/suite/encryption/t/filekeys_secret_too_long.test b/mysql-test/suite/encryption/t/filekeys_secret_too_long.test
diff --git a/plugin/file_key_management/parser.cc b/plugin/file_key_management/parser.cc
@@ -174,24 +174,13 @@ bool Parser::read_filekey(const char *filekey, char *secret)
     return 1;
   }
 
-  int len= read(f, secret, MAX_SECRET_SIZE + 1);
+  int len= read(f, secret, MAX_SECRET_SIZE);
   if (len <= 0)
   {
     my_error(EE_READ,ME_ERROR_LOG, filekey, errno);
     close(f);
     return 1;
   }
-
-  if (len > MAX_SECRET_SIZE)
-  {
-    my_printf_error(EE_READ,
-                    "Cannot decrypt %s, the secret file has incorrect length, "
-                    "max secret size is %dB ",
-                    ME_ERROR_LOG, filekey, MAX_SECRET_SIZE);
-    close(f);
-    return 1;
-  }
-
   close(f);
   while (secret[len - 1] == '\r' || secret[len - 1] == '\n') len--;
   secret[len]= '\0';