Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi

This commit is contained in:
Mark Payne 2015-12-03 16:35:33 -05:00
parent 76914ead03 3656c883c7
commit dce039b54f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PasswordBasedEncryptor.java
View File

@ -41,6 +41,7 @@ public class PasswordBasedEncryptor implements Encryptor {
private int saltSize; private int saltSize;
private SecretKey secretKey; private SecretKey secretKey;
@Deprecated
public static final String SECURE_RANDOM_ALGORITHM = "SHA1PRNG"; public static final String SECURE_RANDOM_ALGORITHM = "SHA1PRNG";
public static final int DEFAULT_SALT_SIZE = 8; public static final int DEFAULT_SALT_SIZE = 8;
@ -65,7 +66,7 @@ public class PasswordBasedEncryptor implements Encryptor {
public StreamCallback getEncryptionCallback() throws ProcessException { public StreamCallback getEncryptionCallback() throws ProcessException {
try { try {
byte[] salt = new byte[saltSize]; byte[] salt = new byte[saltSize];
SecureRandom secureRandom = SecureRandom.getInstance(SECURE_RANDOM_ALGORITHM, "SUN"); SecureRandom secureRandom = new SecureRandom();
secureRandom.nextBytes(salt); secureRandom.nextBytes(salt);
return new EncryptCallback(salt); return new EncryptCallback(salt);
} catch (Exception e) { } catch (Exception e) {