Merge remote-tracking branch 'origin/mcrypt' into libs-upgrade

Author: buskamuza

lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php

@@ -14,235 +14,43 @@
     5 => '',
   ],
   1 => [
-    0 => 'cc188f97f1bbd2f7a265e57c0dbb004ac29c1a88dc846ea6aed1c80c',
-    1 => 'blowfish',
-    2 => 'cbc',
-    3 => '48da27c4',
-    4 => '',
-    5 => '',
-  ],
-  2 => [
-    0 => '8bf1685366faa72ce1e4fbe1f89656e1de1fd186331c8fa255dde0eb',
-    1 => 'blowfish',
-    2 => 'cfb',
-    3 => '70c1592a',
-    4 => '',
-    5 => '',
-  ],
-  3 => [
-    0 => '5d304b80fbe2f6d6eaa51103d7558368e15f843b005fbd6353b7d0dd',
-    1 => 'blowfish',
-    2 => 'ofb',
-    3 => 'a8e85663',
-    4 => '',
-    5 => '',
-  ],
-  4 => [
-    0 => 'f33d7a68248758b77863569a9caa08271fcda17eb3903e8c8f01ea48',
-    1 => 'blowfish',
-    2 => 'nofb',
-    3 => '5919959b',
-    4 => '',
-    5 => '',
-  ],
-  5 => [
     0 => '7e34794ae07b3540a683cfd47b24a039',
     1 => 'rijndael-128',
     2 => 'ecb',
     3 => '4b30de87edb9eee1',
     4 => '',
     5 => '',
   ],
