Now having the DES implementations extend from the

abstract and perform the new key processing

Author: Rican7

src/Robin/Ntlm/Crypt/Des/McryptDesEncrypter.php

@@ -11,15 +11,14 @@
 use InvalidArgumentException;
 use Robin\Ntlm\Crypt\CipherMode;
 use Robin\Ntlm\Crypt\Exception\CryptographicFailureException;
-use UnexpectedValueException;
 
 /**
  * An engine used to encrypt data using the DES standard algorithm and
  * implemented using the PHP "mcrypt" extension.
  *
  * @link http://php.net/mcrypt
  */
-class McryptDesEncrypter implements DesEncrypterInterface
+class McryptDesEncrypter extends AbstractDesEncrypter implements DesEncrypterInterface
 {
 
     /**
@@ -52,6 +51,8 @@ public function encrypt($key, $data, $mode, $initialization_vector)
             throw new InvalidArgumentException('Unknown cipher mode "'. $mode .'"');
         }
 
+        $key = $this->processKey($key);
+
         $encrypted = mcrypt_encrypt(MCRYPT_DES, $key, $data, $mode, $initialization_vector);
 
         if (false === $encrypted) {

src/Robin/Ntlm/Crypt/Des/OpenSslDesEncrypter.php

@@ -18,7 +18,7 @@
  *
  * @link http://php.net/openssl
  */
-class OpenSslDesEncrypter implements DesEncrypterInterface
+class OpenSslDesEncrypter extends AbstractDesEncrypter implements DesEncrypterInterface
 {
 
     /**
@@ -65,9 +65,13 @@ class OpenSslDesEncrypter implements DesEncrypterInterface
      *
      * @param bool $zero_pad Whether or not to zero-byte pad the data before
      *   encrypting for some cipher modes.
+     * @param bool $expand_and_normalize_keys Whether or not to expand and
+     *   normalize the key before encrypting.
      */
-    public function __construct($zero_pad = true)
+    public function __construct($zero_pad = true, $expand_and_normalize_keys = true)
     {
+        parent::__construct($expand_and_normalize_keys);
+
         $this->zero_pad = $zero_pad;
     }
 
@@ -84,6 +88,8 @@ public function encrypt($key, $data, $mode, $initialization_vector)
 
         $options = $this->getOpenSslEncryptionOptions();
 
+        $key = $this->processKey($key);
+
         $encrypted = openssl_encrypt($data, $mode, $key, $options, $initialization_vector);
 
         if (false === $encrypted) {