From a662a5593e2bf1a0b23feb7b9641dbb47e375041 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 24 Aug 2020 09:48:23 -0500 Subject: [PATCH] Polish crypto format Issue gh-8945 --- .../security/crypto/argon2/Argon2PasswordEncoder.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java index 9a87152cc4..b3991cb8c2 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2PasswordEncoder.java @@ -84,8 +84,15 @@ public class Argon2PasswordEncoder implements PasswordEncoder { public String encode(CharSequence rawPassword) { byte[] salt = this.saltGenerator.generateKey(); byte[] hash = new byte[this.hashLength]; - Argon2Parameters params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id).withSalt(salt) - .withParallelism(this.parallelism).withMemoryAsKB(this.memory).withIterations(this.iterations).build(); + // @formatter:off + Argon2Parameters params = new Argon2Parameters + .Builder(Argon2Parameters.ARGON2_id) + .withSalt(salt) + .withParallelism(this.parallelism) + .withMemoryAsKB(this.memory) + .withIterations(this.iterations) + .build(); + // @formatter:on Argon2BytesGenerator generator = new Argon2BytesGenerator(); generator.init(params); generator.generateBytes(rawPassword.toString().toCharArray(), hash);