mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.18.0.142

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

43
mcs/class/System.Security/System.Security.Cryptography/DataProtectionScope.cs
View File

@@ -1,43 +0,0 @@
//
// DataProtectionScope.cs: Scope for ProtectData
//
// Author:
// Sebastien Pouliot (spouliot@motus.com)
//
// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
//
//
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace System.Security.Cryptography {
public enum DataProtectionScope {
CurrentUser,
LocalMachine
}
}

36
mcs/class/System.Security/System.Security.Cryptography/ProtectedData.cs
View File

@@ -51,7 +51,7 @@ namespace System.Security.Cryptography {
if (userData == null)
throw new ArgumentNullException ("userData");
// on Windows this is supported only under 2000 and later OS
// on Windows this is supported by CoreFX implementation
Check (scope);
switch (impl) {
@@ -64,14 +64,6 @@ namespace System.Security.Cryptography {
string msg = Locale.GetText ("Data protection failed.");
throw new CryptographicException (msg, e);
}
case DataProtectionImplementation.Win32CryptoProtect:
try {
return NativeDapiProtection.Protect (userData, optionalEntropy, scope);
}
catch (Exception e) {
string msg = Locale.GetText ("Data protection failed.");
throw new CryptographicException (msg, e);
}
#endif
default:
throw new PlatformNotSupportedException ();
@@ -84,7 +76,7 @@ namespace System.Security.Cryptography {
if (encryptedData == null)
throw new ArgumentNullException ("encryptedData");
// on Windows this is supported only under 2000 and later OS
// on Windows this is supported by CoreFX implementation
Check (scope);
switch (impl) {
@@ -97,14 +89,6 @@ namespace System.Security.Cryptography {
string msg = Locale.GetText ("Data unprotection failed.");
throw new CryptographicException (msg, e);
}
case DataProtectionImplementation.Win32CryptoProtect:
try {
return NativeDapiProtection.Unprotect (encryptedData, optionalEntropy, scope);
}
catch (Exception e) {
string msg = Locale.GetText ("Data unprotection failed.");
throw new CryptographicException (msg, e);
}
#endif
default:
throw new PlatformNotSupportedException ();
@@ -126,18 +110,10 @@ namespace System.Security.Cryptography {
{
OperatingSystem os = Environment.OSVersion;
switch (os.Platform) {
case PlatformID.Win32NT:
Version v = os.Version;
if (v.Major < 5) {
impl = DataProtectionImplementation.Unsupported;
} else {
// Windows 2000 (5.0) and later
impl = DataProtectionImplementation.Win32CryptoProtect;
}
break;
case PlatformID.Unix:
impl = DataProtectionImplementation.ManagedProtection;
break;
case PlatformID.Win32NT:
default:
impl = DataProtectionImplementation.Unsupported;
break;
@@ -146,12 +122,6 @@ namespace System.Security.Cryptography {
private static void Check (DataProtectionScope scope)
{
if ((scope < DataProtectionScope.CurrentUser) || (scope > DataProtectionScope.LocalMachine)) {
string msg = Locale.GetText ("Invalid enum value '{0}' for '{1}'.",
scope, "DataProtectionScope");
throw new ArgumentException (msg, "scope");
}
switch (impl) {
case DataProtectionImplementation.Unknown:
Detect ();