ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-18 20:47:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

checking null object

Browse Source
This commit is contained in:
iadgovuser58 2024-08-09 11:47:11 -04:00
parent d858246ce0
commit a5b9cd7ad9
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataSubHeaderCertChain.java
View File

@ -42,7 +42,7 @@ public class DeviceSecurityEventDataSubHeaderCertChain extends DeviceSecurityEve
/** /**
* Human-readable description of any error associated with SPDM base hash alg. * Human-readable description of any error associated with SPDM base hash alg.
*/ */
String spdmBaseHashAlgoError = ""; String spdmCertChainError = "";
/** /**
* DeviceSecurityEventDataSubHeaderCertChain Constructor. * DeviceSecurityEventDataSubHeaderCertChain Constructor.
@ -75,11 +75,16 @@ public class DeviceSecurityEventDataSubHeaderCertChain extends DeviceSecurityEve
int spdmBaseHashAlgoSize = SpdmHa.tcgAlgIdToByteSize(spdmBaseHashAlgo); int spdmBaseHashAlgoSize = SpdmHa.tcgAlgIdToByteSize(spdmBaseHashAlgo);
if(spdmBaseHashAlgoSize > 0) { if(spdmCertChainSize <= 0) {
spdmCertChain = new SpdmCertificateChain(spdmCertChainBytes, spdmBaseHashAlgoSize); spdmCertChainError += "SPDM cert chain length is not >0, " +
"stopping cert chain processing";
} }
else { else if(spdmBaseHashAlgoSize <= 0) {
spdmBaseHashAlgoError += "SPDM base hash algorithm size is not >0"; spdmCertChainError += "SPDM base hash algorithm size is not >0 " +
"stopping cert chain processing";
}
if(spdmCertChainError.isEmpty()) {
spdmCertChain = new SpdmCertificateChain(spdmCertChainBytes, spdmBaseHashAlgoSize);
} }
} }
@ -96,7 +101,15 @@ public class DeviceSecurityEventDataSubHeaderCertChain extends DeviceSecurityEve
dsedSubHeaderInfo += " SPDM Base Hash Algorithm = " + spdmBaseHashAlgoStr + "\n"; dsedSubHeaderInfo += " SPDM Base Hash Algorithm = " + spdmBaseHashAlgoStr + "\n";
// SPDM Certificate Chain output // SPDM Certificate Chain output
dsedSubHeaderInfo += spdmCertChain.toString(); if(!spdmCertChainError.isEmpty()) {
dsedSubHeaderInfo += " SPDM cert chain error: " + spdmCertChainError;
}
else if(spdmCertChain == null) {
dsedSubHeaderInfo += " SPDM cert chain error: Could not parse cert chain\n";
}
else {
dsedSubHeaderInfo += spdmCertChain.toString();
}
return dsedSubHeaderInfo; return dsedSubHeaderInfo;
} }