Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-09 08:20:59 +00:00
parent e52655b4dc
commit 0abdbe5a7d
1547 changed files with 93792 additions and 47893 deletions

View File

@ -71,8 +71,6 @@ namespace System.ServiceModel
return new RsaSecurityTokenAuthenticator ();
else if (tokenRequirement.TokenType == SecurityTokenTypes.X509Certificate)
return CreateX509Authenticator (tokenRequirement);
else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego)
return new SspiClientSecurityTokenAuthenticator (this, tokenRequirement);
else
throw new NotImplementedException ("Security token type " + tokenRequirement.TokenType);
@ -114,16 +112,8 @@ namespace System.ServiceModel
return CreateX509SecurityTokenProvider (tokenRequirement);
else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation)
return CreateSecureConversationProvider (tokenRequirement);
else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego) {
if (tokenRequirement.TryGetProperty<bool> (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
return CreateSslnegoProvider (tokenRequirement);
} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego) {
if (tokenRequirement.TryGetProperty<bool> (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
return CreateSslnegoProvider (tokenRequirement);
} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecurityContext) {
else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecurityContext) {
// FIXME: implement
} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) {
return CreateSpnegoProvider (tokenRequirement);
} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SspiCredential) {
// FIXME: implement
} else if (tokenRequirement.TokenType == SecurityTokenTypes.Rsa) {
@ -278,22 +268,6 @@ SecurityTokenRequirement requirement)
return p;
}
SecurityTokenProvider CreateSslnegoProvider (SecurityTokenRequirement r)
{
SslSecurityTokenProvider p = new SslSecurityTokenProvider (this, r.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego);
InitializeProviderCommunicationObject (p.Communication, r);
return p;
}
SecurityTokenProvider CreateSpnegoProvider (SecurityTokenRequirement r)
{
SpnegoSecurityTokenProvider p = new SpnegoSecurityTokenProvider (this, r);
InitializeProviderCommunicationObject (p.Communication, r);
return p;
}
IssuedSecurityTokenProvider CreateIssuedTokenProvider (SecurityTokenRequirement requirement)
{
IssuedSecurityTokenProvider p =