Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-07-18 16:21:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add hash validation

Browse Source
This commit is contained in:
Kurt 2020-03-27 19:19:20 -07:00
parent 380f019d40
commit 104f38fb30
7 changed files with 70 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NHSE.Core/Hashing/FileHashRegion.cs
View File

@ -25,6 +25,8 @@
/// </summary>
public int EndOffset => BeginOffset + Size;
public override string ToString() => $"{HashOffset:X}: ({BeginOffset:X}-{EndOffset})";
public FileHashRegion(int hashOfs, int begOfs, int size)
{
HashOffset = hashOfs;

3
NHSE.Core/Hashing/Murmur3.cs
View File

@ -66,7 +66,8 @@ public static uint GetMurmur3Hash(byte[] data, int offset, uint size, uint seed
public static uint UpdateMurmur32(byte[] data, int hashOffset, int readOffset, uint readSize)
{
var newHash = GetMurmur3Hash(data, readOffset, readSize);
Array.Copy(BitConverter.GetBytes(newHash), 0, data, hashOffset, 4);
var hashBytes = BitConverter.GetBytes(newHash);
hashBytes.CopyTo(data, hashOffset);
return newHash;
}

17
NHSE.Core/Save/Meta/EncryptedFilePair.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
@ -54,6 +55,22 @@ public void Hash()
Murmur3.UpdateMurmur32(Data, h.HashOffset, h.BeginOffset, (uint)h.Size);
}
public IEnumerable<FileHashRegion> InvalidHashes()
{
var ver = Info.GetKnownRevisionIndex();
var hash = RevisionChecker.HashInfo[ver];
var details = hash.GetFile(NameData);
if (details == null)
throw new ArgumentNullException(nameof(NameData));
foreach (var h in details.HashRegions)
{
var current = Murmur3.GetMurmur3Hash(Data, h.BeginOffset, (uint)h.Size);
var saved = BitConverter.ToUInt32(Data, h.HashOffset);
if (current != saved)
yield return h;
}
}
public string GetString(int offset, int maxLength)
{
var str = Encoding.Unicode.GetString(Data, offset, maxLength * 2);

10
NHSE.Core/Save/Meta/HorizonSave.cs
View File

@ -1,4 +1,7 @@
namespace NHSE.Core
using System.Collections.Generic;
using System.Linq;
namespace NHSE.Core
{
public class HorizonSave
{
@ -22,5 +25,10 @@ public void Save(uint seed)
player.Save(seed);
}
}
public IEnumerable<FileHashRegion> GetInvalidHashes()
{
return Main.InvalidHashes().Concat(Players.SelectMany(z => z.InvalidHashes()));
}
}
}

12
NHSE.Core/Save/Meta/Player.cs
View File

@ -1,4 +1,6 @@
using System.IO;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace NHSE.Core
{
@ -49,5 +51,13 @@ public void Hash()
PostBox.Hash();
Profile.Hash();
}
public IEnumerable<FileHashRegion> InvalidHashes()
{
return Personal.InvalidHashes()
.Concat(Photo.InvalidHashes())
.Concat(PostBox.InvalidHashes())
.Concat(Profile.InvalidHashes());
}
}
}

16
NHSE.WinForms/Editor.Designer.cs generated
View File

@ -66,6 +66,7 @@ private void InitializeComponent()
this.PB_Villager = new System.Windows.Forms.PictureBox();
this.L_VillagerID = new System.Windows.Forms.Label();
this.NUD_Villager = new System.Windows.Forms.NumericUpDown();
this.Menu_VerifyHashes = new System.Windows.Forms.ToolStripMenuItem();
this.Menu_Editor.SuspendLayout();
this.TC_Editors.SuspendLayout();
this.Tab_Players.SuspendLayout();
@ -119,7 +120,8 @@ private void InitializeComponent()
// Menu_Tools
//
this.Menu_Tools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Menu_DumpDecrypted});
this.Menu_DumpDecrypted,
this.Menu_VerifyHashes});
this.Menu_Tools.Name = "Menu_Tools";
this.Menu_Tools.Size = new System.Drawing.Size(46, 20);
this.Menu_Tools.Text = "Tools";
@ -127,7 +129,7 @@ private void InitializeComponent()
// Menu_DumpDecrypted
//
this.Menu_DumpDecrypted.Name = "Menu_DumpDecrypted";
this.Menu_DumpDecrypted.Size = new System.Drawing.Size(164, 22);
this.Menu_DumpDecrypted.Size = new System.Drawing.Size(180, 22);
this.Menu_DumpDecrypted.Text = "Dump Decrypted";
this.Menu_DumpDecrypted.Click += new System.EventHandler(this.Menu_DumpDecrypted_Click);
//
@ -160,7 +162,7 @@ private void InitializeComponent()
this.Tab_Players.Location = new System.Drawing.Point(4, 22);
this.Tab_Players.Name = "Tab_Players";
this.Tab_Players.Padding = new System.Windows.Forms.Padding(3);
this.Tab_Players.Size = new System.Drawing.Size(476, 211);
this.Tab_Players.Size = new System.Drawing.Size(396, 211);
this.Tab_Players.TabIndex = 1;
this.Tab_Players.Text = "Players";
this.Tab_Players.UseVisualStyleBackColor = true;
@ -469,6 +471,13 @@ private void InitializeComponent()
0});
this.NUD_Villager.ValueChanged += new System.EventHandler(this.LoadVillager);
//
// Menu_VerifyHashes
//
this.Menu_VerifyHashes.Name = "Menu_VerifyHashes";
this.Menu_VerifyHashes.Size = new System.Drawing.Size(180, 22);
this.Menu_VerifyHashes.Text = "Verify Hashes";
this.Menu_VerifyHashes.Click += new System.EventHandler(this.Menu_VerifyHashes_Click);
//
// Editor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -542,6 +551,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label L_ExternalName;
private System.Windows.Forms.ContextMenuStrip CM_Picture;
private System.Windows.Forms.ToolStripMenuItem Menu_SavePNG;
private System.Windows.Forms.ToolStripMenuItem Menu_VerifyHashes;
}
}

16
NHSE.WinForms/Editor.cs
View File

@ -41,6 +41,22 @@ private void Menu_DumpDecrypted_Click(object sender, EventArgs e)
System.Media.SystemSounds.Asterisk.Play();
}
private void Menu_VerifyHashes_Click(object sender, EventArgs e)
{
var result = SAV.GetInvalidHashes().ToArray();
if (result.Length == 0)
{
WinFormsUtil.Alert("Hashes are valid.");
return;
}
if (WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Export results to clipboard?") != DialogResult.Yes)
return;
var lines = result.Select(z => z.ToString());
Clipboard.SetText(string.Join(Environment.NewLine, lines));
}
private void LoadAll()
{
LoadPlayers();