ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-31 08:25:39 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Last changes that resolve remaining spotbugs issues

Browse Source
This commit is contained in:
Cyrus 2024-01-19 07:45:36 -05:00
parent 575baa3409
commit 60729164c8
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HIRS_Utils/config/spotbugs/spotbugs-exclude.xml
View File

@ -2,7 +2,10 @@
<!-- Docs at http://findbugs.sourceforge.net/manual/filter.html --> <!-- Docs at http://findbugs.sourceforge.net/manual/filter.html -->
<FindBugsFilter> <FindBugsFilter>
<Match> <Match>
<Package name="~hirs\.utils.xjc.*" /> <Package name="~hirs\.utils.xjc.*" />
</Match>
<Match>
<Package name="~hirs\.utils.rim.*" />
</Match> </Match>
<Match> <Match>
<!-- https://github.com/spotbugs/spotbugs/pull/2748 --> <!-- https://github.com/spotbugs/spotbugs/pull/2748 -->

11
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvEfiSpecIdEvent.java
View File

@ -48,40 +48,46 @@ import java.util.List;
* 6. The version of the log is used to determine which format the Log * 6. The version of the log is used to determine which format the Log
* is to use (sha1 or Crypto Agile) * is to use (sha1 or Crypto Agile)
*/ */
@Getter
public class EvEfiSpecIdEvent { public class EvEfiSpecIdEvent {
/** /**
* Minor Version. * Minor Version.
*/ */
@Getter
private String versionMinor = ""; private String versionMinor = "";
/** /**
* Major Version. * Major Version.
*/ */
@Getter
private String versionMajor = ""; private String versionMajor = "";
/** /**
* Specification errata version. * Specification errata version.
*/ */
@Getter
private String errata = ""; private String errata = "";
/** /**
* Signature (text) data. * Signature (text) data.
*/ */
@Getter
private String signature = ""; private String signature = "";
/** /**
* Platform class. * Platform class.
*/ */
@Getter
private String platformClass = ""; private String platformClass = "";
/** /**
* Algorithm count. * Algorithm count.
*/ */
@Getter
private int numberOfAlg = 0; private int numberOfAlg = 0;
/** /**
* True if event log uses Crypto Agile format. * True if event log uses Crypto Agile format.
*/ */
@Getter
private boolean cryptoAgile = false; private boolean cryptoAgile = false;
/** /**
* Algorithm list. * Algorithm list.
*/ */
private List<String> algList = new ArrayList<String>(); private List<String> algList;
/** /**
* EvEfiSpecIdEvent Constructor. * EvEfiSpecIdEvent Constructor.
@ -89,6 +95,7 @@ public class EvEfiSpecIdEvent {
* @param efiSpecId byte array holding the spec ID Event. * @param efiSpecId byte array holding the spec ID Event.
*/ */
public EvEfiSpecIdEvent(final byte[] efiSpecId) { public EvEfiSpecIdEvent(final byte[] efiSpecId) {
algList = new ArrayList<>();
byte[] signatureBytes = new byte[UefiConstants.SIZE_16]; byte[] signatureBytes = new byte[UefiConstants.SIZE_16];
System.arraycopy(efiSpecId, 0, signatureBytes, 0, UefiConstants.SIZE_16); System.arraycopy(efiSpecId, 0, signatureBytes, 0, UefiConstants.SIZE_16);
signature = HexUtils.byteArrayToHexString(signatureBytes); signature = HexUtils.byteArrayToHexString(signatureBytes);

1
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiVariable.java
View File

@ -32,7 +32,6 @@ public class UefiVariable {
/** /**
* List of Signature lists. * List of Signature lists.
*/ */
@Getter
private List<UefiSignatureList> certSuperList; private List<UefiSignatureList> certSuperList;
/** /**
* Name of the UEFI variable. * Name of the UEFI variable.