MAGETWO-96459: Fix performance on MAGETWO-83832

Author: irenelagno

app/code/Magento/Config/App/Config/Type/System.php

@@ -267,12 +267,12 @@ private function loadScopeData($scopeType, $scopeId)
     private function cacheData(array $data)
     {
         $this->cache->save(
-            $this->encriptFilter->encrypt($this->serializer->serialize($data)),
+            $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($data)),
             $this->configType,
             [self::CACHE_TAG]
         );
         $this->cache->save(
-            $this->encriptFilter->encrypt($this->serializer->serialize($data['default'])),
+            $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($data['default'])),
             $this->configType . '_default',
             [self::CACHE_TAG]
         );
@@ -281,14 +281,14 @@ private function cacheData(array $data)
             foreach ($data[$curScopeType] ?? [] as $curScopeId => $curScopeData) {
                 $scopes[$curScopeType][$curScopeId] = 1;
                 $this->cache->save(
-                    $this->encriptFilter->encrypt($this->serializer->serialize($curScopeData)),
+                    $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($curScopeData)),
                     $this->configType . '_' . $curScopeType . '_' . $curScopeId,
                     [self::CACHE_TAG]
                 );
             }
         }
         $this->cache->save(
-            $this->encriptFilter->encrypt($this->serializer->serialize($scopes)),
+            $this->encriptFilter->encryptWithFastestAlgorithm($this->serializer->serialize($scopes)),
             $this->configType . '_scopes',
             [self::CACHE_TAG]
         );

lib/internal/Magento/Framework/Encryption/Encryptor.php

@@ -281,6 +281,21 @@ private function getPasswordVersion()
      * @return string
      */
     public function encrypt($data)
+    {
+        $crypt = new SodiumChachaIetf($this->keys[$this->keyVersion]);
+
+        return $this->keyVersion .
+            ':' . self::CIPHER_AEAD_CHACHA20POLY1305 .
+            ':' . base64_encode($crypt->encrypt($data));
+    }
+
+    /**
+     * Encrypt data using the fastest available algorithm
+     *
+     * @param string $data
+     * @return string
+     */
+    public function encryptWithFastestAlgorithm($data)
     {
         $crypt = $this->getCrypt();
         if (null === $crypt) {
@@ -290,7 +305,6 @@ public function encrypt($data)
             ':' . $this->getCipherVersion() .
             ':' . base64_encode($crypt->encrypt($data));
     }
-
     /**
      * Look for key and crypt versions in encrypted data before decrypting
      *
@@ -423,13 +437,16 @@ private function getCrypt(
 
         if ($cipherVersion === self::CIPHER_RIJNDAEL_128) {
             $cipher = MCRYPT_RIJNDAEL_128;
+            $mode = MCRYPT_MODE_ECB;
         } elseif ($cipherVersion === self::CIPHER_RIJNDAEL_256) {
             $cipher = MCRYPT_RIJNDAEL_256;
+            $mode = MCRYPT_MODE_CBC;
         } else {
             $cipher = MCRYPT_BLOWFISH;
+            $mode = MCRYPT_MODE_ECB;
         }
 
-        return new Mcrypt($key, $cipher, MCRYPT_MODE_ECB, $initVector);
+        return new Mcrypt($key, $cipher, $mode, $initVector);
     }
 
     /**