Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@ -30,15 +30,13 @@ namespace System.Security.Cryptography
public override void SetHashAlgorithm(string strName)
{
try
// Verify the name
if (CryptoConfig.MapNameToOID(strName) != null)
{
// Verify the name
Oid.FromFriendlyName(strName, OidGroup.HashAlgorithm);
// Uppercase known names as required for BCrypt
_algName = HashAlgorithmNames.ToUpper(strName);
}
catch (CryptographicException)
else
{
// For desktop compat, exception is deferred until VerifySignature
_algName = null;

View File

@ -31,15 +31,13 @@ namespace System.Security.Cryptography
public override void SetHashAlgorithm(string strName)
{
try
// Verify the name
if (CryptoConfig.MapNameToOID(strName) != null)
{
// Verify the name
Oid.FromFriendlyName(strName, OidGroup.HashAlgorithm);
// Uppercase known names as required for BCrypt
_algName = HashAlgorithmNames.ToUpper(strName);
}
catch (CryptographicException)
else
{
// For desktop compat, exception is deferred until VerifySignature
_algName = null;