Skip to content
This repository has been archived by the owner on Feb 21, 2022. It is now read-only.

Fix #13 Added expection when input value is out of range #14

Merged
merged 1 commit into from
May 4, 2016
Merged

Fix #13 Added expection when input value is out of range #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 37 additions & 5 deletions lib/Cryptomute/Cryptomute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public function setValueRange($minValue, $maxValue)
}

/**
* Encrypts input data.
* Encrypts input data. Acts as a public alias for _encryptInternal method.
*
* @param string $input String representation of input number.
* @param int $base Input number base.
Expand All @@ -232,7 +232,24 @@ public function setValueRange($minValue, $maxValue)
*/
public function encrypt($input, $base = 10, $pad = false, $password = null, $iv = null)
{
$this->_validateInput($input, $base);
return $this->_encryptInternal($input, $base, $pad, $password, $iv, true);
}

/**
* Encrypts input data.
*
* @param string $input String representation of input number.
* @param int $base Input number base.
* @param bool $pad Pad left with zeroes?
* @param string|null $password Encryption password.
* @param string|null $iv Encryption initialization vector. Must be unique!
* @param bool $checkVal Should check if input value is in range?
*
* @return string Outputs encrypted data in the same format as input data.
*/
private function _encryptInternal($input, $base, $pad, $password, $iv, $checkVal = false)
{
$this->_validateInput($input, $base, $checkVal);
$this->_validateIv($iv);
$hashPassword = $this->_hashPassword($password);
$roundKeys = $this->_roundKeys($hashPassword, $iv);
Expand All @@ -256,7 +273,7 @@ public function encrypt($input, $base = 10, $pad = false, $password = null, $iv
$compare = DataConverter::binToDec($binary);

return (gmp_cmp($this->minValue, $compare) > 0 || gmp_cmp($compare, $this->maxValue) > 0)
? $this->encrypt($output, $base, $pad, $password, $iv)
? $this->_encryptInternal($output, $base, $pad, $password, $iv, false)
: $output;
}

Expand Down Expand Up @@ -400,10 +417,11 @@ private function _convertFromBin($binary, $base, $pad)
*
* @param string $input
* @param string $base
* @param bool $checkDomain Should check if input is in domain?
*
* @throws InvalidArgumentException If provided invalid type.
*/
private function _validateInput($input, $base)
private function _validateInput($input, $base, $checkDomain = false)
{
if (!array_key_exists($base, self::$allowedBases)) {
throw new InvalidArgumentException(sprintf(
Expand All @@ -414,10 +432,24 @@ private function _validateInput($input, $base)

if (preg_match(self::$allowedBases[$base], $input) !== 1) {
throw new InvalidArgumentException(sprintf(
'Input data does not match pattern "%s".',
'Input data "%s" does not match pattern "%s".',
$input,
self::$allowedBases[$base]
));
}

if ($checkDomain) {
$compare = gmp_init($input, $base);

if (gmp_cmp($this->minValue, $compare) > 0 || gmp_cmp($compare, $this->maxValue) > 0) {
throw new InvalidArgumentException(sprintf(
'Input value "%d" is out of domain range "%d - %d".',
gmp_strval($compare, 10),
$this->minValue,
$this->maxValue
));
}
}
}

/**
Expand Down
Loading