Skip to content

Fixups #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritzbuhl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixups #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65a079a
Use 2**31-1 for INT_MAX fallback.
moritzbuhl Jun 8, 2026
835f345
Add missing newline characters.
moritzbuhl Jun 8, 2026
783cf89
HASH_ALG_PARSER can set ret_val, check it.
moritzbuhl Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions eltt2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ int main(int argc, char **argv)
case 'a': // TPM2_HashSequenceStart SHA-1/256/384
case 'A': // TPM2_HashSequenceStart SHA-256
HASH_ALG_PARSER('a', 3);
RET_VAL_CHECK(ret_val);

ret_val = create_hash_sequence(optarg, hash_algo, tpm_response_buf, &tpm_response_buf_size);
break;
Expand Down Expand Up @@ -141,6 +142,7 @@ int main(int argc, char **argv)
}

HASH_ALG_PARSER('e', 4);
RET_VAL_CHECK(ret_val);

// Allocate the input buffer for pcr_extend and tpmtool_transmit.
if (ALG_SHA1 == hash_algo)
Expand Down Expand Up @@ -202,6 +204,7 @@ int main(int argc, char **argv)

case 'l': // PCR_Allocate SHA-1/256/384
HASH_ALG_PARSER('l', -1);
RET_VAL_CHECK(ret_val);

// Allocate the input buffer for pcr_read and tpmtool_transmit.
input_bytes_size = sizeof(tpm2_pcr_allocate);
Expand All @@ -220,6 +223,7 @@ int main(int argc, char **argv)
case 'r': // PCR_Read SHA-1/256/384
case 'R': // PCR_Read SHA-256
HASH_ALG_PARSER('r', 3);
RET_VAL_CHECK(ret_val);

// Allocate the input buffer for pcr_read and tpmtool_transmit.
input_bytes_size = sizeof(tpm2_pcr_read);
Expand All @@ -238,6 +242,7 @@ int main(int argc, char **argv)
case 's': // Hash SHA-1/256/384
case 'S': // Hash SHA-256
HASH_ALG_PARSER('s', 3);
RET_VAL_CHECK(ret_val);

// Allocate the input buffer for create_hash and tpmtool_transmit.
input_bytes_size = strlen(optarg) / HEX_BYTE_STRING_LENGTH + strlen(optarg) % HEX_BYTE_STRING_LENGTH + sizeof(tpm2_hash);
Expand Down Expand Up @@ -425,25 +430,25 @@ int tpmtool_transmit(const uint8_t *buf, ssize_t length, uint8_t *response, ssiz
if (0 >= length)
{
ret_val = EINVAL;
fprintf(stderr, "Bad parameter. Value of parameter 'length' must be larger than 0.");
fprintf(stderr, "Bad parameter. Value of parameter 'length' must be larger than 0.\n");
break;
}
if (TPM_REQ_MAX_SIZE < length)
{
ret_val = EINVAL;
fprintf(stderr, "Bad parameter. Value of parameter 'length' must be smaller than or equal to %u.", TPM_REQ_MAX_SIZE);
fprintf(stderr, "Bad parameter. Value of parameter 'length' must be smaller than or equal to %u.\n", TPM_REQ_MAX_SIZE);
break;
}
if (TPM_CMD_HEADER_SIZE >= *resp_length)
{
ret_val = EINVAL;
fprintf(stderr, "Bad parameter. Value of parameter '*resp_length' must be at least %u.", TPM_CMD_HEADER_SIZE);
fprintf(stderr, "Bad parameter. Value of parameter '*resp_length' must be at least %u.\n", TPM_CMD_HEADER_SIZE);
break;
}
if (TPM_RESP_MAX_SIZE < *resp_length)
{
ret_val = EINVAL;
fprintf(stderr, "Bad parameter. Value of parameter '*resp_length' must be smaller than or equal to %u.", TPM_RESP_MAX_SIZE);
fprintf(stderr, "Bad parameter. Value of parameter '*resp_length' must be smaller than or equal to %u.\n", TPM_RESP_MAX_SIZE);
break;
}

Expand Down Expand Up @@ -555,7 +560,7 @@ static int response_print(uint8_t *response_buf, size_t resp_size, int option)
if (0 >= resp_size)
{
ret_val = EINVAL;
fprintf(stderr, "Bad parameter. Value of parameter 'resp_size' must be larger than 0.");
fprintf(stderr, "Bad parameter. Value of parameter 'resp_size' must be larger than 0.\n");
break;
}
if (TPM_RESP_MAX_SIZE < resp_size)
Expand Down Expand Up @@ -644,7 +649,7 @@ static int print_response_buf(uint8_t *response_buf, size_t resp_size, uint32_t
if (0 >= resp_size)
{
ret_val = EINVAL;
fprintf(stderr, "Bad parameter. Value of parameter 'resp_size' must be larger than 0.");
fprintf(stderr, "Bad parameter. Value of parameter 'resp_size' must be larger than 0.\n");
break;
}
if (TPM_RESP_MAX_SIZE < resp_size)
Expand Down
2 changes: 1 addition & 1 deletion eltt2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
#define TPM_CMD_SIZE_OFFSET 2 ///< The offset of a TPM command's size value is 2 bytes.
#define HEX_BYTE_STRING_LENGTH 2 ///< A byte can be represented by two hexadecimal characters.
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFF ///< The maximum value of a signed 32-bit integer.
#define INT_MAX 0x7FFFFFFF ///< The maximum value of a signed 32-bit integer.
#endif
// TPM Return codes
#define TPM_RC_SUCCESS 0x00000000 ///< The response error code for TPM_SUCCESS.
Expand Down