Repository: nifi Updated Branches: refs/heads/master 69598a0b4 -> bde270a91
NIFI-1240: Added explicit reference to Sun Java Cryptographic Service Provider in PasswordBasedEncryptor. Removed manual seeding of SecureRandom in PasswordBasedEncryptor. This closes #138. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bde270a9 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bde270a9 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bde270a9 Branch: refs/heads/master Commit: bde270a9118a00ecd3ee476dc1314a7fc3240a74 Parents: 69598a0 Author: Andy LoPresto <[email protected]> Authored: Wed Dec 2 15:20:46 2015 -0800 Committer: Aldrin Piri <[email protected]> Committed: Wed Dec 2 19:37:09 2015 -0500 ---------------------------------------------------------------------- .../nifi/processors/standard/util/PasswordBasedEncryptor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/bde270a9/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PasswordBasedEncryptor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PasswordBasedEncryptor.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PasswordBasedEncryptor.java index 419e66d..c3b0cd4 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PasswordBasedEncryptor.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PasswordBasedEncryptor.java @@ -65,8 +65,7 @@ public class PasswordBasedEncryptor implements Encryptor { public StreamCallback getEncryptionCallback() throws ProcessException { try { byte[] salt = new byte[saltSize]; - SecureRandom secureRandom = SecureRandom.getInstance(SECURE_RANDOM_ALGORITHM); - secureRandom.setSeed(System.currentTimeMillis()); + SecureRandom secureRandom = SecureRandom.getInstance(SECURE_RANDOM_ALGORITHM, "SUN"); secureRandom.nextBytes(salt); return new EncryptCallback(salt); } catch (Exception e) {
