Skip to content

Commit 9280356

Browse files
committed
Merge branch 'master' into feat-4-proguard
2 parents 4059e8d + f423777 commit 9280356

38 files changed

Lines changed: 927 additions & 476 deletions

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ deploy:
3434
secure: "jTRC8q1o58sepRHphhUJEVnWPatWESdQuO8IYcqxQOSWsObD8Xr5KNrsLSgBAAGKCTEFdSb88/HrXQShZp1w4pdqTrmB4+eXgWxjtYNPzcaMkWMxsiJabLss91ahvvUVpNVp3AE2iHjUEOOqeXyx7ynhBVtvDn0Bf80O8ufqvq0PqQunQa5xlYp0UgTIEZ1BAoOtMTyWQrywvTRZj2ZLi0Aa5Lnqbrr2U2ZLqC3FLFOKveWJ8XxG10a2x2DmyRyW9h9EamXgoWVS3DqWOYdNDwEjgeih+0yNtJ1CWcDDC6PC77Nkit9/L5roCCnaTJbdhNdsVFBKP+1AUH81xMdSMl9SRKi16eVbjyEcu4laEzJlYz46eO8spbYJrmIDs59ij4C4dPQeb3LQPeioheEkFmUD/krZHH2klDnlN4T4nU2VPm0iYSkqezRHOkess+SDKxXvS8ZjmBcJLaI20QYLk+MFpWGw69JcgI90WHHFXBDLC+juz+16kmIEs6X96iaK0buysE0aSIy1/3l03mfnAl2fdMydrRhOkvWOpvOc67QCpkehEbhhC29TrbZAp954fu9akaKoHrdFU/I0Y4esM7CgzWUOc3oxfzInJ4Uva+Dun17gZxyuAXhvXqe7x9fPjpMnJGZUSe1E1GCja8BKpx4VFlz1SmBqC+FhDqTlmk8="
3535
file_glob: true
3636
file:
37-
- "target/bcrypt-core/bcrypt-*.jar"
38-
- "target/bcrypt-core/*.sha256"
39-
- "target/bcrypt-core/checksum-sha256.txt"
40-
- "target/bcrypt-cli/bcrypt-*.jar"
41-
- "target/bcrypt-cli/*.sha256"
37+
- "modules/bcrypt/target/bcrypt-*.jar"
38+
- "modules/bcrypt/target/*.sha256"
39+
- "modules/bcrypt/target/checksum-sha256.txt"
40+
- "modules/bcrypt-cli/target/bcrypt-*.jar"
41+
- "modules/bcrypt-cli/target/*.sha256"
4242
skip_cleanup: true
4343
on:
4444
branch: master

CHANGELOG

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# Releases
22

3+
## v0.5.0
4+
5+
* allow actual 2^31 rounds (fix integer overflow issue with `1<<31`) #7
6+
* use Apache v2 compatible Radix 64 impl and skip OpenJDK one #8
7+
38
## v0.4.0
49

5-
* change maven artifact to `bcrypt-core`
610
* add cli tool #5
711
* add (_experimental_) ProGuard optimized version (use maven classifier 'optimized') #4
812

README.md

Lines changed: 62 additions & 51 deletions
Large diffs are not rendered by default.

bcrypt-core/src/main/java/at/favre/lib/crypto/bcrypt/Radix64Encoder.java

Lines changed: 0 additions & 238 deletions
This file was deleted.

bcrypt-core/src/test/java/at/favre/lib/crypto/bcrypt/misc/BcryptMicroBenchmark.java

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)