Merge branch '914-simpler-secure-random' into 'master' (7bc269fd) · Commits · Julian Dehm / briar

Commit 7bc269fd authored 8 years ago by akwizgran

Merge branch '914-simpler-secure-random' into 'master'

Remove Fortuna generator, fix Android SecureRandom bug

Closes #914

See merge request !500

parents a22931ba d9c63bbc

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java 89 additions, 0 deletions

...arproject/bramble/system/AndroidSecureRandomProvider.java
bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java 3 additions, 3 deletions

.../org/briarproject/bramble/system/AndroidSystemModule.java
bramble-api/src/main/java/org/briarproject/bramble/api/system/SecureRandomProvider.java 23 additions, 0 deletions

...briarproject/bramble/api/system/SecureRandomProvider.java
bramble-api/src/main/java/org/briarproject/bramble/api/system/SeedProvider.java 0 additions, 18 deletions

...ava/org/briarproject/bramble/api/system/SeedProvider.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CombinedSecureRandom.java 0 additions, 62 deletions

...org/briarproject/bramble/crypto/CombinedSecureRandom.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java 53 additions, 12 deletions

.../org/briarproject/bramble/crypto/CryptoComponentImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoModule.java 4 additions, 3 deletions

...in/java/org/briarproject/bramble/crypto/CryptoModule.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/DoubleDigest.java 0 additions, 76 deletions

...in/java/org/briarproject/bramble/crypto/DoubleDigest.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/FortunaGenerator.java 0 additions, 114 deletions

...ava/org/briarproject/bramble/crypto/FortunaGenerator.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/FortunaSecureRandom.java 0 additions, 81 deletions

.../org/briarproject/bramble/crypto/FortunaSecureRandom.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/PseudoRandomImpl.java 17 additions, 13 deletions

...ava/org/briarproject/bramble/crypto/PseudoRandomImpl.java
bramble-core/src/main/java/org/briarproject/bramble/system/AbstractSecureRandomProvider.java 42 additions, 0 deletions

...rproject/bramble/system/AbstractSecureRandomProvider.java
bramble-core/src/main/java/org/briarproject/bramble/system/LinuxSecureRandomProvider.java 69 additions, 0 deletions

...riarproject/bramble/system/LinuxSecureRandomProvider.java
bramble-core/src/main/java/org/briarproject/bramble/system/LinuxSecureRandomSpi.java 64 additions, 0 deletions

...org/briarproject/bramble/system/LinuxSecureRandomSpi.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/EllipticCurveMultiplicationTest.java 2 additions, 2 deletions

...oject/bramble/crypto/EllipticCurveMultiplicationTest.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaGeneratorTest.java 0 additions, 99 deletions

...org/briarproject/bramble/crypto/FortunaGeneratorTest.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/FortunaSecureRandomTest.java 0 additions, 67 deletions

.../briarproject/bramble/crypto/FortunaSecureRandomTest.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/HashTest.java 2 additions, 2 deletions

...c/test/java/org/briarproject/bramble/crypto/HashTest.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyAgreementTest.java 8 additions, 6 deletions

...ava/org/briarproject/bramble/crypto/KeyAgreementTest.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java 8 additions, 8 deletions

...va/org/briarproject/bramble/crypto/KeyDerivationTest.java

with 384 additions and 566 deletions

Please register or to comment