RepoMirrors/DSInternals
1
0
Fork 0
mirror of https://github.com/MichaelGrafnetter/DSInternals synced 2025-02-13 09:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved PEK list decryption exception handling

Browse Source
This commit is contained in:
Michael Grafnetter 2019-03-02 09:04:25 +01:00
parent 2c6d9a5a86
commit 2796f5d773
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/CHANGELOG.md
View File

@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. The format
- A more explanatory exception is now thrown when opening databases that originate from different OS versions.
- A more explanatory exception is now thrown when the *Universal C Runtime* is missing from Windows.
- A more explanatory exception is now thrown when the assemblies are blocked.
- PEK list decryption exceptions now contain troubleshooting data.
- Minor improvement in C++ build speed.
## [3.2.1] - 2019-01-04

20
Src/DSInternals.DataStore/Cryptography/DataStoreSecretDecryptor.cs
View File

@ -70,10 +70,22 @@ namespace DSInternals.DataStore
public DataStoreSecretDecryptor(byte[] encryptedPEKListBlob, byte[] bootKey)
{
// Decrypt and set version
byte[] decryptedPekList = this.DecryptPekList(encryptedPEKListBlob, bootKey);
// Parse the inner structure
this.ParsePekList(decryptedPekList);
try
{
// Decrypt and set version
byte[] decryptedPekList = this.DecryptPekList(encryptedPEKListBlob, bootKey);
// Parse the inner structure
this.ParsePekList(decryptedPekList);
}
catch(Exception originalException)
{
// TODO: Extract as resource
var newException = new FormatException("Could not decrypt or parse the PEK list.", originalException);
newException.Data.Add(nameof(encryptedPEKListBlob), encryptedPEKListBlob.ToHex());
newException.Data.Add(nameof(bootKey), bootKey.ToHex());
throw newException;
}
}
public DataStoreSecretDecryptor(byte[] cleartextPEKListBlob, PekListVersion version)