Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improve usage of hashing for trimmer friendliness #91185

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

Merged
merged 2 commits into from
Aug 28, 2023
Merged

Improve usage of hashing for trimmer friendliness #91185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dbb857
Avoid rooting hash types for PBKDF2 key adjustment
vcsjones Aug 27, 2023
42f0094
Rewrite HashOneShotHelpers in terms of HashProviderDispenser.
vcsjones Aug 27, 2023
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
158 changes: 113 additions & 45 deletions src/libraries/Common/src/System/Security/Cryptography/HashOneShotHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Internal.Cryptography;
using System.Diagnostics;
using System.IO;

namespace System.Security.Cryptography
Expand All @@ -12,18 +13,11 @@ internal static class HashOneShotHelpers
{
internal static byte[] HashData(HashAlgorithmName hashAlgorithm, ReadOnlySpan<byte> source)
{
return hashAlgorithm.Name switch
{
HashAlgorithmNames.SHA256 => SHA256.HashData(source),
HashAlgorithmNames.SHA1 => SHA1.HashData(source),
HashAlgorithmNames.SHA512 => SHA512.HashData(source),
HashAlgorithmNames.SHA384 => SHA384.HashData(source),
HashAlgorithmNames.SHA3_256 => SHA3_256.HashData(source),
HashAlgorithmNames.SHA3_384 => SHA3_384.HashData(source),
HashAlgorithmNames.SHA3_512 => SHA3_512.HashData(source),
HashAlgorithmNames.MD5 when Helpers.HasMD5 => MD5.HashData(source),
_ => throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithm.Name)),
};
int hashSizeInBytes = HashSize(hashAlgorithm);
byte[] result = new byte[hashSizeInBytes];
int written = HashProviderDispenser.OneShotHashProvider.HashData(hashAlgorithm.Name!, source, result);
Debug.Assert(written == hashSizeInBytes);
return result;
}

internal static bool TryHashData(
Expand All @@ -32,34 +26,30 @@ internal static bool TryHashData(
Span<byte> destination,
out int bytesWritten)
{
return hashAlgorithm.Name switch
int hashSizeInBytes = HashSize(hashAlgorithm);

if (destination.Length < hashSizeInBytes)
{
HashAlgorithmNames.SHA256 => SHA256.TryHashData(source, destination, out bytesWritten),
HashAlgorithmNames.SHA1 => SHA1.TryHashData(source, destination, out bytesWritten),
HashAlgorithmNames.SHA512 => SHA512.TryHashData(source, destination, out bytesWritten),
HashAlgorithmNames.SHA384 => SHA384.TryHashData(source, destination, out bytesWritten),
HashAlgorithmNames.SHA3_256 => SHA3_256.TryHashData(source, destination, out bytesWritten),
HashAlgorithmNames.SHA3_384 => SHA3_384.TryHashData(source, destination, out bytesWritten),
HashAlgorithmNames.SHA3_512 => SHA3_512.TryHashData(source, destination, out bytesWritten),
HashAlgorithmNames.MD5 when Helpers.HasMD5 => MD5.TryHashData(source, destination, out bytesWritten),
_ => throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithm.Name)),
};
bytesWritten = 0;
return false;
}

bytesWritten = HashProviderDispenser.OneShotHashProvider.HashData(hashAlgorithm.Name!, source, destination);
Debug.Assert(bytesWritten == hashSizeInBytes);
return true;
}

internal static byte[] HashData(HashAlgorithmName hashAlgorithm, Stream source)
{
return hashAlgorithm.Name switch
ArgumentNullException.ThrowIfNull(source);

if (!source.CanRead)
{
HashAlgorithmNames.SHA256 => SHA256.HashData(source),
HashAlgorithmNames.SHA1 => SHA1.HashData(source),
HashAlgorithmNames.SHA512 => SHA512.HashData(source),
HashAlgorithmNames.SHA384 => SHA384.HashData(source),
HashAlgorithmNames.SHA3_256 => SHA3_256.HashData(source),
HashAlgorithmNames.SHA3_384 => SHA3_384.HashData(source),
HashAlgorithmNames.SHA3_512 => SHA3_512.HashData(source),
HashAlgorithmNames.MD5 when Helpers.HasMD5 => MD5.HashData(source),
_ => throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithm.Name)),
};
throw new ArgumentException(SR.Argument_StreamNotReadable, nameof(source));
}

int hashSizeInBytes = HashSize(hashAlgorithm);
return LiteHashProvider.HashStream(hashAlgorithm.Name!, hashSizeInBytes, source);
}

