From 4d5cc7a5a0bf151ca671a18d3150e8dfa738a6b7 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 5 Nov 2015 20:39:05 +0100 Subject: [PATCH] fixes #104 --- .../java/org/cryptomator/crypto/aes256/Aes256Cryptor.java | 5 +++-- .../crypto/aes256/AesCryptographicConfiguration.java | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java index 0d3cbb86d..eb90a8c92 100644 --- a/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java +++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java @@ -98,8 +98,9 @@ public class Aes256Cryptor implements Cryptor, AesCryptographicConfiguration { public Aes256Cryptor() { byte[] bytes = new byte[AES_KEY_LENGTH_IN_BITS / Byte.SIZE]; try { - securePrng = SecureRandom.getInstance(PRNG_ALGORITHM); - securePrng.setSeed(securePrng.generateSeed(PRNG_SEED_LENGTH)); + securePrng = SecureRandom.getInstanceStrong(); + // No setSeed needed. See SecureRandom.getInstance(String): + // The first call to nextBytes will force the SecureRandom object to seed itself securePrng.nextBytes(bytes); this.primaryMasterKey = new SecretKeySpec(bytes, AES_KEY_ALGORITHM); securePrng.nextBytes(bytes); diff --git a/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/AesCryptographicConfiguration.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/AesCryptographicConfiguration.java index cbc3ad870..543919c7f 100644 --- a/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/AesCryptographicConfiguration.java +++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/AesCryptographicConfiguration.java @@ -38,11 +38,6 @@ interface AesCryptographicConfiguration { */ int PRNG_SEED_LENGTH = 16; - /** - * Algorithm used for random number generation. - */ - String PRNG_ALGORITHM = "SHA1PRNG"; - /** * Algorithm used for en/decryption. *