Skip to content

refactor: replace StringBuilder with string interpolation expression. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: replace StringBuilder with string interpolation expression. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Nota.Cryptography.Test/Argon2PasswordEncoderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void EncodeWhenUsingPredictableSaltThenEqualTestHash()

_encoder = new Argon2PasswordEncoder(16, 32, 1, 16384, 2)
{
SaltGenerator = new MockPredictableNumberGenerator(0x41),
SaltGenerator = new PredictableNumberGenerator(0x41),
};
string hash = _encoder.Encode("sometestpassword");

Expand All @@ -133,7 +133,7 @@ public void EncodeWhenUsingPredictableSaltWithCustomParamsThenEqualTestHash()

_encoder = new Argon2PasswordEncoder(16, 32, 4, 512, 5)
{
SaltGenerator = new MockPredictableNumberGenerator(0x41),
SaltGenerator = new PredictableNumberGenerator(0x41),
};

string hash = _encoder.Encode("sometestpassword");
Expand Down
4 changes: 2 additions & 2 deletions ...hy.Test/MockPredictableNumberGenerator.cs → ...graphy.Test/PredictableNumberGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/
namespace Nota.Cryptography.Test;

public class MockPredictableNumberGenerator : IRandomNumberGenerator
public class PredictableNumberGenerator : IRandomNumberGenerator
{
private readonly byte _value;

public MockPredictableNumberGenerator(byte value)
public PredictableNumberGenerator(byte value)
{
_value = value;
}
Expand Down
23 changes: 3 additions & 20 deletions Nota.Cryptography/Argon2/Argon2EncodingUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,16 @@ internal static class Argon2EncodingUtils
/// <exception cref="ArgumentException">If the Argon2Parameters are invalid.</exception>
public static string Encode(byte[] hash, Argon2Parameters parameters)
{
StringBuilder stringBuilder = new();
byte[] salt = parameters.GetSalt();
string type = parameters.Type switch
{
Argon2Constants.Argon2d => "$argon2d",
Argon2Constants.Argon2i => "$argon2i",
Argon2Constants.Argon2id => "$argon2id",
_ => throw new ArgumentException("Invalid algorithm type: " + parameters.Type),
};

stringBuilder.Append(type);
stringBuilder.Append("$v=")
.Append(parameters.Version)
.Append("$m=")
.Append(parameters.Memory)
.Append(",t=")
.Append(parameters.Iterations)
.Append(",p=")
.Append(parameters.Parallelism);

if (parameters.GetSalt() != null)
{
stringBuilder.Append('$').Append(Base64.Encode(parameters.GetSalt()));
}

stringBuilder.Append('$').Append(Base64.Encode(hash));

return stringBuilder.ToString();

return $"{type}$v={parameters.Version}$m={parameters.Memory},t={parameters.Iterations},p={parameters.Parallelism}${Base64.Encode(salt)}${Base64.Encode(hash)}";
}

/// <summary>
Expand Down