ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-29 15:44:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[#135] Fix DeviceInfoCollector's handling of C-Style Strings

Browse Source
This commit is contained in:
apldev3 2019-05-10 12:34:52 -04:00 committed by apldev6
parent 3bebec1154
commit d26a3da5ea
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
HIRS_Utils/src/main/java/hirs/client/collector/DeviceInfoCollector.java
View File

@ -293,10 +293,15 @@ public class DeviceInfoCollector extends AbstractCollector {
&& tokens[VERSION_INDEX].equals("Version")) {
String[] versionTokens = tokens[VERSION_TOKEN_INDEX].split("\\.");
if (versionTokens.length == VERSION_TOKEN_LENGTH) {
tpmVersionMajor = Short.parseShort(versionTokens[TPM_MAJOR_INDEX]);
tpmVersionMinor = Short.parseShort(versionTokens[TPM_MINOR_INDEX]);
tpmVersionRevMajor = Short.parseShort(versionTokens[TPM_REV_MAJOR_INDEX]);
tpmVersionRevMinor = Short.parseShort(versionTokens[TPM_REV_MINOR_INDEX]);
// Trim version tokens to avoid C-style strings w/ null characters
tpmVersionMajor = Short.parseShort(
versionTokens[TPM_MAJOR_INDEX].trim());
tpmVersionMinor = Short.parseShort(
versionTokens[TPM_MINOR_INDEX].trim());
tpmVersionRevMajor = Short.parseShort(
versionTokens[TPM_REV_MAJOR_INDEX].trim());
tpmVersionRevMinor = Short.parseShort(
versionTokens[TPM_REV_MINOR_INDEX].trim());
LOGGER.debug("Found TPM version {}.{}.{}.{}",
tpmVersionMajor, tpmVersionMinor,
tpmVersionRevMajor, tpmVersionRevMinor);