mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
[Refactor] Use collection expressions.
This commit is contained in:
@@ -154,7 +154,7 @@ public class CSS
|
||||
};
|
||||
|
||||
static readonly byte[] _cssTable1 =
|
||||
{
|
||||
[
|
||||
0x33, 0x73, 0x3b, 0x26, 0x63, 0x23, 0x6b, 0x76, 0x3e, 0x7e, 0x36, 0x2b, 0x6e, 0x2e, 0x66, 0x7b, 0xd3, 0x93,
|
||||
0xdb, 0x06, 0x43, 0x03, 0x4b, 0x96, 0xde, 0x9e, 0xd6, 0x0b, 0x4e, 0x0e, 0x46, 0x9b, 0x57, 0x17, 0x5f, 0x82,
|
||||
0xc7, 0x87, 0xcf, 0x12, 0x5a, 0x1a, 0x52, 0x8f, 0xca, 0x8a, 0xc2, 0x1f, 0xd9, 0x99, 0xd1, 0x00, 0x49, 0x09,
|
||||
@@ -170,10 +170,10 @@ public class CSS
|
||||
0xbc, 0xfc, 0xb4, 0xa5, 0xec, 0xac, 0xe4, 0xf5, 0x39, 0x79, 0x31, 0x20, 0x69, 0x29, 0x61, 0x70, 0x38, 0x78,
|
||||
0x30, 0x21, 0x68, 0x28, 0x60, 0x71, 0xb7, 0xf7, 0xbf, 0xa2, 0xe7, 0xa7, 0xef, 0xf2, 0xba, 0xfa, 0xb2, 0xaf,
|
||||
0xea, 0xaa, 0xe2, 0xff
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _cssTable2 =
|
||||
{
|
||||
[
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x09, 0x08, 0x0b, 0x0a, 0x0d, 0x0c, 0x0f, 0x0e, 0x12, 0x13,
|
||||
0x10, 0x11, 0x16, 0x17, 0x14, 0x15, 0x1b, 0x1a, 0x19, 0x18, 0x1f, 0x1e, 0x1d, 0x1c, 0x24, 0x25, 0x26, 0x27,
|
||||
0x20, 0x21, 0x22, 0x23, 0x2d, 0x2c, 0x2f, 0x2e, 0x29, 0x28, 0x2b, 0x2a, 0x36, 0x37, 0x34, 0x35, 0x32, 0x33,
|
||||
@@ -189,10 +189,10 @@ public class CSS
|
||||
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8, 0xf6, 0xf7,
|
||||
0xf4, 0xf5, 0xf2, 0xf3, 0xf0, 0xf1, 0xed, 0xec, 0xef, 0xee, 0xe9, 0xe8, 0xeb, 0xea, 0xe4, 0xe5, 0xe6, 0xe7,
|
||||
0xe0, 0xe1, 0xe2, 0xe3
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _cssTable3 =
|
||||
{
|
||||
[
|
||||
0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24,
|
||||
0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d,
|
||||
0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6,
|
||||
@@ -222,10 +222,10 @@ public class CSS
|
||||
0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6,
|
||||
0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff, 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff,
|
||||
0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _cssTable4 =
|
||||
{
|
||||
[
|
||||
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, 0x08, 0x88,
|
||||
0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, 0x04, 0x84, 0x44, 0xc4,
|
||||
0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac,
|
||||
@@ -241,10 +241,10 @@ public class CSS
|
||||
0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97,
|
||||
0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf,
|
||||
0x3f, 0xbf, 0x7f, 0xff
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _cssTable5 =
|
||||
{
|
||||
[
|
||||
0xff, 0x7f, 0xbf, 0x3f, 0xdf, 0x5f, 0x9f, 0x1f, 0xef, 0x6f, 0xaf, 0x2f, 0xcf, 0x4f, 0x8f, 0x0f, 0xf7, 0x77,
|
||||
0xb7, 0x37, 0xd7, 0x57, 0x97, 0x17, 0xe7, 0x67, 0xa7, 0x27, 0xc7, 0x47, 0x87, 0x07, 0xfb, 0x7b, 0xbb, 0x3b,
|
||||
0xdb, 0x5b, 0x9b, 0x1b, 0xeb, 0x6b, 0xab, 0x2b, 0xcb, 0x4b, 0x8b, 0x0b, 0xf3, 0x73, 0xb3, 0x33, 0xd3, 0x53,
|
||||
@@ -260,10 +260,10 @@ public class CSS
|
||||
0xe4, 0x64, 0xa4, 0x24, 0xc4, 0x44, 0x84, 0x04, 0xf8, 0x78, 0xb8, 0x38, 0xd8, 0x58, 0x98, 0x18, 0xe8, 0x68,
|
||||
0xa8, 0x28, 0xc8, 0x48, 0x88, 0x08, 0xf0, 0x70, 0xb0, 0x30, 0xd0, 0x50, 0x90, 0x10, 0xe0, 0x60, 0xa0, 0x20,
|
||||
0xc0, 0x40, 0x80, 0x00
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _encryptTable0 =
|
||||
{
|
||||
[
|
||||
0xB7, 0xF4, 0x82, 0x57, 0xDA, 0x4D, 0xDB, 0xE2, 0x2F, 0x52, 0x1A, 0xA8, 0x68, 0x5A, 0x8A, 0xFF, 0xFB, 0x0E,
|
||||
0x6D, 0x35, 0xF7, 0x5C, 0x76, 0x12, 0xCE, 0x25, 0x79, 0x29, 0x39, 0x62, 0x08, 0x24, 0xA5, 0x85, 0x7B, 0x56,
|
||||
0x01, 0x23, 0x68, 0xCF, 0x0A, 0xE2, 0x5A, 0xED, 0x3D, 0x59, 0xB0, 0xA9, 0xB0, 0x2C, 0xF2, 0xB8, 0xEF, 0x32,
|
||||
@@ -279,10 +279,10 @@ public class CSS
|
||||
0x79, 0x1B, 0x48, 0xF2, 0xE9, 0x93, 0x1F, 0xFC, 0xDB, 0x2A, 0x90, 0xA9, 0x8A, 0x3D, 0x39, 0x18, 0xA3, 0x8E,
|
||||
0x58, 0x6C, 0xE0, 0x12, 0xBB, 0x25, 0xCD, 0x71, 0x22, 0xA2, 0x64, 0xC6, 0xE7, 0xFB, 0xAD, 0x94, 0x77, 0x04,
|
||||
0x9A, 0x39, 0xCF, 0x7C
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _encryptTable1 =
|
||||
{
|
||||
[
|
||||
0x8C, 0x47, 0xB0, 0xE1, 0xEB, 0xFC, 0xEB, 0x56, 0x10, 0xE5, 0x2C, 0x1A, 0x5D, 0xEF, 0xBE, 0x4F, 0x08, 0x75,
|
||||
0x97, 0x4B, 0x0E, 0x25, 0x8E, 0x6E, 0x39, 0x5A, 0x87, 0x53, 0xC4, 0x1F, 0xF4, 0x5C, 0x4E, 0xE6, 0x99, 0x30,
|
||||
0xE0, 0x42, 0x88, 0xAB, 0xE5, 0x85, 0xBC, 0x8F, 0xD8, 0x3C, 0x54, 0xC9, 0x53, 0x47, 0x18, 0xD6, 0x06, 0x5B,
|
||||
@@ -298,10 +298,10 @@ public class CSS
|
||||
0x6E, 0x84, 0x56, 0x68, 0xF4, 0x0E, 0x03, 0x64, 0xD0, 0xA9, 0x92, 0x2F, 0x8B, 0xBC, 0x39, 0x9C, 0xAC, 0x09,
|
||||
0x5E, 0xEE, 0xE5, 0x97, 0xBF, 0xA5, 0xCE, 0xFA, 0x28, 0x2C, 0x6D, 0x4F, 0xEF, 0x77, 0xAA, 0x1B, 0x79, 0x8E,
|
||||
0x97, 0xB4, 0xC3, 0xF4
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _encryptTable2 =
|
||||
{
|
||||
[
|
||||
0xB7, 0x75, 0x81, 0xD5, 0xDC, 0xCA, 0xDE, 0x66, 0x23, 0xDF, 0x15, 0x26, 0x62, 0xD1, 0x83, 0x77, 0xE3, 0x97,
|
||||
0x76, 0xAF, 0xE9, 0xC3, 0x6B, 0x8E, 0xDA, 0xB0, 0x6E, 0xBF, 0x2B, 0xF1, 0x19, 0xB4, 0x95, 0x34, 0x48, 0xE4,
|
||||
0x37, 0x94, 0x5D, 0x7B, 0x36, 0x5F, 0x65, 0x53, 0x07, 0xE2, 0x89, 0x11, 0x98, 0x85, 0xD9, 0x12, 0xC1, 0x9D,
|
||||
@@ -317,10 +317,10 @@ public class CSS
|
||||
0xCD, 0x2E, 0xFF, 0xC4, 0x5B, 0xA0, 0xAE, 0xCC, 0x4B, 0x3B, 0x03, 0xBB, 0x1C, 0x2A, 0xAC, 0x0C, 0x3F, 0x93,
|
||||
0xC7, 0x72, 0x7A, 0x09, 0x22, 0x3D, 0x45, 0x78, 0xA9, 0xA8, 0xEA, 0xC9, 0x6A, 0xF7, 0x29, 0x91, 0xF0, 0x02,
|
||||
0x18, 0x3A, 0x4E, 0x7C
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _encryptTable3 =
|
||||
{
|
||||
[
|
||||
0x73, 0x51, 0x95, 0xE1, 0x12, 0xE4, 0xC0, 0x58, 0xEE, 0xF2, 0x08, 0x1B, 0xA9, 0xFA, 0x98, 0x4C, 0xA7, 0x33,
|
||||
0xE2, 0x1B, 0xA7, 0x6D, 0xF5, 0x30, 0x97, 0x1D, 0xF3, 0x02, 0x60, 0x5A, 0x82, 0x0F, 0x91, 0xD0, 0x9C, 0x10,
|
||||
0x39, 0x7A, 0x83, 0x85, 0x3B, 0xB2, 0xB8, 0xAE, 0x0C, 0x09, 0x52, 0xEA, 0x1C, 0xE1, 0x8D, 0x66, 0x4F, 0xF3,
|
||||
@@ -337,7 +337,7 @@ public class CSS
|
||||
0x16, 0x83, 0x7D, 0xEE, 0xF5, 0xCA, 0xC5, 0x18, 0xF9, 0xD8, 0x68, 0xAB, 0x38, 0x85, 0xA8, 0xF0, 0xA1, 0x73,
|
||||
0x9F, 0x5D, 0x19, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x72, 0x39, 0x25, 0x67, 0x26,
|
||||
0x6D, 0x71, 0x36, 0x77, 0x3C, 0x20, 0x62, 0x23, 0x68, 0x74, 0xC3, 0x82, 0xC9, 0x15, 0x57, 0x16, 0x5D, 0x81
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[,] _permutationChallenge =
|
||||
{
|
||||
@@ -365,15 +365,12 @@ public class CSS
|
||||
};
|
||||
|
||||
static readonly byte[] _variants =
|
||||
{
|
||||
[
|
||||
0xB7, 0x74, 0x85, 0xD0, 0xCC, 0xDB, 0xCA, 0x73, 0x03, 0xFE, 0x31, 0x03, 0x52, 0xE0, 0xB7, 0x42, 0x63, 0x16,
|
||||
0xF2, 0x2A, 0x79, 0x52, 0xFF, 0x1B, 0x7A, 0x11, 0xCA, 0x1A, 0x9B, 0x40, 0xAD, 0x01
|
||||
};
|
||||
];
|
||||
|
||||
static readonly byte[] _secret =
|
||||
{
|
||||
0x55, 0xD6, 0xC4, 0xC5, 0x28
|
||||
};
|
||||
static readonly byte[] _secret = [0x55, 0xD6, 0xC4, 0xC5, 0x28];
|
||||
|
||||
/// <summary>
|
||||
/// The disc key returned by the logical unit is encoded with the bus key to prevent man-in-the-middle attacks.
|
||||
|
||||
@@ -49,7 +49,7 @@ public sealed class Dump(Device dev)
|
||||
const string MODULE_NAME = "DVD decryption";
|
||||
|
||||
public byte Agid { get; private set; }
|
||||
public byte[] BusKey { get; private set; } = Array.Empty<byte>();
|
||||
public byte[] BusKey { get; private set; } = [];
|
||||
|
||||
/// <summary>Returns the Authentication Success Flag of the logical unit.</summary>
|
||||
/// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
|
||||
@@ -127,7 +127,7 @@ public sealed class Dump(Device dev)
|
||||
{
|
||||
senseBuffer = new byte[64];
|
||||
var cdb = new byte[12];
|
||||
buffer = Array.Empty<byte>();
|
||||
buffer = [];
|
||||
|
||||
cdb[0] = (byte)ScsiCommands.ReportKey;
|
||||
cdb[7] = (byte)keyClass;
|
||||
@@ -366,7 +366,7 @@ public sealed class Dump(Device dev)
|
||||
out double duration)
|
||||
{
|
||||
duration = 0;
|
||||
buffer = Array.Empty<byte>();
|
||||
buffer = [];
|
||||
senseBuffer = new byte[64];
|
||||
|
||||
var sense = false;
|
||||
@@ -435,7 +435,7 @@ public sealed class Dump(Device dev)
|
||||
|
||||
if(i < 31) continue;
|
||||
|
||||
senseBuffer = Array.Empty<byte>();
|
||||
senseBuffer = [];
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -131,17 +131,13 @@ public class Mpeg
|
||||
|
||||
#endregion
|
||||
|
||||
static readonly byte[] _mpeg2PackHeaderStartCode =
|
||||
{
|
||||
0x0, 0x0, 0x1
|
||||
};
|
||||
static readonly byte[] _mpeg2PackHeaderStartCode = [0x0, 0x0, 0x1];
|
||||
|
||||
public static bool ContainsMpegPackets(byte[] sectorData, uint blocks = 1, uint blockSize = 2048)
|
||||
{
|
||||
for(uint i = 0; i < blocks; i++)
|
||||
{
|
||||
if(IsMpegPacket(sectorData.Skip((int)(i * blockSize)))) return true;
|
||||
}
|
||||
if(IsMpegPacket(sectorData.Skip((int)(i * blockSize))))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user