AC-8017 system settings improvement

Author: sreenia806

dev/tests/integration/testsuite/Magento/EncryptionKey/Setup/Patch/Data/SodiumChachaPatchTest.php

@@ -8,6 +8,7 @@
 
 namespace Magento\EncryptionKey\Setup\Patch\Data;
 
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Encryption\Encryptor;
@@ -88,7 +89,7 @@ private function legacyEncrypt(string $data): string
         $handle = @mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
         $initVectorSize = @mcrypt_enc_get_iv_size($handle);
         $initVector = str_repeat("\0", $initVectorSize);
-        @mcrypt_generic_init($handle, $this->deployConfig->get(static::PATH_KEY), $initVector);
+        @mcrypt_generic_init($handle, $this->getEncryptionKey(), $initVector);
 
         $encrpted = @mcrypt_generic($handle, $data);
 
@@ -98,4 +99,12 @@ private function legacyEncrypt(string $data): string
 
         return '0:' . Encryptor::CIPHER_RIJNDAEL_256 . ':' . base64_encode($encrpted);
     }
+
+    private function getEncryptionKey(): string
+    {
+        $key = $this->deployConfig->get(static::PATH_KEY);
+        return (str_starts_with($key, ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX)) ?
+        base64_decode(substr($key, strlen(ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX))) :
+        $key;
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/_files/payment_enc_cc.php

@@ -8,6 +8,7 @@
 
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\ResourceModel\Order\Payment\EncryptionUpdateTest;
 use Magento\Framework\App\DeploymentConfig;
@@ -30,7 +31,14 @@
 $handle = @mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
 $initVectorSize = @mcrypt_enc_get_iv_size($handle);
 $initVector = str_repeat("\0", $initVectorSize);
-@mcrypt_generic_init($handle, $deployConfig->get('crypt/key'), $initVector);
+
+// Key is also encrypted to support 256-key
+$key = $deployConfig->get('crypt/key');
+$originalKey = (str_starts_with($key, ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX)) ?
+    base64_decode(substr($key, strlen(ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX))) :
+    $key;
+
+@mcrypt_generic_init($handle, $originalKey, $initVector);
 
 $encCcNumber = @mcrypt_generic($handle, EncryptionUpdateTest::TEST_CC_NUMBER);