skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Replace Version API with MPAlgorithm, make configuration instance-specific.

Browse Source
This commit is contained in:
Maarten Billemont
2018-04-26 15:56:12 -04:00
parent 33f2e0edda
commit 82e2d0b5ac
29 changed files with 397 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/tests/src/main/java/com/lyndir/masterpassword/MPTests.java
View File

@@ -171,8 +171,8 @@ public class MPTests {
}
@Nonnull
public MPMasterKey.Version getAlgorithm() {
return MPMasterKey.Version.fromInt( checkNotNull( algorithm ) );
public MPAlgorithm getAlgorithm() {
return MPMasterKey.Version.fromInt( checkNotNull( algorithm ) ).getAlgorithm();
}
@Nonnull

7
core/java/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java
View File

@@ -109,14 +109,15 @@ public class MPMasterKeyTest {
MPMasterKey masterKey = new MPMasterKey( testCase.getFullName(), masterPassword );
String password = randomString( 8 );
MPResultType resultType = MPResultType.StoredPersonal;
for (final MPMasterKey.Version version : MPMasterKey.Version.values()) {
MPResultType resultType = MPResultType.StoredPersonal;
MPAlgorithm algorithm = version.getAlgorithm();
// Test site state
String state = masterKey.siteState( testCase.getSiteName(), testCase.getSiteCounter(), testCase.getKeyPurpose(),
testCase.getKeyContext(), resultType, password, version );
testCase.getKeyContext(), resultType, password, algorithm );
String result = masterKey.siteResult( testCase.getSiteName(), testCase.getSiteCounter(), testCase.getKeyPurpose(),
testCase.getKeyContext(), resultType, state, version );
testCase.getKeyContext(), resultType, state, algorithm );
assertEquals(
result,