marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only send plain text pin if locked with registration lock v1

Browse Source
This commit is contained in:
AsamK 2021-05-13 10:35:01 +02:00
parent db756bfe10
commit da29cdfe10
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
View File

@ -129,9 +129,10 @@ public class RegistrationManager implements Closeable {
VerifyAccountResponse response;
MasterKey masterKey;
try {
response = verifyAccountWithCode(verificationCode, pin, null);
response = verifyAccountWithCode(verificationCode, null, null);
masterKey = null;
pin = null;
} catch (LockedException e) {
if (pin == null) {
throw e;
@ -139,16 +140,17 @@ public class RegistrationManager implements Closeable {
var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
if (registrationLockData == null) {
throw e;
response = verifyAccountWithCode(verificationCode, pin, null);
masterKey = null;
} else {
var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
try {
response = verifyAccountWithCode(verificationCode, null, registrationLock);
} catch (LockedException _e) {
throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
}
masterKey = registrationLockData.getMasterKey();
}
var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
try {
response = verifyAccountWithCode(verificationCode, null, registrationLock);
} catch (LockedException _e) {
throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
}
masterKey = registrationLockData.getMasterKey();
}
// TODO response.isStorageCapable()