Include Cipher In Sodium classname

Unlike mcrypt, the sodium extension uses a different [en|de]crypt function for
each avaiable cipher. Including the cipher in the class name provides a method
for changing the chosen sodium cipher.

Author: pmclain

lib/internal/Magento/Framework/Encryption/Adapter/Sodium.php renamed to lib/internal/Magento/Framework/Encryption/Adapter/SodiumChachaIetf.php

@@ -4,12 +4,10 @@
 
 namespace Magento\Framework\Encryption\Adapter;
 
-use Magento\Framework\Encryption\Encryptor;
-
 /**
  * Sodium adapter for encrypting and decrypting strings
  */
-class Sodium implements EncryptionAdapterInterface
+class SodiumChachaIetf implements EncryptionAdapterInterface
 {
     /**
      * @var string

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

@@ -12,7 +12,7 @@
 use Magento\Framework\Encryption\Adapter\EncryptionAdapterInterface;
 use Magento\Framework\Encryption\Helper\Security;
 use Magento\Framework\Math\Random;
-use Magento\Framework\Encryption\Adapter\Sodium;
+use Magento\Framework\Encryption\Adapter\SodiumChachaIetf;
 use Magento\Framework\Encryption\Adapter\Mcrypt;
 
 /**
@@ -274,7 +274,7 @@ private function getPasswordVersion()
      */
     public function encrypt($data)
     {
-        $crypt = new Sodium($this->keys[$this->keyVersion]);
+        $crypt = new SodiumChachaIetf($this->keys[$this->keyVersion]);
 
         return $this->keyVersion .
             ':' . self::CIPHER_AEAD_CHACHA20POLY1305 .
@@ -408,7 +408,7 @@ private function getCrypt(
         $cipherVersion = $this->validateCipher($cipherVersion);
 
         if ($cipherVersion >= self::CIPHER_AEAD_CHACHA20POLY1305) {
-            return new Sodium($key);
+            return new SodiumChachaIetf($key);
         }
 
         if ($cipherVersion === self::CIPHER_RIJNDAEL_128) {

lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php

@@ -9,7 +9,7 @@
 namespace Magento\Framework\Encryption\Test\Unit;
 
 use Magento\Framework\Encryption\Adapter\Mcrypt;
-use Magento\Framework\Encryption\Adapter\Sodium;
+use Magento\Framework\Encryption\Adapter\SodiumChachaIetf;
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\Crypt;
 use Magento\Framework\App\DeploymentConfig;
@@ -159,7 +159,7 @@ public function testEncrypt()
         $parts = explode(':', $actual, 3);
         list(, , $encryptedData) = $parts;
 
-        $crypt = new Sodium(self::CRYPT_KEY_1);
+        $crypt = new SodiumChachaIetf(self::CRYPT_KEY_1);
         // Verify decrypted matches original data
         $this->assertEquals($data, $crypt->decrypt(base64_decode((string)$encryptedData)));
     }