mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to .NET SDK 7.0.202

Browse source
This commit is contained in:
Alex Barney 2023-04-06 21:29:38 -07:00
parent 1e421a36ae
commit c11a1f4eca
4 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DotnetCliVersion.txt
View file

@ -1 +1 @@
7.0.102 7.0.202

17
src/LibHac/Common/Keys/DefaultKeySet.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic; using LibHac.Boot;
using System.Collections.Generic;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using static LibHac.Common.Keys.KeySet; using static LibHac.Common.Keys.KeySet;
using Type = LibHac.Common.Keys.KeyInfo.KeyType; using Type = LibHac.Common.Keys.KeyInfo.KeyType;
@ -131,9 +132,19 @@ internal static partial class DefaultKeySet
keys.Add(new KeyInfo(60, Type.DeviceDrvd, "keyblob_mac_key", 0, UsedKeyBlobCount, (set, i) => set.KeyBlobMacKeys[i])); keys.Add(new KeyInfo(60, Type.DeviceDrvd, "keyblob_mac_key", 0, UsedKeyBlobCount, (set, i) => set.KeyBlobMacKeys[i]));
keys.Add(new KeyInfo(70, Type.DeviceRoot, "encrypted_keyblob", 0, UsedKeyBlobCount, (set, i) => set.EncryptedKeyBlobs[i].Bytes)); keys.Add(new KeyInfo(70, Type.DeviceRoot, "encrypted_keyblob", 0, 6, (set, i) =>
{
// Todo: Remove local variable after Roslyn issue #67697 is fixed
ref EncryptedKeyBlob keySetKeyBlob = ref set.EncryptedKeyBlobs[i];
return keySetKeyBlob.Bytes;
}));
keys.Add(new KeyInfo(80, Type.CommonRoot, "keyblob", 0, UsedKeyBlobCount, (set, i) => set.KeyBlobs[i].Bytes)); keys.Add(new KeyInfo(80, Type.CommonRoot, "keyblob", 0, 6, (set, i) =>
{
// Todo: Remove local variable after Roslyn issue #67697 is fixed
ref KeyBlob keySetKeyBlob = ref set.KeyBlobs[i];
return keySetKeyBlob.Bytes;
}));
keys.Add(new KeyInfo(90, Type.CommonSeed, "master_kek_source", UsedKeyBlobCount, KeyRevisionCount, (set, i) => set.MasterKekSources[i])); keys.Add(new KeyInfo(90, Type.CommonSeed, "master_kek_source", UsedKeyBlobCount, KeyRevisionCount, (set, i) => set.MasterKekSources[i]));

8
src/LibHac/Common/Keys/KeySet.cs
View file

@ -145,7 +145,9 @@ public class KeySet
keys.Value[1] = CreateRsaParameters(in NcaHeaderSigningKeys[1]); keys.Value[1] = CreateRsaParameters(in NcaHeaderSigningKeys[1]);
} }
return keys.Value.Items; // Todo: Remove local variable after Roslyn issue #67697 is fixed
ref Array2<RSAParameters> array = ref keys.Value;
return array.Items;
} }
} }
@ -162,7 +164,9 @@ public class KeySet
keys.Value[1] = CreateRsaParameters(in AcidSigningKeys[1]); keys.Value[1] = CreateRsaParameters(in AcidSigningKeys[1]);
} }
return keys.Value.Items; // Todo: Remove local variable after Roslyn issue #67697 is fixed
ref Array2<RSAParameters> array = ref keys.Value;
return array.Items;
} }
} }

4
src/LibHac/Common/U8StringBuilder.cs
View file

@ -75,7 +75,7 @@ public ref struct U8StringBuilder
// These functions are internal so they can be called by the extension methods // These functions are internal so they can be called by the extension methods
// in U8StringBuilderExtensions. It's not an ideal setup, but it allows append // in U8StringBuilderExtensions. It's not an ideal setup, but it allows append
// calls to be chained without accidentally creating a copy of the U8StringBuilder. // calls to be chained without accidentally creating a copy of the U8StringBuilder.
internal void AppendInternal(ReadOnlySpan<byte> value) internal void AppendInternal(scoped ReadOnlySpan<byte> value)
{ {
// Once in the Overflowed state, nothing else is written to the buffer. // Once in the Overflowed state, nothing else is written to the buffer.
if (Overflowed) return; if (Overflowed) return;
@ -443,7 +443,7 @@ public ref struct U8StringBuilder
public static class U8StringBuilderExtensions public static class U8StringBuilderExtensions
{ {
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static ref U8StringBuilder Append(this ref U8StringBuilder sb, ReadOnlySpan<byte> value) public static ref U8StringBuilder Append(this ref U8StringBuilder sb, scoped ReadOnlySpan<byte> value)
{ {
sb.AppendInternal(value); sb.AppendInternal(value);
return ref sb; return ref sb;