diff options
| author | Maxim Lipnin <v-maxlip@microsoft.com> | 2018-06-04 11:37:30 +0300 |
|---|---|---|
| committer | Maxim Lipnin <v-maxlip@microsoft.com> | 2018-06-04 11:37:30 +0300 |
| commit | f93105cce140257fe8471f06e57509414734b284 (patch) | |
| tree | 1d267a092b41c4de885cd5eea7ad2cc9dab48476 /mcs/class/System.Security | |
| parent | 42459ca99da4246bc4a5c38dcd73100d29c68c8c (diff) | |
| parent | 8ecf04ff4856ed08c10840298dee2cf76b4191d6 (diff) | |
Merge branch 'master' into corefx_import_System.Security
Diffstat (limited to 'mcs/class/System.Security')
| -rw-r--r-- | mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs | 6 | ||||
| -rw-r--r-- | mcs/class/System.Security/System.Security.csproj | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs index 15e50ca5fcf..495c0afee00 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs @@ -382,7 +382,7 @@ namespace System.Security.Cryptography.Xml { } // See if there is a signature description class defined in the Config file - SignatureDescription signatureDescription = CryptoHelpers.CreateFromName (SignedInfo.SignatureMethod) as SignatureDescription; + SignatureDescription signatureDescription = CryptoHelpers.CreateFromName<SignatureDescription> (SignedInfo.SignatureMethod); if (signatureDescription == null) throw new CryptographicException (SR.Cryptography_Xml_SignatureDescriptionNotCreated); HashAlgorithm hashAlg = signatureDescription.CreateDigest (); @@ -603,7 +603,7 @@ namespace System.Security.Cryptography.Xml { return false; // See if we're signed witn an HMAC algorithm - HMAC hmac = CryptoHelpers.CreateFromName (SignatureMethod) as HMAC; + HMAC hmac = CryptoHelpers.CreateFromName<HMAC> (SignatureMethod); if (hmac == null) return false; // We aren't signed with an HMAC algorithm, so we cannot have a truncated HMAC @@ -930,7 +930,7 @@ namespace System.Security.Cryptography.Xml { SignedXmlDebugLog.LogBeginCheckSignedInfo (this, m_signature.SignedInfo); - SignatureDescription signatureDescription = CryptoHelpers.CreateFromName (SignatureMethod) as SignatureDescription; + SignatureDescription signatureDescription = CryptoHelpers.CreateFromName<SignatureDescription> (SignatureMethod); if (signatureDescription == null) throw new CryptographicException (SR.Cryptography_Xml_SignatureDescriptionNotCreated); diff --git a/mcs/class/System.Security/System.Security.csproj b/mcs/class/System.Security/System.Security.csproj index 3e8fa355259..1133a976a33 100644 --- a/mcs/class/System.Security/System.Security.csproj +++ b/mcs/class/System.Security/System.Security.csproj @@ -28,7 +28,7 @@ <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
- <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SECURITY_DEP</DefineConstants>
+ <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SECURITY_DEP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
<OutputPath>./../../class/lib/monodroid</OutputPath>
|