Update to phpseclib 1.0.0.

horde · Nov 2, 2015 · a980768 · a980768
1 parent 5dabcfc
commit a980768
Show file tree

Hide file tree

Showing 22 changed files with 2,823 additions and 1,501 deletions.
diff --git a/framework/Pgp/bundle/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php b/framework/Pgp/bundle/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
@@ -7,6 +7,10 @@
  *
  * PHP versions 4 and 5
  *
+ * NOTE: Since AES.php is (for compatibility and phpseclib-historical reasons) virtually
+ * just a wrapper to Rijndael.php you may consider using Rijndael.php instead of
+ * to save one include_once().
+ *
  * If {@link Crypt_AES::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
  * {@link Crypt_AES::setKey() setKey()}.  ie. if the key is 128-bits, the key length will be 128-bits.  If it's 136-bits
  * it'll be null-padded to 192-bits and 192 bits will be the key length until {@link Crypt_AES::setKey() setKey()}
@@ -107,20 +111,6 @@
 define('CRYPT_AES_MODE_OFB', CRYPT_MODE_OFB);
 /**#@-*/
 
-/**#@+
- * @access private
- * @see Crypt_Base::Crypt_Base()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_AES_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_AES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
-/**#@-*/
-
 /**
  * Pure-PHP implementation of AES.
  *
@@ -201,7 +191,7 @@ function setKey($key)
                 default:
                     $this->key_size = 32;
             }
-            $this->_setupEngine();
+            $this->_setEngine();
         }
     }
 }