internal static int MacData(
Expand All @@ -68,18 +58,96 @@ internal static int MacData(
ReadOnlySpan<byte> source,
Span<byte> destination)
{
return hashAlgorithm.Name switch
int macSizeInBytes = MacSize(hashAlgorithm);

if (destination.Length < macSizeInBytes)
{
throw new ArgumentException(SR.Argument_DestinationTooShort, nameof(destination));
}

int written = HashProviderDispenser.OneShotHashProvider.MacData(hashAlgorithm.Name!, key, source, destination);
Debug.Assert(written == macSizeInBytes);
return written;
}

private static int HashSize(HashAlgorithmName hashAlgorithm)
{
switch (hashAlgorithm.Name)
{
HashAlgorithmNames.SHA256 => HMACSHA256.HashData(key, source, destination),
HashAlgorithmNames.SHA1 => HMACSHA1.HashData(key, source, destination),
HashAlgorithmNames.SHA512 => HMACSHA512.HashData(key, source, destination),
HashAlgorithmNames.SHA384 => HMACSHA384.HashData(key, source, destination),
HashAlgorithmNames.SHA3_256 => HMACSHA3_256.HashData(key, source, destination),
HashAlgorithmNames.SHA3_384 => HMACSHA3_384.HashData(key, source, destination),
HashAlgorithmNames.SHA3_512 => HMACSHA3_512.HashData(key, source, destination),
HashAlgorithmNames.MD5 when Helpers.HasMD5 => HMACMD5.HashData(key, source, destination),
_ => throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithm.Name)),
};
case HashAlgorithmNames.SHA256:
return SHA256.HashSizeInBytes;
case HashAlgorithmNames.SHA1:
return SHA1.HashSizeInBytes;
case HashAlgorithmNames.SHA512:
return SHA512.HashSizeInBytes;
case HashAlgorithmNames.SHA384:
return SHA384.HashSizeInBytes;
case HashAlgorithmNames.SHA3_256:
if (!HashProviderDispenser.HashSupported(HashAlgorithmNames.SHA3_256))
{
throw new PlatformNotSupportedException();
}

return SHA3_256.HashSizeInBytes;
case HashAlgorithmNames.SHA3_384:
if (!HashProviderDispenser.HashSupported(HashAlgorithmNames.SHA3_384))
{
throw new PlatformNotSupportedException();
}

return SHA3_384.HashSizeInBytes;
case HashAlgorithmNames.SHA3_512:
if (!HashProviderDispenser.HashSupported(HashAlgorithmNames.SHA3_512))
{
throw new PlatformNotSupportedException();
}

return SHA3_512.HashSizeInBytes;
case HashAlgorithmNames.MD5 when Helpers.HasMD5:
return MD5.HashSizeInBytes;
default:
throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithm.Name));
}
}

private static int MacSize(HashAlgorithmName hashAlgorithm)
{
switch (hashAlgorithm.Name)
{
case HashAlgorithmNames.SHA256:
return HMACSHA256.HashSizeInBytes;
case HashAlgorithmNames.SHA1:
return HMACSHA1.HashSizeInBytes;
case HashAlgorithmNames.SHA512:
return HMACSHA512.HashSizeInBytes;
case HashAlgorithmNames.SHA384:
return HMACSHA384.HashSizeInBytes;
case HashAlgorithmNames.SHA3_256:
if (!HashProviderDispenser.MacSupported(HashAlgorithmNames.SHA3_256))
{
throw new PlatformNotSupportedException();
}

return HMACSHA3_256.HashSizeInBytes;
case HashAlgorithmNames.SHA3_384:
if (!HashProviderDispenser.MacSupported(HashAlgorithmNames.SHA3_384))
{
throw new PlatformNotSupportedException();
}

return HMACSHA3_384.HashSizeInBytes;
case HashAlgorithmNames.SHA3_512:
if (!HashProviderDispenser.MacSupported(HashAlgorithmNames.SHA3_512))
{
throw new PlatformNotSupportedException();
}

return HMACSHA3_512.HashSizeInBytes;
case HashAlgorithmNames.MD5 when Helpers.HasMD5:
return HMACMD5.HashSizeInBytes;
default:
throw new CryptographicException(SR.Format(SR.Cryptography_UnknownHashAlgorithm, hashAlgorithm.Name));
}
}
}
}
19 changes: 7 additions & 12 deletions ...em.Security.Cryptography/src/System/Security/Cryptography/Pbkdf2Implementation.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,25 +86,20 @@ private static unsafe void FillKeyDerivation(
switch (hashAlgorithmName)
{
case HashAlgorithmNames.SHA1:
hashBufferSize = SHA1.HashData(password, hashBuffer);
break;
case HashAlgorithmNames.SHA256:
hashBufferSize = SHA256.HashData(password, hashBuffer);
break;
case HashAlgorithmNames.SHA384:
hashBufferSize = SHA384.HashData(password, hashBuffer);
break;
case HashAlgorithmNames.SHA512:
hashBufferSize = SHA512.HashData(password, hashBuffer);
hashBufferSize = HashProviderDispenser.OneShotHashProvider.HashData(hashAlgorithmName, password, hashBuffer);
break;
case HashAlgorithmNames.SHA3_256:
hashBufferSize = SHA3_256.HashData(password, hashBuffer);
break;
case HashAlgorithmNames.SHA3_384:
hashBufferSize = SHA3_384.HashData(password, hashBuffer);
break;
case HashAlgorithmNames.SHA3_512:
hashBufferSize = SHA3_512.HashData(password, hashBuffer);
if (!HashProviderDispenser.HashSupported(hashAlgorithmName))
{
throw new PlatformNotSupportedException();
}

hashBufferSize = HashProviderDispenser.OneShotHashProvider.HashData(hashAlgorithmName, password, hashBuffer);
break;
default:
Debug.Fail($"Unexpected hash algorithm '{hashAlgorithmName}'");
Expand Down