Extract shared contract, drop BinaryFormatter wire, modernize to net8/x64
Make the Console<->Launcher system source-built and modern now that the console is under our control and the WinXP-era pods are gone. Contract extraction (Contract/Tesla.Contract.csproj): - One multi-targeted (net48;net8.0-windows) source project for the RPC contract, replacing the vendored TeslaConsoleLaunchLib.dll and the hand-synced Tesla.Net replica in Launcher/LaunchModels_Shared.cs. Emits assembly TeslaConsoleLaunchLib. SecureConfig extraction (SecureConfig/Tesla.SecureConfig.csproj): - net48 source of the first-boot provisioning protocol (UDP beacons, OFB crypto, RSA key exchange), replacing the vendored TeslaSecureConfiguration.dll. Remove BinaryFormatter from the wire (RCE sink + the reason net6 was pinned): - Console<->Launcher RPC is now length-prefixed System.Text.Json frames (Contract/PodRpcProtocol.cs) over the unchanged OFB transport; dispatch by method name. Deleted the SerializationBinder / MethodInfoProxy machinery. - Console-local BinaryFormatter (Site config, mission replays) intentionally retained: local net48 file I/O, not the network surface. Runtime modernization: - Launcher Service + Agent: net6 -> net8, win-x86 -> win-x64 (all pods are 64-bit Win10). Kept the SHA1-default PBKDF2 (Console key-derivation compat) with SYSLIB0041 suppressed and documented. Tests: differential suite now 73 green. Added SecureConfigCompatTests (OFB ciphertext byte-identical to the vendored DLL) and PodRpcProtocolTests (JSON round-trip of every request/response shape); removed the now-obsolete BinaryFormatter byte-identity guard. Build hygiene: per-project obj dirs (Launcher/Directory.Build.props) fix a NuGet restore collision between the two Launcher projects sharing one folder. NOT runtime-verified against a live pod. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -196,13 +196,20 @@ namespace TeslaSecureConfig
|
||||
// ---- Crypto helpers ----
|
||||
internal static class CryptoHelper
|
||||
{
|
||||
/// Derive AES key from passphrase using PBKDF2 with the hard-coded salt
|
||||
/// Derive AES key from passphrase using PBKDF2 with the hard-coded salt.
|
||||
/// COMPATIBILITY: this MUST use the SHA1-default Rfc2898DeriveBytes(string,
|
||||
/// byte[], int) overload. The Console derives the same session key with the
|
||||
/// identical SHA1-default PBKDF2 (Tesla.PodConfigurationServer.GenerateKeyFromPassphrase),
|
||||
/// so switching to a SHA256 overload — as SYSLIB0041 suggests on net8 — would
|
||||
/// silently break the secure-config key handshake. Do not "modernize" this.
|
||||
#pragma warning disable SYSLIB0041 // SHA1-default PBKDF2 is required for Console wire compatibility
|
||||
public static byte[] DeriveKey(string passphrase)
|
||||
{
|
||||
var pbkdf2 = new Rfc2898DeriveBytes(passphrase,
|
||||
Proto.PassphraseSalt, Proto.Pbkdf2Iterations);
|
||||
return pbkdf2.GetBytes(Proto.AesKeyBytes);
|
||||
}
|
||||
#pragma warning restore SYSLIB0041
|
||||
|
||||
/// Encrypt data with AES-256 (CBC mode)
|
||||
public static byte[] Encrypt(byte[] data, byte[] key)
|
||||
|
||||
Reference in New Issue
Block a user