Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Globally remove trailing whitespace
Browse files Browse the repository at this point in the history
Using php-cs-fixer - http://cs.sensiolabs.org/

php-cs-fixer fix --fixers=trailing_spaces .
  • Loading branch information
EvanDotPro committed Jul 26, 2012
12 parents b251bdd + 9ecdb37 + 1b357ee + 4a7c17e + a40cc7f + a000f96 + fef31dc + 2b50632 + e854c8c + 450528a + 01abc0c + af61218 commit 6893542
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/BlockCipher.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class BlockCipher
* @var string
*/
protected $hash = 'sha256';

/**
* Salt (IV)
*
Expand Down Expand Up @@ -199,7 +199,7 @@ public function setSalt($salt)
$this->salt = $salt;
return $this;
}

/**
* Get the salt (IV)
*
Expand All @@ -209,7 +209,7 @@ public function getSalt()
{
return $this->salt;
}

/**
* Enable/disable the binary output
*
Expand Down Expand Up @@ -356,7 +356,7 @@ public function encrypt($data)
if (empty($salt)) {
$salt = Rand::getBytes($this->cipher->getSaltSize(), true);
}
$this->cipher->setSalt($salt);
$this->cipher->setSalt($salt);
// generate the encryption key and the HMAC key for the authentication
$hash = Pbkdf2::calc(self::KEY_DERIV_HMAC,
$this->getKey(),
Expand Down

0 comments on commit 6893542

Please sign in to comment.