Nosial/socialbox-php
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Made message signing in Cryptography use SHA512 as the message content for... #1

Closed
netkas wants to merge 421 commits from master into dev
pull from: master
merge into: Nosial:dev
Conversation 3 Commits 421 Files changed 226 +12 -4
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b1c669dfa8 - Show all commits

16
src/Socialbox/Classes/StandardMethods/SettingsSetOtp.php
View file

@ -37,13 +37,21 @@
throw new StandardException('Failed to check One Time Password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e); throw new StandardException('Failed to check One Time Password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
} }
try if($peer->isEnabled())
{ {
$usesPassword = PasswordManager::usesPassword($peer); try
{
// If the peer is disabled, the password is not used because we assume the peer is registering
$usesPassword = PasswordManager::usesPassword($peer);
}
catch (DatabaseOperationException $e)
{
throw new StandardException('Failed to check password usage due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
}
} }
catch (DatabaseOperationException $e) else
{ {
throw new StandardException('Failed to check password usage due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e); $usesPassword = false;
} }
// Password verification is required to set an OTP if a password is set // Password verification is required to set an OTP if a password is set