ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-18 02:39:56 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Cleaned up some stuff I found during code compare in github.

Browse Source
This commit is contained in:
Cyrus 2021-01-20 13:23:51 -05:00
parent acc022d784
commit 5589096443
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java
View File

@ -806,7 +806,7 @@ public abstract class AbstractAttestationCertificateAuthority
support.setTagId(tagId);
this.referenceManifestManager.save(support);
} else {
LOG.info("Client provided Support RIM already loaded in database.");
LOG.info("Client provided Support RIM already loaded in database.");
if (dbBaseRim != null) {
support.setPlatformManufacturer(dbBaseRim.getPlatformManufacturer());
support.setPlatformModel(dbBaseRim.getPlatformModel());

13
HIRS_Utils/src/main/java/hirs/data/persist/certificate/attributes/ComponentIdentifier.java
View File

@ -288,18 +288,7 @@ public class ComponentIdentifier {
return Collections.unmodifiableList(addresses);
}
//
// @Override
// public boolean equals(Object o) {
// if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false;
// ComponentIdentifier that = (ComponentIdentifier) o;
// return componentManufacturer.equals(that.componentManufacturer)
// && componentModel.equals(that.componentModel) && Objects.equals
// (componentSerial, that.componentSerial) && Objects.equals(componentRevision,
// that.componentRevision);
// }
//
@Override
public int hashCode() {
return Objects.hash(componentManufacturer, componentModel,

3
HIRS_Utils/src/main/java/hirs/data/persist/info/ComponentInfo.java
View File

@ -111,8 +111,7 @@ public class ComponentInfo implements Serializable {
componentManufacturer,
componentModel,
componentSerial,
componentRevision
));
componentRevision));
this.componentManufacturer = componentManufacturer.trim();
this.componentModel = componentModel.trim();
if (componentSerial != null) {