skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Reformat to code style.

Browse Source
This commit is contained in:
Maarten Billemont 2018-04-26 13:05:45 -04:00
parent 10698284d2
commit 9c8566b537
38 changed files with 142 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ plugins {
description = 'Master Password Algorithm Implementation' description = 'Master Password Algorithm Implementation'
dependencies { dependencies {
compile (group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.6-p11') { compile( group: 'com.lyndir.lhunath.opal', name: 'opal-system', version: '1.6-p11' ) {
exclude( module: 'joda-time' ) exclude( module: 'joda-time' )
} }
compile group: 'com.lyndir.lhunath.opal', name: 'opal-crypto', version: '1.6-p11' compile group: 'com.lyndir.lhunath.opal', name: 'opal-crypto', version: '1.6-p11'

3
core/java/algorithm/pom.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- PROJECT METADATA --> <!-- PROJECT METADATA -->

6
core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV1.java
View File

@ -24,9 +24,8 @@ import javax.annotation.Nullable;
/** /**
* @see MPMasterKey.Version#V1
*
* @author lhunath, 2014-08-30 * @author lhunath, 2014-08-30
* @see MPMasterKey.Version#V1
*/ */
public class MPAlgorithmV1 extends MPAlgorithmV0 { public class MPAlgorithmV1 extends MPAlgorithmV0 {
@ -37,7 +36,8 @@ public class MPAlgorithmV1 extends MPAlgorithmV0 {
} }
@Override @Override
public String sitePasswordFromTemplate(final byte[] masterKey, final byte[] siteKey, final MPResultType resultType, @Nullable final String resultParam) { public String sitePasswordFromTemplate(final byte[] masterKey, final byte[] siteKey, final MPResultType resultType,
@Nullable final String resultParam) {
// Determine the template. // Determine the template.
Preconditions.checkState( siteKey.length > 0 ); Preconditions.checkState( siteKey.length > 0 );

3
core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV2.java
View File

@ -25,9 +25,8 @@ import javax.annotation.Nullable;
/** /**
* @see MPMasterKey.Version#V2
*
* @author lhunath, 2014-08-30 * @author lhunath, 2014-08-30
* @see MPMasterKey.Version#V2
*/ */
public class MPAlgorithmV2 extends MPAlgorithmV1 { public class MPAlgorithmV2 extends MPAlgorithmV1 {

3
core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV3.java
View File

@ -24,9 +24,8 @@ import java.util.Arrays;
/** /**
* @see MPMasterKey.Version#V3
*
* @author lhunath, 2014-08-30 * @author lhunath, 2014-08-30
* @see MPMasterKey.Version#V3
*/ */
public class MPAlgorithmV3 extends MPAlgorithmV2 { public class MPAlgorithmV3 extends MPAlgorithmV2 {

5
core/java/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java
View File

@ -17,11 +17,10 @@
//============================================================================== //==============================================================================
/** /**
*
* @author lhunath, 15-02-04 * @author lhunath, 15-02-04
*/ */
@ParametersAreNonnullByDefault
@ParametersAreNonnullByDefault package com.lyndir.masterpassword; package com.lyndir.masterpassword;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;

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

@ -6,13 +6,13 @@ plugins {
description = 'Master Password Site Model' description = 'Master Password Site Model'
dependencies { dependencies {
compile project(':masterpassword-algorithm') compile project( ':masterpassword-algorithm' )
compile group: 'joda-time', name: 'joda-time', version:'2.4' compile group: 'joda-time', name: 'joda-time', version: '2.4'
compileOnly group: 'com.google.auto.value', name: 'auto-value', version: '1.2' compileOnly group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
apt group: 'com.google.auto.value', name: 'auto-value', version: '1.2' apt group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
testCompile group: 'org.testng', name: 'testng', version:'6.8.5' testCompile group: 'org.testng', name: 'testng', version: '6.8.5'
testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2' testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'
} }
test.useTestNG() test.useTestNG()

3
core/java/model/pom.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- PROJECT METADATA --> <!-- PROJECT METADATA -->

3
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileSite.java
View File

@ -180,7 +180,8 @@ public class MPFileSite extends MPSite {
this.loginContent = null; this.loginContent = null;
else else
this.loginContent = masterKey.siteState( this.loginContent = masterKey.siteState(
siteName, MPAlgorithm.mpw_default_counter, MPKeyPurpose.Identification, null, this.loginType, result, algorithmVersion ); siteName, MPAlgorithm.mpw_default_counter, MPKeyPurpose.Identification, null, this.loginType, result,
algorithmVersion );
} }
@Nullable @Nullable

3
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFlatUnmarshaller.java
View File

@ -73,7 +73,8 @@ public class MPFlatUnmarshaller implements MPUnmarshaller {
headerStarted = true; headerStarted = true;
else else
// Ends the header. // Ends the header.
user = new MPFileUser( fullName, keyID, MPMasterKey.Version.fromInt( mpVersion ), avatar, defaultType, new DateTime( 0 ), MPMarshalFormat.Flat ); user = new MPFileUser( fullName, keyID, MPMasterKey.Version.fromInt( mpVersion ), avatar, defaultType,
new DateTime( 0 ), MPMarshalFormat.Flat );
// Comment. // Comment.
else if (line.startsWith( "#" )) { else if (line.startsWith( "#" )) {

2
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPJSONUnmarshaller.java
View File

@ -38,7 +38,7 @@ public class MPJSONUnmarshaller implements MPUnmarshaller {
@Nonnull @Nonnull
@Override @Override
public MPFileUser unmarshall(@Nonnull final String content) public MPFileUser unmarshall(@Nonnull final String content)
throws MPMarshalException{ throws MPMarshalException {
throw new MPMarshalException( "Not yet implemented" ); throw new MPMarshalException( "Not yet implemented" );
} }
} }

3
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java
View File

@ -59,7 +59,8 @@ public abstract class MPSite {
throws MPInvalidatedException { throws MPInvalidatedException {
return masterKey.siteResult( return masterKey.siteResult(
getSiteName(), MPAlgorithm.mpw_default_counter, MPKeyPurpose.Identification, null, loginType, loginContent, getAlgorithmVersion() ); getSiteName(), MPAlgorithm.mpw_default_counter, MPKeyPurpose.Identification, null, loginType, loginContent,
getAlgorithmVersion() );
} }
@Override @Override

1
core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java
View File

@ -17,7 +17,6 @@
//============================================================================== //==============================================================================
/** /**
*
* @author lhunath, 15-02-04 * @author lhunath, 15-02-04
*/ */

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

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

3
core/java/tests/pom.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- PROJECT METADATA --> <!-- PROJECT METADATA -->

3
gradle/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,6 @@
#Thu Apr 26 12:52:02 EDT 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip

6
platform-android/build.gradle
View File

@ -39,8 +39,8 @@ dependencies {
compile project( ':masterpassword-algorithm' ) compile project( ':masterpassword-algorithm' )
compile project( ':masterpassword-tests' ) compile project( ':masterpassword-tests' )
compile group: 'org.slf4j', name: 'slf4j-android', version:'1.7.13-underscore' compile group: 'org.slf4j', name: 'slf4j-android', version: '1.7.13-underscore'
compile group: 'com.jakewharton', name: 'butterknife', version:'8.5.1' compile group: 'com.jakewharton', name: 'butterknife', version: '8.5.1'
annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version:'8.5.1' annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version: '8.5.1'
compile files( 'libs/scrypt-1.4.0-native.jar' ) compile files( 'libs/scrypt-1.4.0-native.jar' )
} }

9
platform-android/pom.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- PROJECT METADATA --> <!-- PROJECT METADATA -->
@ -86,8 +87,10 @@
<keypass>${env.PASSWORD}</keypass> <keypass>${env.PASSWORD}</keypass>
<alias>masterpassword-android</alias> <alias>masterpassword-android</alias>
<arguments> <arguments>
<argument>-sigalg</argument><argument>MD5withRSA</argument> <argument>-sigalg</argument>
<argument>-digestalg</argument><argument>SHA1</argument> <argument>MD5withRSA</argument>
<argument>-digestalg</argument>
<argument>SHA1</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>

8
platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java
View File

@ -52,8 +52,10 @@ public class EmergencyActivity extends Activity {
public static final int CLIPBOARD_CLEAR_DELAY = 20 /* s */ * MPConstant.MS_PER_S; public static final int CLIPBOARD_CLEAR_DELAY = 20 /* s */ * MPConstant.MS_PER_S;
private final Preferences preferences = Preferences.get( this ); private final Preferences preferences = Preferences.get( this );
private final ListeningExecutorService executor = MoreExecutors.listeningDecorator( Executors.newSingleThreadExecutor() ); private final ListeningExecutorService executor = MoreExecutors.listeningDecorator(
private final ImmutableList<MPResultType> allResultTypes = ImmutableList.copyOf( MPResultType.forClass( MPResultTypeClass.Template ) ); Executors.newSingleThreadExecutor() );
private final ImmutableList<MPResultType> allResultTypes = ImmutableList.copyOf(
MPResultType.forClass( MPResultTypeClass.Template ) );
private final ImmutableList<MPMasterKey.Version> allVersions = ImmutableList.copyOf( MPMasterKey.Version.values() ); private final ImmutableList<MPMasterKey.Version> allVersions = ImmutableList.copyOf( MPMasterKey.Version.values() );
private MPMasterKey masterKey; private MPMasterKey masterKey;
@ -211,7 +213,7 @@ public class EmergencyActivity extends Activity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
// FIXME: MasterKey.setAllowNativeByDefault( preferences.isAllowNativeKDF() ); // FIXME: MasterKey.setAllowNativeByDefault( preferences.isAllowNativeKDF() );
fullNameField.setText( preferences.getFullName() ); fullNameField.setText( preferences.getFullName() );
rememberFullNameField.setChecked( preferences.isRememberFullName() ); rememberFullNameField.setChecked( preferences.isRememberFullName() );

6
platform-independent/gui-java/build.gradle
View File

@ -8,10 +8,10 @@ description = 'Master Password GUI'
mainClassName = 'com.lyndir.masterpassword.gui.GUI' mainClassName = 'com.lyndir.masterpassword.gui.GUI'
dependencies { dependencies {
compile project(':masterpassword-model') compile project( ':masterpassword-model' )
compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2' compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'
compile group: 'com.yuvimasory', name: 'orange-extensions', version:'1.3.0' compile group: 'com.yuvimasory', name: 'orange-extensions', version: '1.3.0'
} }
run { run {

9
platform-independent/gui-java/pom.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- PROJECT METADATA --> <!-- PROJECT METADATA -->
@ -116,8 +117,10 @@
<keypass>${env.PASSWORD}</keypass> <keypass>${env.PASSWORD}</keypass>
<alias>masterpassword-desktop</alias> <alias>masterpassword-desktop</alias>
<arguments> <arguments>
<argument>-sigalg</argument><argument>MD5withRSA</argument> <argument>-sigalg</argument>
<argument>-digestalg</argument><argument>SHA1</argument> <argument>MD5withRSA</argument>
<argument>-digestalg</argument>
<argument>SHA1</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>

6
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java
View File

@ -16,7 +16,6 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>. // LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//============================================================================== //==============================================================================
package com.lyndir.masterpassword.gui; package com.lyndir.masterpassword.gui;
import com.google.common.base.*; import com.google.common.base.*;
@ -54,7 +53,7 @@ public class GUI implements UnlockFrame.SignInCallback {
// Try and set the system look & feel, if available. // Try and set the system look & feel, if available.
try { try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); UIManager.setLookAndFeel( UIManager.getSystemLookAndFeelClassName() );
} }
catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException ignored) { catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException ignored) {
} }
@ -67,7 +66,8 @@ public class GUI implements UnlockFrame.SignInCallback {
else // No special platform handling. else // No special platform handling.
new GUI().open(); new GUI().open();
} catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { }
catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
throw logger.bug( e ); throw logger.bug( e );
} }
} }

1
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java
View File

@ -17,7 +17,6 @@
//============================================================================== //==============================================================================
/** /**
*
* @author lhunath, 15-02-04 * @author lhunath, 15-02-04
*/ */

1
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java
View File

@ -17,7 +17,6 @@
//============================================================================== //==============================================================================
/** /**
*
* @author lhunath, 15-02-04 * @author lhunath, 15-02-04
*/ */

1
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java
View File

@ -17,7 +17,6 @@
//============================================================================== //==============================================================================
/** /**
*
* @author lhunath, 15-02-04 * @author lhunath, 15-02-04
*/ */

2
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java
View File

@ -81,7 +81,7 @@ public class IncognitoAuthenticationPanel extends AuthenticationPanel<IncognitoU
@Override @Override
public PasswordFrame<IncognitoUser, ?> newPasswordFrame() { public PasswordFrame<IncognitoUser, ?> newPasswordFrame() {
return new PasswordFrame<IncognitoUser, IncognitoSite>(getSelectedUser()) { return new PasswordFrame<IncognitoUser, IncognitoSite>( getSelectedUser() ) {
@Override @Override
protected IncognitoSite createSite(final IncognitoUser user, final String siteName, final UnsignedInteger siteCounter, protected IncognitoSite createSite(final IncognitoUser user, final String siteName, final UnsignedInteger siteCounter,
final MPResultType resultType, final MPResultType resultType,

8
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java
View File

@ -172,7 +172,8 @@ public class ModelAuthenticationPanel extends AuthenticationPanel<MPFileUser> im
if (JOptionPane.showConfirmDialog( ModelAuthenticationPanel.this, // if (JOptionPane.showConfirmDialog( ModelAuthenticationPanel.this, //
strf( "Are you sure you want to delete the user and sites remembered for:\n%s.", strf( "Are you sure you want to delete the user and sites remembered for:\n%s.",
deleteUser.getFullName() ), // deleteUser.getFullName() ), //
"Delete User", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE ) == JOptionPane.CANCEL_OPTION) "Delete User", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE )
== JOptionPane.CANCEL_OPTION)
return; return;
MPFileUserManager.get().deleteUser( deleteUser ); MPFileUserManager.get().deleteUser( deleteUser );
@ -205,9 +206,10 @@ public class ModelAuthenticationPanel extends AuthenticationPanel<MPFileUser> im
@Override @Override
public PasswordFrame<MPFileUser, MPFileSite> newPasswordFrame() { public PasswordFrame<MPFileUser, MPFileSite> newPasswordFrame() {
return new PasswordFrame<MPFileUser, MPFileSite>(getSelectedUser()) { return new PasswordFrame<MPFileUser, MPFileSite>( getSelectedUser() ) {
@Override @Override
protected MPFileSite createSite(final MPFileUser user, final String siteName, final UnsignedInteger siteCounter, final MPResultType resultType, protected MPFileSite createSite(final MPFileUser user, final String siteName, final UnsignedInteger siteCounter,
final MPResultType resultType,
final MPMasterKey.Version algorithmVersion) { final MPMasterKey.Version algorithmVersion) {
return new MPFileSite( user, siteName, siteCounter, resultType, algorithmVersion ); return new MPFileSite( user, siteName, siteCounter, resultType, algorithmVersion );
} }