skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fixes #138- delays identicon update to avoid leaking interactive keyboard input.

Browse Source
This commit is contained in:
Maarten Billemont
2017-03-10 11:31:22 -05:00
parent c3f4d148a4
commit 77bee803b8
24 changed files with 188 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/algorithm/build.gradle
View File

@@ -1,12 +1,15 @@
apply plugin: 'java'
plugins {
id 'java'
}
description = 'Master Password Algorithm Implementation'
dependencies {
compile( 'com.lyndir.lhunath.opal:opal-system:1.6-p10' ) {
compile (group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.6-p10') {
exclude( module: 'joda-time' )
}
compile 'com.lambdaworks:scrypt:1.4.0'
compile 'org.jetbrains:annotations:13.0'
compile 'com.google.code.findbugs:jsr305:3.0.1'
compile group: 'com.lambdaworks', name: 'scrypt', version: '1.4.0'
compile group: 'org.jetbrains', name: 'annotations', version: '13.0'
compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
}

1
core/java/model/build.gradle
View File

@@ -9,7 +9,6 @@ dependencies {
compile project(':masterpassword:algorithm')
compile group: 'joda-time', name: 'joda-time', version:'2.4'
compileOnly group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
apt group: 'com.google.auto.value', name: 'auto-value', version: '1.2'

6
core/java/tests/build.gradle
View File

@@ -1,9 +1,11 @@
apply plugin: 'java'
plugins {
id 'java'
}
description = 'Master Password Test Suite'
dependencies {
compile project(':masterpassword:algorithm')
compile project(':masterpassword:algorithm')
testCompile group: 'org.testng', name: 'testng', version:'6.8.5'
testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'

6
core/java/tests/src/test/java/com/lyndir/masterpassword/MasterKeyTest.java
View File

@@ -2,14 +2,10 @@ package com.lyndir.masterpassword;
import static org.testng.Assert.*;
import com.google.common.io.Resources;
import com.lyndir.lhunath.opal.system.CodeUtils;
import com.lyndir.lhunath.opal.system.logging.Logger;
import com.lyndir.lhunath.opal.system.util.NNFunctionNN;
import com.lyndir.lhunath.opal.system.util.StringUtils;
import java.net.URL;
import javax.annotation.Nonnull;
import javax.xml.bind.JAXBContext;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -88,7 +84,7 @@ public class MasterKeyTest {
masterKey.encode( defaultCase.getSiteName(), defaultCase.getSiteType(), defaultCase.getSiteCounter(),
defaultCase.getSiteVariant(), defaultCase.getSiteContext() );
assertTrue( false, "[testInvalidate] Master key should have been invalidated, but was still usable." );
fail( "[testInvalidate] Master key should have been invalidated, but was still usable." );
}
catch (IllegalStateException ignored) {
}