Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 215fe87

Browse files
jkotasjkotas
committed
Delete remaining security transparency annotations
1 parent 345005d commit 215fe87

File tree

15 files changed

+16
-94
lines changed

15 files changed

+16
-94
lines changed

‎src/mscorlib/corefx/Interop/Unix/System.Globalization.Native/Interop.Casing.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ internal static partial class Interop
1111
{
1212
internal static partial class GlobalizationInterop
1313
{
14-
[SecurityCritical]
1514
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCase")]
1615
internal unsafe static extern void ChangeCase(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper);
1716

18-
[SecurityCritical]
1917
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCaseInvariant")]
2018
internal unsafe static extern void ChangeCaseInvariant(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper);
2119

22-
[SecurityCritical]
2320
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_ChangeCaseTurkish")]
2421
internal unsafe static extern void ChangeCaseTurkish(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper);
2522
}

‎src/mscorlib/corefx/Interop/Unix/System.Globalization.Native/Interop.Collation.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,52 +11,41 @@ internal static partial class Interop
1111
{
1212
internal static partial class GlobalizationInterop
1313
{
14-
[SecurityCritical]
1514
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetSortHandle")]
1615
internal unsafe static extern ResultCode GetSortHandle(byte[] localeName, out SafeSortHandle sortHandle);
1716

18-
[SecurityCritical]
1917
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CloseSortHandle")]
2018
internal unsafe static extern void CloseSortHandle(IntPtr handle);
2119

22-
[SecurityCritical]
2320
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CompareString")]
2421
internal unsafe static extern int CompareString(SafeSortHandle sortHandle, char* lpStr1, int cwStr1Len, char* lpStr2, int cwStr2Len, CompareOptions options);
2522

26-
[SecurityCritical]
2723
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOf")]
2824
internal unsafe static extern int IndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options);
2925

30-
[SecurityCritical]
3126
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_LastIndexOf")]
3227
internal unsafe static extern int LastIndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options);
3328

34-
[SecurityCritical]
3529
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOfOrdinalIgnoreCase")]
3630
internal unsafe static extern int IndexOfOrdinalIgnoreCase(string target, int cwTargetLength, char* pSource, int cwSourceLength, bool findLast);
3731

38-
[SecurityCritical]
3932
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_StartsWith")]
4033
[return: MarshalAs(UnmanagedType.Bool)]
4134
internal unsafe static extern bool StartsWith(SafeSortHandle sortHandle, string target, int cwTargetLength, string source, int cwSourceLength, CompareOptions options);
4235

43-
[SecurityCritical]
4436
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_EndsWith")]
4537
[return: MarshalAs(UnmanagedType.Bool)]
4638
internal unsafe static extern bool EndsWith(SafeSortHandle sortHandle, string target, int cwTargetLength, string source, int cwSourceLength, CompareOptions options);
4739

48-
[SecurityCritical]
4940
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_GetSortKey")]
5041
internal unsafe static extern int GetSortKey(SafeSortHandle sortHandle, string str, int strLength, byte* sortKey, int sortKeyLength, CompareOptions options);
5142

52-
[SecurityCritical]
5343
[DllImport(Libraries.GlobalizationInterop, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CompareStringOrdinalIgnoreCase")]
5444
internal unsafe static extern int CompareStringOrdinalIgnoreCase(char* lpStr1, int cwStr1Len, char* lpStr2, int cwStr2Len);
5545

5646
[DllImport(Libraries.GlobalizationInterop, EntryPoint = "GlobalizationNative_GetSortVersion")]
5747
internal static extern int GetSortVersion();
5848

59-
[SecurityCritical]
6049
internal class SafeSortHandle : SafeHandle
6150
{
6251
private SafeSortHandle() :
@@ -66,11 +55,9 @@ private SafeSortHandle() :
6655

6756
public override bool IsInvalid
6857
{
69-
[SecurityCritical]
7058
get { return handle == IntPtr.Zero; }
7159
}
7260

73-
[SecurityCritical]
7461
protected override bool ReleaseHandle()
7562
{
7663
CloseSortHandle(handle);

‎src/mscorlib/corefx/Microsoft/Win32/SafeHandles/SafeFileHandle.Unix.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace Microsoft.Win32.SafeHandles
1010
{
11-
[System.Security.SecurityCritical]
1211
public sealed class SafeFileHandle : SafeHandleZeroOrMinusOneIsInvalid
1312
{
1413
/// <summary>A handle value of -1.</summary>
@@ -83,7 +82,6 @@ internal static SafeFileHandle Open(Func<SafeFileHandle> fdFunc)
8382
return handle;
8483
}
8584

86-
[System.Security.SecurityCritical]
8785
protected override bool ReleaseHandle()
8886
{
8987
// When the SafeFileHandle was opened, we likely issued an flock on the created descriptor in order to add
@@ -111,7 +109,6 @@ protected override bool ReleaseHandle()
111109

112110
public override bool IsInvalid
113111
{
114-
[System.Security.SecurityCritical]
115112
get
116113
{
117114
long h = (long)handle;

‎src/mscorlib/corefx/System/Globalization/CalendarData.Unix.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ internal static int GetTwoDigitYearMax(CalendarId calendarId)
6464
}
6565

6666
// Call native side to figure out which calendars are allowed
67-
[SecuritySafeCritical]
6867
internal static int GetCalendars(string localeName, bool useUserOverride, CalendarId[] calendars)
6968
{
7069
// NOTE: there are no 'user overrides' on Linux
@@ -87,7 +86,6 @@ private static bool SystemSupportsTaiwaneseCalendar()
8786

8887
// PAL Layer ends here
8988

90-
[SecuritySafeCritical]
9189
private static bool GetCalendarInfo(string localeName, CalendarId calendarId, CalendarDataType dataType, out string calendarString)
9290
{
9391
return Interop.CallStringMethod(
@@ -239,7 +237,6 @@ private static int CountOccurrences(string input, char value, ref int index)
239237
return index - startIndex;
240238
}
241239

242-
[SecuritySafeCritical]
243240
private static bool EnumMonthNames(string localeName, CalendarId calendarId, CalendarDataType dataType, out string[] monthNames)
244241
{
245242
monthNames = null;
@@ -261,7 +258,6 @@ private static bool EnumMonthNames(string localeName, CalendarId calendarId, Cal
261258
return result;
262259
}
263260

264-
[SecuritySafeCritical]
265261
private static bool EnumEraNames(string localeName, CalendarId calendarId, CalendarDataType dataType, out string[] eraNames)
266262
{
267263
bool result = EnumCalendarInfo(localeName, calendarId, dataType, out eraNames);
@@ -277,7 +273,6 @@ private static bool EnumEraNames(string localeName, CalendarId calendarId, Calen
277273
return result;
278274
}
279275

280-
[SecuritySafeCritical]
281276
internal static bool EnumCalendarInfo(string localeName, CalendarId calendarId, CalendarDataType dataType, out string[] calendarData)
282277
{
283278
calendarData = null;
@@ -292,7 +287,6 @@ internal static bool EnumCalendarInfo(string localeName, CalendarId calendarId,
292287
return result;
293288
}
294289

295-
[SecuritySafeCritical]
296290
private static bool EnumCalendarInfo(string localeName, CalendarId calendarId, CalendarDataType dataType, CallbackContext callbackContext)
297291
{
298292
GCHandle context = GCHandle.Alloc(callbackContext);
@@ -306,7 +300,6 @@ private static bool EnumCalendarInfo(string localeName, CalendarId calendarId, C
306300
}
307301
}
308302

309-
[SecuritySafeCritical]
310303
private static void EnumCalendarInfoCallback(string calendarString, IntPtr context)
311304
{
312305
CallbackContext callbackContext = (CallbackContext)((GCHandle)context).Target;

‎src/mscorlib/corefx/System/Globalization/CultureData.Unix.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ internal partial class CultureData
2424
/// This method uses the sRealName field (which is initialized by the constructor before this is called) to
2525
/// initialize the rest of the state of CultureData based on the underlying OS globalization library.
2626
/// </summary>
27-
[SecuritySafeCritical]
2827
private unsafe bool InitCultureData()
2928
{
3029
Debug.Assert(_sRealName != null);
@@ -87,7 +86,6 @@ private unsafe bool InitCultureData()
8786
return true;
8887
}
8988

90-
[SecuritySafeCritical]
9189
internal static bool GetLocaleName(string localeName, out string windowsName)
9290
{
9391
// Get the locale name from ICU
@@ -104,7 +102,6 @@ internal static bool GetLocaleName(string localeName, out string windowsName)
104102
return true;
105103
}
106104

107-
[SecuritySafeCritical]
108105
internal static bool GetDefaultLocaleName(out string windowsName)
109106
{
110107
// Get the default (system) locale name from ICU
@@ -129,7 +126,6 @@ private string GetLocaleInfo(LocaleStringData type)
129126

130127
// For LOCALE_SPARENT we need the option of using the "real" name (forcing neutral names) instead of the
131128
// "windows" name, which can be specific for downlevel (< windows 7) os's.
132-
[SecuritySafeCritical]
133129
private string GetLocaleInfo(string localeName, LocaleStringData type)
134130
{
135131
Debug.Assert(localeName != null, "[CultureData.GetLocaleInfo] Expected localeName to be not be null");
@@ -155,7 +151,6 @@ private string GetLocaleInfo(string localeName, LocaleStringData type)
155151
return StringBuilderCache.GetStringAndRelease(sb);
156152
}
157153

158-
[SecuritySafeCritical]
159154
private int GetLocaleInfo(LocaleNumberData type)
160155
{
161156
Debug.Assert(_sWindowsName != null, "[CultureData.GetLocaleInfo(LocaleNumberData)] Expected _sWindowsName to be populated already");
@@ -179,7 +174,6 @@ private int GetLocaleInfo(LocaleNumberData type)
179174
return value;
180175
}
181176

182-
[SecuritySafeCritical]
183177
private int[] GetLocaleInfo(LocaleGroupingData type)
184178
{
185179
Debug.Assert(_sWindowsName != null, "[CultureData.GetLocaleInfo(LocaleGroupingData)] Expected _sWindowsName to be populated already");
@@ -205,7 +199,6 @@ private string GetTimeFormatString()
205199
return GetTimeFormatString(false);
206200
}
207201

208-
[SecuritySafeCritical]
209202
private string GetTimeFormatString(bool shortFormat)
210203
{
211204
Debug.Assert(_sWindowsName != null, "[CultureData.GetTimeFormatString(bool shortFormat)] Expected _sWindowsName to be populated already");

‎src/mscorlib/corefx/System/Globalization/DateTimeFormatInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ public Object Clone()
514514

515515
public String AMDesignator
516516
{
517-
// auto-generated
518517
get
519518
{
520519
if (this.amDesignator == null)
@@ -1031,7 +1030,6 @@ public String MonthDayPattern
10311030

10321031
public String PMDesignator
10331032
{
1034-
// auto-generated
10351033
get
10361034
{
10371035
if (this.pmDesignator == null)

‎src/mscorlib/corefx/System/Globalization/RegionInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ public RegionInfo(String name)
8787
SetName(name);
8888
}
8989

90-
[System.Security.SecuritySafeCritical] // auto-generated
9190
public RegionInfo(int culture)
9291
{
9392
if (culture == CultureInfo.LOCALE_INVARIANT) //The InvariantCulture has no matching region
@@ -132,7 +131,6 @@ private void SetName(string name)
132131
[OnSerializing]
133132
private void OnSerializing(StreamingContext ctx) { }
134133

135-
[System.Security.SecurityCritical] // auto-generated
136134
[OnDeserialized]
137135
private void OnDeserialized(StreamingContext ctx)
138136
{

‎src/mscorlib/corefx/System/Globalization/TextInfo.Unix.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ private void FinishInitialization(string textInfoName)
3333
{
3434
}
3535

36-
[SecuritySafeCritical]
3736
private unsafe string ChangeCase(string s, bool toUpper)
3837
{
3938
Debug.Assert(s != null);
@@ -78,7 +77,6 @@ private unsafe string ChangeCase(string s, bool toUpper)
7877
return result;
7978
}
8079

81-
[SecuritySafeCritical]
8280
private unsafe char ChangeCase(char c, bool toUpper)
8381
{
8482
char dst = default(char);

‎src/mscorlib/src/System/AppDomain.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ internal sealed class AppDomain
182182
#pragma warning disable 169
183183
private Object[] _Policies; // Called from the VM.
184184
#pragma warning restore 169
185-
[method: System.Security.SecurityCritical]
186185
public event AssemblyLoadEventHandler AssemblyLoad;
187186

188187
private ResolveEventHandler _TypeResolve;
@@ -249,7 +248,6 @@ public event ResolveEventHandler AssemblyResolve
249248
}
250249

251250
#if FEATURE_REFLECTION_ONLY_LOAD
252-
[method: System.Security.SecurityCritical]
253251
public event ResolveEventHandler ReflectionOnlyAssemblyResolve;
254252
#endif // FEATURE_REFLECTION_ONLY
255253

‎src/mscorlib/src/System/DateTime.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,6 @@ public static DateTime FromOADate(double d) {
663663
return new DateTime(DoubleDateToTicks(d), DateTimeKind.Unspecified);
664664
}
665665

666-
[System.Security.SecurityCritical /*auto-generated_required*/]
667666
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context) {
668667
if (info==null) {
669668
throw new ArgumentNullException(nameof(info));

0 commit comments

Comments
 (0)