Libs changes for php 8.x
This commit is contained in:
@@ -8,7 +8,10 @@ final class KeyProtectedByPassword
|
||||
{
|
||||
const PASSWORD_KEY_CURRENT_VERSION = "\xDE\xF1\x00\x00";
|
||||
|
||||
private $encrypted_key = null;
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private $encrypted_key = '';
|
||||
|
||||
/**
|
||||
* Creates a random key protected by the provided password.
|
||||
@@ -19,7 +22,10 @@ final class KeyProtectedByPassword
|
||||
*
|
||||
* @return KeyProtectedByPassword
|
||||
*/
|
||||
public static function createRandomPasswordProtectedKey($password)
|
||||
public static function createRandomPasswordProtectedKey(
|
||||
#[\SensitiveParameter]
|
||||
$password
|
||||
)
|
||||
{
|
||||
$inner_key = Key::createNewRandomKey();
|
||||
/* The password is hashed as a form of poor-man's domain separation
|
||||
@@ -44,7 +50,10 @@ final class KeyProtectedByPassword
|
||||
*
|
||||
* @return KeyProtectedByPassword
|
||||
*/
|
||||
public static function loadFromAsciiSafeString($saved_key_string)
|
||||
public static function loadFromAsciiSafeString(
|
||||
#[\SensitiveParameter]
|
||||
$saved_key_string
|
||||
)
|
||||
{
|
||||
$encrypted_key = Encoding::loadBytesFromChecksummedAsciiSafeString(
|
||||
self::PASSWORD_KEY_CURRENT_VERSION,
|
||||
@@ -76,9 +85,13 @@ final class KeyProtectedByPassword
|
||||
* @throws Ex\EnvironmentIsBrokenException
|
||||
* @throws Ex\WrongKeyOrModifiedCiphertextException
|
||||
*
|
||||
* @param string $password
|
||||
* @return Key
|
||||
*/
|
||||
public function unlockKey($password)
|
||||
public function unlockKey(
|
||||
#[\SensitiveParameter]
|
||||
$password
|
||||
)
|
||||
{
|
||||
try {
|
||||
$inner_key_encoded = Crypto::decryptWithPassword(
|
||||
@@ -100,6 +113,40 @@ final class KeyProtectedByPassword
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes the password.
|
||||
*
|
||||
* @param string $current_password
|
||||
* @param string $new_password
|
||||
*
|
||||
* @throws Ex\EnvironmentIsBrokenException
|
||||
* @throws Ex\WrongKeyOrModifiedCiphertextException
|
||||
*
|
||||
* @return KeyProtectedByPassword
|
||||
*/
|
||||
public function changePassword(
|
||||
#[\SensitiveParameter]
|
||||
$current_password,
|
||||
#[\SensitiveParameter]
|
||||
$new_password
|
||||
)
|
||||
{
|
||||
$inner_key = $this->unlockKey($current_password);
|
||||
/* The password is hashed as a form of poor-man's domain separation
|
||||
* between this use of encryptWithPassword() and other uses of
|
||||
* encryptWithPassword() that the user may also be using as part of the
|
||||
* same protocol. */
|
||||
$encrypted_key = Crypto::encryptWithPassword(
|
||||
$inner_key->saveToAsciiSafeString(),
|
||||
\hash(Core::HASH_FUNCTION_NAME, $new_password, true),
|
||||
true
|
||||
);
|
||||
|
||||
$this->encrypted_key = $encrypted_key;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor for KeyProtectedByPassword.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user