Skip to content

Commit

Permalink
Merge pull request #53 from SecUSo/Update-to-version-1.3.0
Browse files Browse the repository at this point in the history
Update to version 1.3.0
  • Loading branch information
udenr authored Aug 30, 2023
2 parents e67bf2b + 0e3983b commit 6ba4b57
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ Users can save the following properties of a password: <br />

### Password Generation

The password generation is based on the combination of two algorithms: the key deviation function PBKDF2 and the hash algorithm BCrypt. PBKDF2 and can be executed with three different hash algorithms (SHA256, SHA384, SHA512). <br />
The password generation is based on the combination of two algorithms: the key deviation function PBKDF2 and the hash algorithm BCrypt. <br />
* The master password serves as a secret for the PBKDF2 algorithm.
* Password counter, account name, username and device ID (optional) are concatenated to a string and form the salt of PBKDF2.
* Password counter, account name, username and installation salt (optional) are concatenated to a string and form the salt of PBKDF2.
* The result of the PBKDF2 hashing is encoded into a special version of Base64 which is compatible with BCrypt and not longer than 22 characters.
* The master password serves as a secret for the BCrypt algorithm.
* Result of the PBKDF2 hashing combined with the string "$2a$10$" the beginning forms the salt for BCrypt.
* Result of the PBKDF2 hashing combined with the string "$2a${bcrypt_cost}$" the beginning forms the salt for BCrypt ({bcrypt_cost} can be configured in the settings and has a default value of 10).
* The prefix and the salt is cut from the resulting byte-array.
* The byte-array is used to choose characters out of the character set the user has chosen.
<br />
Expand All @@ -52,7 +52,7 @@ If you wish to contribute to this project, have a look at the contribution polic
### API Reference

Mininum SDK: 17<br>
Target SDK: 32
Target SDK: 33

## License

Expand All @@ -73,7 +73,7 @@ GNU General Public License for more details.<br>
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.<br>

The app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo) copyright [SECUSO](www.secuso.org) (2022).
The app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo) copyright [SECUSO](https://secuso.org) (2022).

## Contributors

Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "org.secuso.privacyfriendlypasswordgenerator"
minSdkVersion 21
targetSdkVersion 33
versionCode 6
versionName "1.2.0"
versionCode 7
versionName "1.3.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
Expand Down Expand Up @@ -51,7 +51,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'androidx.recyclerview:recyclerview:1.3.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
Expand Down

0 comments on commit 6ba4b57

Please sign in to comment.