Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -123,8 +123,8 @@ namespace System.IdentityModel.Tokens
{
if (algorithm == SecurityAlgorithms.HmacSha1Signature)
return new HMACSHA1 (key);
//if (algorithm == SecurityAlgorithms.HmacSha256Signature)
// return new HMACSHA256 (key);
if (algorithm == SecurityAlgorithms.HmacSha256Signature)
return new HMACSHA256 (key);
throw new NotSupportedException ();
}
@ -212,6 +212,7 @@ namespace System.IdentityModel.Tokens
{
switch (algorithm) {
case SecurityAlgorithms.HmacSha1Signature:
case SecurityAlgorithms.HmacSha256Signature:
case SecurityAlgorithms.Psha1KeyDerivation:
case SecurityAlgorithms.Aes128Encryption:
case SecurityAlgorithms.Aes128KeyWrap: