--- a/web/lib/Zend/Crypt/DiffieHellman.php Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Crypt/DiffieHellman.php Thu May 07 15:16:02 2015 +0200
@@ -15,9 +15,9 @@
* @category Zend
* @package Zend_Crypt
* @subpackage DiffieHellman
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: DiffieHellman.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version $Id$
*/
/**
@@ -27,7 +27,7 @@
*
* @category Zend
* @package Zend_Crypt
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Crypt_DiffieHellman
@@ -102,7 +102,6 @@
* @param string $generator
* @param string $privateKey
* @param string $privateKeyType
- * @return void
*/
public function __construct($prime, $generator, $privateKey = null, $privateKeyType = self::NUMBER)
{
@@ -146,6 +145,7 @@
*
* @param string $number
* @param string $type
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return Zend_Crypt_DiffieHellman
*/
public function setPublicKey($number, $type = self::NUMBER)
@@ -166,6 +166,7 @@
* transaction.
*
* @param string $type
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return string
*/
public function getPublicKey($type = self::NUMBER)
@@ -195,6 +196,8 @@
*
* @param string $publicKey
* @param string $type
+ * @param string $output
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return mixed
*/
public function computeSecretKey($publicKey, $type = self::NUMBER, $output = self::NUMBER)
@@ -218,6 +221,7 @@
* Return the computed shared secret key from the DiffieHellman transaction
*
* @param string $type
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return string
*/
public function getSharedSecretKey($type = self::NUMBER)
@@ -238,6 +242,7 @@
* Setter for the value of the prime number
*
* @param string $number
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return Zend_Crypt_DiffieHellman
*/
public function setPrime($number)
@@ -253,6 +258,7 @@
/**
* Getter for the value of the prime number
*
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return string
*/
public function getPrime()
@@ -264,11 +270,11 @@
return $this->_prime;
}
-
/**
* Setter for the value of the generator number
*
* @param string $number
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return Zend_Crypt_DiffieHellman
*/
public function setGenerator($number)
@@ -284,6 +290,7 @@
/**
* Getter for the value of the generator number
*
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return string
*/
public function getGenerator()
@@ -300,6 +307,7 @@
*
* @param string $number
* @param string $type
+ * @throws Zend_Crypt_DiffieHellman_Exception
* @return Zend_Crypt_DiffieHellman
*/
public function setPrivateKey($number, $type = self::NUMBER)