-  6 => [
-    0 => 'eed11fb167c5ba7c6666b0379d3f0efd',
-    1 => 'rijndael-128',
-    2 => 'cbc',
-    3 => 'f87fb9492e358ff7',
-    4 => '',
-    5 => '',
-  ],
-  7 => [
-    0 => 'b0baa1454a71e4902d2f21cca5822a43',
-    1 => 'rijndael-128',
-    2 => 'cfb',
-    3 => 'ca5f40f310fbf41c',
-    4 => '',
-    5 => '',
-  ],
-  8 => [
-    0 => '097577dd9bd37a37670d4ffac6db71ca',
-    1 => 'rijndael-128',
-    2 => 'ofb',
-    3 => '9662705b5c8a92e2',
-    4 => '',
-    5 => '',
-  ],
-  9 => [
-    0 => '26283c5ee61006051e109fb13cbeadd4',
-    1 => 'rijndael-128',
-    2 => 'nofb',
-    3 => 'fbae555d61cb4ab3',
-    4 => '',
-    5 => '',
-  ],
-  10 => [
-    0 => '912940718c6991dcc9927fe1357a59eb',
-    1 => 'rijndael-256',
-    2 => 'ecb',
-    3 => '6041192a9ed0647219bfba45306be4bc',
-    4 => '',
-    5 => '',
-  ],
-  11 => [
+  2 => [
     0 => '22eaec79b2ae279beac05375f1dd301f',
     1 => 'rijndael-256',
     2 => 'cbc',
     3 => 'a4c67e7ee66f7c8dde975dd224e47533',
     4 => '',
     5 => '',
   ],
-  12 => [
-    0 => '331ff7ee00849ef02acfcc4a4c44b002',
-    1 => 'rijndael-256',
-    2 => 'cfb',
-    3 => 'e7da553b177006fb878f2189815b146c',
-    4 => '',
-    5 => '',
-  ],
-  13 => [
-    0 => '52b9991fb182434f8ef64db604c1946a',
-    1 => 'rijndael-256',
-    2 => 'ofb',
-    3 => '95118150491d3acb936fed8f8aad942a',
-    4 => '',
-    5 => '',
-  ],
-  14 => [
-    0 => '42cba7ea2c940077df289a594170c846',
-    1 => 'rijndael-256',
-    2 => 'nofb',
-    3 => '11211b3d82f6a7d8cc864f3ffee958c1',
-    4 => '',
-    5 => '',
-  ],
-  15 => [
+  3 => [
     0 => '72f761d4c435986911087485b8664d40b28d12f818eca42edf84fecd',
     1 => 'blowfish',
     2 => 'ecb',
     3 => '5612d7ae',
     4 => 'Hello world!!!',
     5 => 'UObRTUnq3jCNZjJOxwNubA==',
   ],
-  16 => [
-    0 => '63341175e4edd8ef27ea0d754f985b6bbfddd29b381ea8473a450b8c',
-    1 => 'blowfish',
-    2 => 'cbc',
-    3 => '8cc63606',
-    4 => 'Hello world!!!',
-    5 => '18QUXHt++6HiTQynQ4nUkg==',
-  ],
-  17 => [
-    0 => '5c4beba2e7571460dd0c2a6971dec5d707b6d8681a69e927ba8fac9f',
-    1 => 'blowfish',
-    2 => 'cfb',
-    3 => 'e93e050d',
-    4 => 'Hello world!!!',
-    5 => '11ubM60SiGkecJRFZMQ=',
-  ],
-  18 => [
-    0 => '073f901024e51b0ab85cf5944a90aea92bf353083ff642024f61a62d',
-    1 => 'blowfish',
-    2 => 'ofb',
-    3 => 'a9b4f0ca',
-    4 => 'Hello world!!!',
-    5 => 'SqliQR1lHxY4r/HCgoI=',
-  ],
-  19 => [
-    0 => '56df989b718351624480eb7776f827da7caf7996a6aa38dfa3e7328a',
-    1 => 'blowfish',
-    2 => 'nofb',
-    3 => '4178906f',
-    4 => 'Hello world!!!',
-    5 => 'vkPrtkjZ9TPapsG1sEY=',
-  ],
-  20 => [
+  4 => [
     0 => '6f326ec41c0e1d17fc030018043c0862',
     1 => 'rijndael-128',
     2 => 'ecb',
     3 => '0a85b06abcb9ea59',
     4 => 'Hello world!!!',
     5 => 'dYsG1NhOM0lvXj32RqXJuw==',
   ],
-  21 => [
-    0 => '7891bd79c8bae053e795733dd6b99d4e',
-    1 => 'rijndael-128',
-    2 => 'cbc',
-    3 => '11e5244c25e3cdc2',
-    4 => 'Hello world!!!',
-    5 => '5rMjKp16UzjD1rxcTFqNfg==',
-  ],
-  22 => [
-    0 => '247ec5c7e7fa07628090ed1e07bc601f',
-    1 => 'rijndael-128',
-    2 => 'cfb',
-    3 => '7afdde5cb2adca91',
-    4 => 'Hello world!!!',
-    5 => 'OOhZb1g3owMU05jD2qk=',
-  ],
-  23 => [
-    0 => '0cedc5085da7c010a4136f7cc4c8f073',
-    1 => 'rijndael-128',
-    2 => 'ofb',
-    3 => 'f7cf137c927714de',
-    4 => 'Hello world!!!',
-    5 => 'iq9Kx0artzuKew+HWpU=',
-  ],
-  24 => [
-    0 => 'a0374d4b62c0394e01407f4133bc61c1',
-    1 => 'rijndael-128',
-    2 => 'nofb',
-    3 => '282ff6bb6270b4e5',
-    4 => 'Hello world!!!',
-    5 => 'gO5d+xbHk8E+8EH308E=',
-  ],
-  25 => [
-    0 => 'afa6f9c61c9199e2e4b6a1426dead6d4',
-    1 => 'rijndael-256',
-    2 => 'ecb',
-    3 => '1ae41175585077595667ef251d8f74e4',
-    4 => 'Hello world!!!',
-    5 => 'qTO/oVNzMhFZCnjCY90IuMuJcb7UVa7SXygKHWExX70=',
-  ],
-  26 => [
+  5 => [
     0 => '774bb6dac74b24796469d1865df679be',
     1 => 'rijndael-256',
     2 => 'cbc',
     3 => 'dd20d7bab2cb020b14c1561440ccfa61',
     4 => 'Hello world!!!',
     5 => '4APJzBRpwuZSqbIfr/GPS+Zb8wV/uo9qNSOvk68cGRM=',
   ],
-  27 => [
-    0 => '0a319daff472006ec9d10a70920dd592',
-    1 => 'rijndael-256',
-    2 => 'cfb',
-    3 => '99fa50190792623b19a62a2d59b40105',
-    4 => 'Hello world!!!',
-    5 => 'GbcnmzgYRB+4ETtw5zQ=',
-  ],
-  28 => [
-    0 => '4fbd81fce821dd6042b46051eddcc300',
-    1 => 'rijndael-256',
-    2 => 'ofb',
-    3 => 'b78b752f32a9788347f6f70e7a5fe1f0',
-    4 => 'Hello world!!!',
-    5 => 'PvbnFhmV0tej2c6zVIc=',
-  ],
-  29 => [
-    0 => 'c183b2078424e7c9c129ba425421c0eb',
-    1 => 'rijndael-256',
-    2 => 'nofb',
-    3 => '97b3940cce9106b7c5a7f266f0a334bd',
-    4 => 'Hello world!!!',
-    5 => '2HhsW5Wlw9glUVy9mGo=',
-  ],
 ];

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

@@ -15,14 +15,10 @@ class CryptTest extends \PHPUnit\Framework\TestCase
 
     private static $_cipherInfo;
 
-    protected $_supportedCiphers = [MCRYPT_BLOWFISH, MCRYPT_RIJNDAEL_128, MCRYPT_RIJNDAEL_256];
-
-    protected $_supportedModes = [
-        MCRYPT_MODE_ECB,
-        MCRYPT_MODE_CBC,
-        MCRYPT_MODE_CFB,
-        MCRYPT_MODE_OFB,
-        MCRYPT_MODE_NOFB,
+    private const SUPPORTED_CIPHER_MODE_COMBINATIONS = [
+        MCRYPT_BLOWFISH => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_128 => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_256 => [MCRYPT_MODE_CBC],
     ];
 
     protected function setUp()
@@ -42,23 +38,7 @@ protected function _getRandomString($length)
     protected function _requireCipherInfo()
     {
         $filename = __DIR__ . '/Crypt/_files/_cipher_info.php';
-        /* Generate allowed sizes for encryption key and init vector
-           $data = array();
-           foreach ($this->_supportedCiphers as $cipher) {
-           if (!array_key_exists($cipher, $data)) {
-           $data[$cipher] = array();
-           }
-           foreach ($this->_supportedModes as $mode) {
-           $cipherHandle = mcrypt_module_open($cipher, '', $mode, '');
-           $data[$cipher][$mode] = array(
-           'key_size' => mcrypt_enc_get_key_size($cipherHandle),
-           'iv_size'  => mcrypt_enc_get_iv_size($cipherHandle),
-           );
-           mcrypt_module_close($cipherHandle);
-           }
-           }
-           file_put_contents($filename, '<?php return ' . var_export($data, true) . ";\n", LOCK_EX);
-           */
+
         if (!self::$_cipherInfo) {
             self::$_cipherInfo = include $filename;
         }
@@ -76,11 +56,12 @@ protected function _getInitVectorSize($cipherName, $modeName)
         return self::$_cipherInfo[$cipherName][$modeName]['iv_size'];
     }
 
-    public function getCipherModeCombinations()
+    public function getCipherModeCombinations(): array
     {
         $result = [];
-        foreach ($this->_supportedCiphers as $cipher) {
-            foreach ($this->_supportedModes as $mode) {
+        foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
                 $result[$cipher . '-' . $mode] = [$cipher, $mode];
             }
         }
@@ -105,8 +86,9 @@ public function testConstructor($cipher, $mode)
     public function getConstructorExceptionData()
     {
         $result = [];
-        foreach ($this->_supportedCiphers as $cipher) {
-            foreach ($this->_supportedModes as $mode) {
+        foreach (self::SUPPORTED_CIPHER_MODE_COMBINATIONS as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
                 $tooLongKey = str_repeat('-', $this->_getKeySize($cipher, $mode) + 1);
                 $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1);
                 $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1);
@@ -140,27 +122,7 @@ public function testConstructorDefaults()
     public function getCryptData()
     {
         $fixturesFilename = __DIR__ . '/Crypt/_files/_crypt_fixtures.php';
-        /* Generate fixtures
-           $fixtures = array();
-           foreach (array('', 'Hello world!!!') as $inputString) {
-           foreach ($this->_supportedCiphers as $cipher) {
-           foreach ($this->_supportedModes as $mode) {
-           $randomKey = $this->_getRandomString($this->_getKeySize($cipher, $mode));
-           $randomInitVector = $this->_getRandomString($this->_getInitVectorSize($cipher, $mode));
-           $crypt = new \Magento\Framework\Encryption\Crypt($randomKey, $cipher, $mode, $randomInitVector);
-           $fixtures[] = array(
-           $randomKey, // Encryption key
-           $cipher,
-           $mode,
-           $randomInitVector, // Init vector
-           $inputString, // String to encrypt
-           base64_encode($crypt->encrypt($inputString)) // Store result of encryption as base64
-           );
-           }
-           }
-           }
-           file_put_contents($fixturesFilename, '<?php return ' . var_export($fixtures, true) . ";\n", LOCK_EX);
-           */
+
         $result = include $fixturesFilename;
         /* Restore encoded string back to binary */
         foreach ($result as &$cryptParams) {