From 3a62ff7e8980239a39e85393c6a797bb7acf97ed Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Wed, 19 Oct 2022 19:25:48 +1100
Subject: Revert "MDEV-25343 add read secret size in file key plugin"

This reverts commit cee7175b79a22c29a82ef328aba208f90afcea86.
---
 .../suite/encryption/r/filekeys_secret_too_long.result      | 10 ----------
 mysql-test/suite/encryption/t/filekeys-data-too-long.key    |  4 ----
 mysql-test/suite/encryption/t/filekeys_secret_too_long.opt  |  3 ---
 mysql-test/suite/encryption/t/filekeys_secret_too_long.test |  4 ----
 plugin/file_key_management/parser.cc                        | 13 +------------
 5 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 mysql-test/suite/encryption/r/filekeys_secret_too_long.result
 delete mode 100644 mysql-test/suite/encryption/t/filekeys-data-too-long.key
 delete mode 100644 mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
 delete mode 100644 mysql-test/suite/encryption/t/filekeys_secret_too_long.test

diff --git a/mysql-test/suite/encryption/r/filekeys_secret_too_long.result b/mysql-test/suite/encryption/r/filekeys_secret_too_long.result
deleted file mode 100644
index 32e18513454..00000000000
--- a/mysql-test/suite/encryption/r/filekeys_secret_too_long.result
+++ /dev/null
@@ -1,10 +0,0 @@
-call mtr.add_suppression("the secret file has incorrect length");
-call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
-call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
-FOUND 1 /the secret file has incorrect length/ in mysqld.1.err
-create table t1(c1 bigint not null, b char(200))  engine=innodb encrypted=yes encryption_key_id=1;
-ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
-select plugin_status from information_schema.plugins
-where plugin_name = 'file_key_management';
-plugin_status
-# Test checks if opening an too large secret does not crash the server.
diff --git a/mysql-test/suite/encryption/t/filekeys-data-too-long.key b/mysql-test/suite/encryption/t/filekeys-data-too-long.key
deleted file mode 100644
index ba1624fb324..00000000000
--- a/mysql-test/suite/encryption/t/filekeys-data-too-long.key
+++ /dev/null
@@ -1,4 +0,0 @@
-secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-secretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecretsecret
-
diff --git a/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt b/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
deleted file mode 100644
index c3f95019f2a..00000000000
--- a/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
+++ /dev/null
@@ -1,3 +0,0 @@
---loose-file-key-management-filekey=FILE:$MTR_SUITE_DIR/t/filekeys-data-too-long.key
---loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-data.enc
-
diff --git a/mysql-test/suite/encryption/t/filekeys_secret_too_long.test b/mysql-test/suite/encryption/t/filekeys_secret_too_long.test
deleted file mode 100644
index b675f892895..00000000000
--- a/mysql-test/suite/encryption/t/filekeys_secret_too_long.test
+++ /dev/null
@@ -1,4 +0,0 @@
-let SEARCH_PATTERN=the secret file has incorrect length;
-source filekeys_badtest.inc;
-
---echo # Test checks if opening an too large secret does not crash the server.
diff --git a/plugin/file_key_management/parser.cc b/plugin/file_key_management/parser.cc
index 8e78e230964..5a9e5e55d63 100644
--- 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';
-- 
cgit v1.2.1