Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit c2355b51 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Hashing Tool: include tyres in integrity checks

parent da3e090e
Branches
Tags
No related merge requests found
...@@ -103,7 +103,6 @@ namespace HashingTool.ViewModel.UserControl ...@@ -103,7 +103,6 @@ namespace HashingTool.ViewModel.UserControl
if (entry.Component.StartsWith("Axle ")) { if (entry.Component.StartsWith("Axle ")) {
entry.Component = entry.Component.Replace("Axle", "Tyre"); entry.Component = entry.Component.Replace("Axle", "Tyre");
entry.CertificationNumber = ReadElementValue(node, XMLNames.Report_Tyre_TyreCertificationNumber); entry.CertificationNumber = ReadElementValue(node, XMLNames.Report_Tyre_TyreCertificationNumber);
entry.DigestValue = "Not Available";
} else { } else {
entry.CertificationNumber = ReadElementValue(node, XMLNames.Report_Component_CertificationNumber) ?? entry.CertificationNumber = ReadElementValue(node, XMLNames.Report_Component_CertificationNumber) ??
ReadElementValue(node, XMLNames.Report_Component_CertificationMethod); ReadElementValue(node, XMLNames.Report_Component_CertificationMethod);
...@@ -116,9 +115,7 @@ namespace HashingTool.ViewModel.UserControl ...@@ -116,9 +115,7 @@ namespace HashingTool.ViewModel.UserControl
if (!jobComponent.Any()) { if (!jobComponent.Any()) {
continue; continue;
} }
entry.DigestValueMatchesJobComponent = entry.Component.StartsWith("Tyre ") entry.DigestValueMatchesJobComponent = jobComponent.First().DigestValueComputed == entry.DigestValue;
? (bool?)null
: (jobComponent.First().DigestValueComputed == entry.DigestValue);
entry.DigestValueExpected = jobComponent.First().DigestValueComputed; entry.DigestValueExpected = jobComponent.First().DigestValueComputed;
if (entry.CertificationMethod == CertificationMethod.StandardValues.ToXMLFormat()) { if (entry.CertificationMethod == CertificationMethod.StandardValues.ToXMLFormat()) {
...@@ -134,9 +131,7 @@ namespace HashingTool.ViewModel.UserControl ...@@ -134,9 +131,7 @@ namespace HashingTool.ViewModel.UserControl
var certificationNumberMismatch = var certificationNumberMismatch =
componentData.Where( componentData.Where(
x => x.CertificationNumberMatchesJobComponent != null && !x.CertificationNumberMatchesJobComponent.Value).ToArray(); x => x.CertificationNumberMatchesJobComponent != null && !x.CertificationNumberMatchesJobComponent.Value).ToArray();
var digestMismatch = var digestMismatch = componentData.Where(x => x.DigestValueMatchesJobComponent == null || !x.DigestValueMatchesJobComponent.Value).ToArray();
componentData.Where(x => !x.Component.StartsWith("Tyre "))
.Where(x => x.DigestValueMatchesJobComponent == null || !x.DigestValueMatchesJobComponent.Value).ToArray();
if (jobComponents.Any()) { if (jobComponents.Any()) {
foreach (var entry in certificationNumberMismatch) { foreach (var entry in certificationNumberMismatch) {
_validationErrors.Add( _validationErrors.Add(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment