garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

fix findbugs warnings

Browse Source
This commit is contained in:
Athou
2013-04-09 15:38:25 +02:00
parent fb686df9b4
commit e217baab36
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/commafeed/backend/security/PasswordEncryptionService.java
View File

@@ -57,32 +57,32 @@ public class PasswordEncryptionService {
KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterations,
derivedKeyLength);
SecretKey key = null;
byte[] bytes = null;
try {
SecretKeyFactory f = SecretKeyFactory.getInstance(algorithm);
key = f.generateSecret(spec);
SecretKey key = f.generateSecret(spec);
bytes = key.getEncoded();
} catch (Exception e) {
// should never happen
log.error(e.getMessage(), e);
}
return key.getEncoded();
return bytes;
}
public byte[] generateSalt() {
// VERY important to use SecureRandom instead of just Random
SecureRandom random = null;
byte[] salt = null;
try {
random = SecureRandom.getInstance("SHA1PRNG");
SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
// Generate a 8 byte (64 bit) salt as recommended by RSA PKCS5
salt = new byte[8];
random.nextBytes(salt);
} catch (NoSuchAlgorithmException e) {
// should never happen
log.error(e.getMessage(), e);
}
// Generate a 8 byte (64 bit) salt as recommended by RSA PKCS5
byte[] salt = new byte[8];
random.nextBytes(salt);
return salt;
}