From 40a807c6afdcb4f2f00ae7688f824730e50feba5 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Wed, 25 Apr 2018 21:50:17 -0400 Subject: [PATCH] Better scope preferences to the algorithm & clean up. --- .../lyndir/masterpassword/MPAlgorithm.java | 21 ++++++- .../lyndir/masterpassword/MPAlgorithmV0.java | 57 +++++++++++++------ .../lyndir/masterpassword/MPAlgorithmV1.java | 5 +- .../lyndir/masterpassword/MPAlgorithmV2.java | 24 ++++---- .../lyndir/masterpassword/MPAlgorithmV3.java | 16 +++--- .../lyndir/masterpassword/MPMasterKey.java | 7 +-- .../lyndir/masterpassword/MPResultType.java | 2 - .../com/lyndir/masterpassword/MPUtils.java | 53 ----------------- .../masterpassword/model/MPFileSite.java | 2 +- .../masterpassword/model/MPFileUser.java | 2 +- .../model/MPFlatMarshaller.java | 2 +- .../model/MPFlatUnmarshaller.java | 2 +- .../lyndir/masterpassword/Preferences.java | 2 +- .../gui/view/PasswordFrame.java | 5 +- public/site | 2 +- 15 files changed, 90 insertions(+), 112 deletions(-) delete mode 100644 core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPUtils.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java index 68750fe4..58fb5850 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java @@ -23,7 +23,7 @@ import com.google.common.primitives.UnsignedInteger; import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests; import com.lyndir.lhunath.opal.system.MessageDigests; import java.io.Serializable; -import java.nio.ByteOrder; +import java.nio.*; import java.nio.charset.Charset; import javax.annotation.Nullable; @@ -33,6 +33,11 @@ import javax.annotation.Nullable; */ public interface MPAlgorithm { + /** + * mpw: defaults: Password result type. + */ + MPResultType mpw_default_type = MPResultType.GeneratedLong; + /** * mpw: validity for the time-based rolling counter. */ @@ -85,7 +90,7 @@ public interface MPAlgorithm { byte[] siteKey(byte[] masterKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose, @Nullable String keyContext); - String siteResult(byte[] masterKey, final byte[] siteKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose, + String siteResult(byte[] masterKey, byte[] siteKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose, @Nullable String keyContext, MPResultType resultType, @Nullable String resultParam); String sitePasswordFromTemplate(byte[] masterKey, byte[] siteKey, MPResultType resultType, @Nullable String resultParam); @@ -94,6 +99,16 @@ public interface MPAlgorithm { String sitePasswordFromDerive(byte[] masterKey, byte[] siteKey, MPResultType resultType, @Nullable String resultParam); - String siteState(byte[] masterKey, final byte[] siteKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose, + String siteState(byte[] masterKey, byte[] siteKey, String siteName, UnsignedInteger siteCounter, MPKeyPurpose keyPurpose, @Nullable String keyContext, MPResultType resultType, String resultParam); + + // Utilities + + byte[] toBytes(int number); + + byte[] toBytes(UnsignedInteger number); + + byte[] toBytes(char[] characters); + + byte[] toID(byte[] bytes); } diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV0.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV0.java index c66182f7..8678911c 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV0.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV0.java @@ -18,8 +18,6 @@ package com.lyndir.masterpassword; -import static com.lyndir.masterpassword.MPUtils.*; - import com.google.common.base.*; import com.google.common.primitives.Bytes; import com.google.common.primitives.UnsignedInteger; @@ -54,7 +52,7 @@ public class MPAlgorithmV0 implements MPAlgorithm { public byte[] masterKey(final String fullName, final char[] masterPassword) { byte[] fullNameBytes = fullName.getBytes( mpw_charset ); - byte[] fullNameLengthBytes = bytesForInt( fullName.length() ); + byte[] fullNameLengthBytes = toBytes( fullName.length() ); String keyScope = MPKeyPurpose.Authentication.getScope(); logger.trc( "keyScope: %s", keyScope ); @@ -63,26 +61,23 @@ public class MPAlgorithmV0 implements MPAlgorithm { logger.trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s", keyScope, CodeUtils.encodeHex( fullNameLengthBytes ), fullName ); byte[] masterKeySalt = Bytes.concat( keyScope.getBytes( mpw_charset ), fullNameLengthBytes, fullNameBytes ); - logger.trc( " => masterKeySalt.id: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) ); + logger.trc( " => masterKeySalt.id: %s", CodeUtils.encodeHex( toID( masterKeySalt ) ) ); // Calculate the master key. logger.trc( "masterKey: scrypt( masterPassword, masterKeySalt, N=%d, r=%d, p=%d )", scrypt_N, scrypt_r, scrypt_p ); - byte[] masterPasswordBytes = bytesForChars( masterPassword ); + byte[] masterPasswordBytes = toBytes( masterPassword ); byte[] masterKey = scrypt( masterKeySalt, masterPasswordBytes ); Arrays.fill( masterKeySalt, (byte) 0 ); Arrays.fill( masterPasswordBytes, (byte) 0 ); - logger.trc( " => masterKey.id: %s", CodeUtils.encodeHex( idForBytes( masterKey ) ) ); + logger.trc( " => masterKey.id: %s", CodeUtils.encodeHex( toID( masterKey ) ) ); return masterKey; } protected byte[] scrypt(final byte[] masterKeySalt, final byte[] mpBytes) { try { - //if (isAllowNative()) return SCrypt.scrypt( mpBytes, masterKeySalt, scrypt_N, scrypt_r, scrypt_p, mpw_dkLen ); - //else - // return SCrypt.scryptJ( mpBytes, masterKeySalt, scrypt_N, scrypt_r, scrypt_p, mpw_dkLen ); } catch (final GeneralSecurityException e) { throw logger.bug( e ); @@ -102,10 +97,10 @@ public class MPAlgorithmV0 implements MPAlgorithm { // Calculate the site seed. byte[] siteNameBytes = siteName.getBytes( mpw_charset ); - byte[] siteNameLengthBytes = bytesForInt( siteName.length() ); - byte[] siteCounterBytes = bytesForInt( siteCounter ); + byte[] siteNameLengthBytes = toBytes( siteName.length() ); + byte[] siteCounterBytes = toBytes( siteCounter ); byte[] keyContextBytes = ((keyContext == null) || keyContext.isEmpty())? null: keyContext.getBytes( mpw_charset ); - byte[] keyContextLengthBytes = (keyContextBytes == null)? null: bytesForInt( keyContextBytes.length ); + byte[] keyContextLengthBytes = (keyContextBytes == null)? null: toBytes( keyContextBytes.length ); logger.trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s", keyScope, CodeUtils.encodeHex( siteNameLengthBytes ), siteName, CodeUtils.encodeHex( siteCounterBytes ), (keyContextLengthBytes == null)? null: CodeUtils.encodeHex( keyContextLengthBytes ), keyContext ); @@ -113,11 +108,11 @@ public class MPAlgorithmV0 implements MPAlgorithm { byte[] sitePasswordInfo = Bytes.concat( keyScope.getBytes( mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes ); if (keyContextBytes != null) sitePasswordInfo = Bytes.concat( sitePasswordInfo, keyContextLengthBytes, keyContextBytes ); - logger.trc( " => siteSalt.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) ); + logger.trc( " => siteSalt.id: %s", CodeUtils.encodeHex( toID( sitePasswordInfo ) ) ); - logger.trc( "siteKey: hmac-sha256( masterKey.id=%s, siteSalt )", CodeUtils.encodeHex( idForBytes( masterKey ) ) ); + logger.trc( "siteKey: hmac-sha256( masterKey.id=%s, siteSalt )", CodeUtils.encodeHex( toID( masterKey ) ) ); byte[] sitePasswordSeedBytes = mpw_digest.of( masterKey, sitePasswordInfo ); - logger.trc( " => siteKey.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeedBytes ) ) ); + logger.trc( " => siteKey.id: %s", CodeUtils.encodeHex( toID( sitePasswordSeedBytes ) ) ); return sitePasswordSeedBytes; } @@ -217,7 +212,7 @@ public class MPAlgorithmV0 implements MPAlgorithm { throw logger.bug( "Could not derive result key." ); // Base64-encode - String b64Key = Verify.verifyNotNull( CryptUtils.encodeBase64( resultKey ) ); + String b64Key = Preconditions.checkNotNull( CryptUtils.encodeBase64( resultKey ) ); logger.trc( "b64 encoded -> key: %s", b64Key ); return b64Key; @@ -236,7 +231,7 @@ public class MPAlgorithmV0 implements MPAlgorithm { logger.trc( "cipherBuf: %d bytes = %s", cipherBuf.length, CodeUtils.encodeHex( cipherBuf ) ); // Base64-encode - String cipherText = Verify.verifyNotNull( CryptUtils.encodeBase64( cipherBuf ) ); + String cipherText = Preconditions.checkNotNull( CryptUtils.encodeBase64( cipherBuf ) ); logger.trc( "b64 encoded -> cipherText: %s", cipherText ); return cipherText; @@ -245,4 +240,32 @@ public class MPAlgorithmV0 implements MPAlgorithm { throw logger.bug( e ); } } + + // Utilities + + @Override + public byte[] toBytes(final int number) { + return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( mpw_byteOrder ).putInt( number ).array(); + } + + @Override + public byte[] toBytes(final UnsignedInteger number) { + return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( mpw_byteOrder ).putInt( number.intValue() ).array(); + } + + @Override + public byte[] toBytes(final char[] characters) { + ByteBuffer byteBuffer = mpw_charset.encode( CharBuffer.wrap( characters ) ); + + byte[] bytes = new byte[byteBuffer.remaining()]; + byteBuffer.get( bytes ); + + Arrays.fill( byteBuffer.array(), (byte) 0 ); + return bytes; + } + + @Override + public byte[] toID(final byte[] bytes) { + return mpw_hash.of( bytes ); + } } diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV1.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV1.java index 7d1088a0..e069e390 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV1.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV1.java @@ -19,6 +19,7 @@ package com.lyndir.masterpassword; import com.google.common.base.Preconditions; +import com.google.common.primitives.UnsignedBytes; import javax.annotation.Nullable; @@ -40,14 +41,14 @@ public class MPAlgorithmV1 extends MPAlgorithmV0 { // Determine the template. Preconditions.checkState( siteKey.length > 0 ); - int templateIndex = siteKey[0] & 0xFF; // Convert to unsigned int. + int templateIndex = UnsignedBytes.toInt( siteKey[0] ); MPTemplate template = resultType.getTemplateAtRollingIndex( templateIndex ); logger.trc( "template: %d => %s", templateIndex, template.getTemplateString() ); // Encode the password from the seed using the template. StringBuilder password = new StringBuilder( template.length() ); for (int i = 0; i < template.length(); ++i) { - int characterIndex = siteKey[i + 1] & 0xFF; // Convert to unsigned int. + int characterIndex = UnsignedBytes.toInt( siteKey[i + 1] ); MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i ); char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex ); logger.trc( " - class: %c, index: %3d (0x%2H) => character: %c", diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV2.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV2.java index f2560dc9..1aca1a66 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV2.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV2.java @@ -18,8 +18,6 @@ package com.lyndir.masterpassword; -import static com.lyndir.masterpassword.MPUtils.*; - import com.google.common.primitives.Bytes; import com.google.common.primitives.UnsignedInteger; import com.lyndir.lhunath.opal.system.CodeUtils; @@ -48,26 +46,26 @@ public class MPAlgorithmV2 extends MPAlgorithmV1 { // OTP counter value. if (siteCounter.longValue() == 0) - siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (MPAlgorithm.mpw_otp_window * 1000)) * MPAlgorithm.mpw_otp_window ); + siteCounter = UnsignedInteger.valueOf( (System.currentTimeMillis() / (mpw_otp_window * 1000)) * mpw_otp_window ); // Calculate the site seed. - byte[] siteNameBytes = siteName.getBytes( MPAlgorithm.mpw_charset ); - byte[] siteNameLengthBytes = bytesForInt( siteNameBytes.length ); - byte[] siteCounterBytes = bytesForInt( siteCounter ); - byte[] keyContextBytes = ((keyContext == null) || keyContext.isEmpty())? null: keyContext.getBytes( MPAlgorithm.mpw_charset ); - byte[] keyContextLengthBytes = (keyContextBytes == null)? null: bytesForInt( keyContextBytes.length ); + byte[] siteNameBytes = siteName.getBytes( mpw_charset ); + byte[] siteNameLengthBytes = toBytes( siteNameBytes.length ); + byte[] siteCounterBytes = toBytes( siteCounter ); + byte[] keyContextBytes = ((keyContext == null) || keyContext.isEmpty())? null: keyContext.getBytes( mpw_charset ); + byte[] keyContextLengthBytes = (keyContextBytes == null)? null: toBytes( keyContextBytes.length ); logger.trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s", keyScope, CodeUtils.encodeHex( siteNameLengthBytes ), siteName, CodeUtils.encodeHex( siteCounterBytes ), (keyContextLengthBytes == null)? null: CodeUtils.encodeHex( keyContextLengthBytes ), keyContext ); - byte[] sitePasswordInfo = Bytes.concat( keyScope.getBytes( MPAlgorithm.mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes ); + byte[] sitePasswordInfo = Bytes.concat( keyScope.getBytes( mpw_charset ), siteNameLengthBytes, siteNameBytes, siteCounterBytes ); if (keyContextBytes != null) sitePasswordInfo = Bytes.concat( sitePasswordInfo, keyContextLengthBytes, keyContextBytes ); - logger.trc( " => siteSalt.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordInfo ) ) ); + logger.trc( " => siteSalt.id: %s", CodeUtils.encodeHex( toID( sitePasswordInfo ) ) ); - logger.trc( "siteKey: hmac-sha256( masterKey.id=%s, siteSalt )", CodeUtils.encodeHex( idForBytes( masterKey ) ) ); - byte[] sitePasswordSeedBytes = MPAlgorithm.mpw_digest.of( masterKey, sitePasswordInfo ); - logger.trc( " => siteKey.id: %s", CodeUtils.encodeHex( idForBytes( sitePasswordSeedBytes ) ) ); + logger.trc( "siteKey: hmac-sha256( masterKey.id=%s, siteSalt )", CodeUtils.encodeHex( toID( masterKey ) ) ); + byte[] sitePasswordSeedBytes = mpw_digest.of( masterKey, sitePasswordInfo ); + logger.trc( " => siteKey.id: %s", CodeUtils.encodeHex( toID( sitePasswordSeedBytes ) ) ); return sitePasswordSeedBytes; } diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV3.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV3.java index 0379a491..e5fabed9 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV3.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmV3.java @@ -18,8 +18,6 @@ package com.lyndir.masterpassword; -import static com.lyndir.masterpassword.MPUtils.*; - import com.google.common.primitives.Bytes; import com.lyndir.lhunath.opal.system.CodeUtils; import java.util.Arrays; @@ -41,8 +39,8 @@ public class MPAlgorithmV3 extends MPAlgorithmV2 { @Override public byte[] masterKey(final String fullName, final char[] masterPassword) { - byte[] fullNameBytes = fullName.getBytes( MPAlgorithm.mpw_charset ); - byte[] fullNameLengthBytes = MPUtils.bytesForInt( fullNameBytes.length ); + byte[] fullNameBytes = fullName.getBytes( mpw_charset ); + byte[] fullNameLengthBytes = toBytes( fullNameBytes.length ); String keyScope = MPKeyPurpose.Authentication.getScope(); logger.trc( "keyScope: %s", keyScope ); @@ -50,17 +48,17 @@ public class MPAlgorithmV3 extends MPAlgorithmV2 { // Calculate the master key salt. logger.trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s", keyScope, CodeUtils.encodeHex( fullNameLengthBytes ), fullName ); - byte[] masterKeySalt = Bytes.concat( keyScope.getBytes( MPAlgorithm.mpw_charset ), fullNameLengthBytes, fullNameBytes ); - logger.trc( " => masterKeySalt.id: %s", CodeUtils.encodeHex( idForBytes( masterKeySalt ) ) ); + byte[] masterKeySalt = Bytes.concat( keyScope.getBytes( mpw_charset ), fullNameLengthBytes, fullNameBytes ); + logger.trc( " => masterKeySalt.id: %s", CodeUtils.encodeHex( toID( masterKeySalt ) ) ); // Calculate the master key. logger.trc( "masterKey: scrypt( masterPassword, masterKeySalt, N=%d, r=%d, p=%d )", - MPAlgorithm.scrypt_N, MPAlgorithm.scrypt_r, MPAlgorithm.scrypt_p ); - byte[] mpBytes = bytesForChars( masterPassword ); + scrypt_N, scrypt_r, scrypt_p ); + byte[] mpBytes = toBytes( masterPassword ); byte[] masterKey = scrypt( masterKeySalt, mpBytes ); Arrays.fill( masterKeySalt, (byte) 0 ); Arrays.fill( mpBytes, (byte) 0 ); - logger.trc( " => masterKey.id: %s", CodeUtils.encodeHex( idForBytes( masterKey ) ) ); + logger.trc( " => masterKey.id: %s", CodeUtils.encodeHex( toID( masterKey ) ) ); return masterKey; } diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java index f784a246..ead3269b 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java @@ -18,8 +18,6 @@ package com.lyndir.masterpassword; -import static com.lyndir.masterpassword.MPUtils.*; - import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedInteger; import com.lyndir.lhunath.opal.system.CodeUtils; @@ -71,7 +69,8 @@ public class MPMasterKey { if (key == null) { logger.trc( "-- mpw_masterKey (algorithm: %d)", algorithmVersion.toInt() ); logger.trc( "fullName: %s", fullName ); - logger.trc( "masterPassword.id: %s", CodeUtils.encodeHex( idForBytes( bytesForChars( masterPassword ) ) ) ); + logger.trc( "masterPassword.id: %s", CodeUtils.encodeHex( + algorithmVersion.getAlgorithm().toID( algorithmVersion.getAlgorithm().toBytes( masterPassword ) ) ) ); keyByVersion.put( algorithmVersion, key = algorithmVersion.getAlgorithm().masterKey( fullName, masterPassword ) ); } @@ -175,7 +174,7 @@ public class MPMasterKey { public byte[] getKeyID(final Version algorithmVersion) throws MPInvalidatedException { - return idForBytes( masterKey( algorithmVersion ) ); + return algorithmVersion.getAlgorithm().toID( masterKey( algorithmVersion ) ); } /** diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java index 1a3ce5eb..04c6be1e 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java @@ -127,8 +127,6 @@ public enum MPResultType { ImmutableList.of(), // MPResultTypeClass.Derive, 0x0, MPSiteFeature.Alternative ); - public static final MPResultType DEFAULT = GeneratedLong; - static final Logger logger = Logger.get( MPResultType.class ); private final String shortName; diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPUtils.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPUtils.java deleted file mode 100644 index 17f3f027..00000000 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPUtils.java +++ /dev/null @@ -1,53 +0,0 @@ -//============================================================================== -// This file is part of Master Password. -// Copyright (c) 2011-2017, Maarten Billemont. -// -// Master Password is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Master Password is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You can find a copy of the GNU General Public License in the -// LICENSE file. Alternatively, see . -//============================================================================== - -package com.lyndir.masterpassword; - -import com.google.common.primitives.UnsignedInteger; -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.util.Arrays; - - -/** - * @author lhunath, 2017-09-20 - */ -public final class MPUtils { - - public static byte[] bytesForInt(final int number) { - return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( MPAlgorithm.mpw_byteOrder ).putInt( number ).array(); - } - - public static byte[] bytesForInt(final UnsignedInteger number) { - return ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( MPAlgorithm.mpw_byteOrder ).putInt( number.intValue() ).array(); - } - - public static byte[] bytesForChars(final char[] characters) { - ByteBuffer byteBuffer = MPAlgorithm.mpw_charset.encode( CharBuffer.wrap( characters ) ); - - byte[] bytes = new byte[byteBuffer.remaining()]; - byteBuffer.get( bytes ); - - Arrays.fill( byteBuffer.array(), (byte) 0 ); - return bytes; - } - - public static byte[] idForBytes(final byte[] bytes) { - return MPAlgorithm.mpw_hash.of( bytes ); - } -} diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileSite.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileSite.java index a08f9554..482695ee 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileSite.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileSite.java @@ -48,7 +48,7 @@ public class MPFileSite extends MPSite { private Instant lastUsed; public MPFileSite(final MPFileUser user, final String siteName) { - this( user, siteName, DEFAULT_COUNTER, MPResultType.DEFAULT, MPMasterKey.Version.CURRENT ); + this( user, siteName, DEFAULT_COUNTER, user.getAlgorithmVersion().getAlgorithm().mpw_default_type, user.getAlgorithmVersion() ); } public MPFileSite(final MPFileUser user, final String siteName, final UnsignedInteger siteCounter, final MPResultType resultType, diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileUser.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileUser.java index e2f428e6..612de516 100755 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileUser.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPFileUser.java @@ -51,7 +51,7 @@ public class MPFileUser extends MPUser implements Comparable, S extends MPSite> exten siteCounterField = Components.spinner( siteCounterModel ) ); sitePanel.add( siteSettings ); resultTypeField.setFont( Res.valueFont().deriveFont( 12f ) ); - resultTypeField.setSelectedItem( MPResultType.DEFAULT ); + resultTypeField.setSelectedItem( MPAlgorithm.mpw_default_type ); resultTypeField.addItemListener( new ItemListener() { @Override public void itemStateChanged(final ItemEvent e) { @@ -156,7 +155,7 @@ public abstract class PasswordFrame, S extends MPSite> exten siteVersionField.setFont( Res.valueFont().deriveFont( 12f ) ); siteVersionField.setAlignmentX( RIGHT_ALIGNMENT ); - siteVersionField.setSelectedItem( MPMasterKey.Version.CURRENT ); + siteVersionField.setSelectedItem( user.getAlgorithmVersion() ); siteVersionField.addItemListener( new ItemListener() { @Override public void itemStateChanged(final ItemEvent e) { diff --git a/public/site b/public/site index 0545fc79..e886da7a 160000 --- a/public/site +++ b/public/site @@ -1 +1 @@ -Subproject commit 0545fc79995083ebebda07744ed9b22ee7ba6645 +Subproject commit e886da7af01747972cde23ff09827b56dbba973c