Skip to content
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

Jump to bottom

Added example for NV counter increment and Fixes for NV auth handling #243

Merged
merged 3 commits into from
Oct 4, 2022
Merged

Added example for NV counter increment and Fixes for NV auth handling #243

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
fac5123
Added example for NV counter increment. Fixes for NV auth handling.
dgarske Sep 16, 2022
41e5750
Peer review fixes. Cleanups for return code checking, stdlib function…
dgarske Oct 4, 2022
032f10d
Fix for keyed hash with HMAC.
dgarske Oct 4, 2022
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ examples/keygen/keygen
examples/keygen/keyimport
examples/nvram/store
examples/nvram/read
examples/nvram/counter
examples/gpio/gpio_config
examples/gpio/gpio_set
examples/gpio/gpio_read
Expand Down
5 changes: 4 additions & 1 deletion examples/bench/bench.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,12 @@ int TPM2_Wrapper_BenchArgs(void* userCtx, int argc, char *argv[])
if (XSTRCMP(argv[argc-1], "-aes") == 0) {
paramEncAlg = TPM_ALG_CFB;
}
if (XSTRCMP(argv[argc-1], "-xor") == 0) {
else if (XSTRCMP(argv[argc-1], "-xor") == 0) {
paramEncAlg = TPM_ALG_XOR;
}
else {
printf("Warning: Unrecognized option: %s\n", argv[argc-1]);
}
argc--;
}

Expand Down
3 changes: 3 additions & 0 deletions examples/csr/csr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ int TPM2_CSR_ExampleArgs(void* userCtx, int argc, char *argv[])
if (XSTRCMP(argv[argc-1], "-cert") == 0) {
makeSelfSignedCert = 1;
}
else {
printf("Warning: Unrecognized option: %s\n", argv[argc-1]);
}
argc--;
}

Expand Down
5 changes: 2 additions & 3 deletions examples/gpio/gpio_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <examples/tpm_test.h>

#include <stdio.h>
#include <stdlib.h> /* atoi */

/******************************************************************************/
/* --- BEGIN TPM2.0 GPIO Configuration example -- */
Expand Down Expand Up @@ -98,7 +97,7 @@ int TPM2_GPIO_Config_Example(void* userCtx, int argc, char *argv[])
return 0;
}
if (argc == 3) {
gpioMode = atoi(argv[2]);
gpioMode = XATOI(argv[2]);
if (gpioMode > TPM_GPIO_MODE_MAX) {
printf("GPIO mode is out of range (0-%d)\n", TPM_GPIO_MODE_MAX);
usage();
Expand All @@ -114,7 +113,7 @@ int TPM2_GPIO_Config_Example(void* userCtx, int argc, char *argv[])
argc--;
}
if (argc == 2) {
gpioNum = atoi(argv[1]);
gpioNum = XATOI(argv[1]);
if (gpioNum < TPM_GPIO_NUM_MIN || gpioNum > TPM_GPIO_NUM_MAX) {
printf("GPIO is out of range (%d-%d)\n", TPM_GPIO_NUM_MIN, TPM_GPIO_NUM_MAX);
usage();
Expand Down
4 changes: 1 addition & 3 deletions examples/gpio/gpio_read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
#include <examples/tpm_io.h>
#include <examples/tpm_test.h>


#include <stdio.h>
#include <stdlib.h>

#if !defined(WOLFTPM2_NO_WRAPPER) && \
(defined(WOLFTPM_ST33) || defined(WOLFTPM_NUVOTON))
Expand Down Expand Up @@ -66,7 +64,7 @@ int TPM2_GPIO_Read_Example(void* userCtx, int argc, char *argv[])
usage();
return 0;
}
pin = atoi(argv[1]);
pin = XATOI(argv[1]);
if(pin < TPM_GPIO_NUM_MIN || pin > TPM_GPIO_NUM_MAX) {
usage();
return 0;
Expand Down
8 changes: 5 additions & 3 deletions examples/gpio/gpio_set.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <examples/tpm_test.h>

#include <stdio.h>
#include <stdlib.h>

#if !defined(WOLFTPM2_NO_WRAPPER) && \
(defined(WOLFTPM_ST33) || defined(WOLFTPM_NUVOTON))
Expand Down Expand Up @@ -65,7 +64,7 @@ int TPM2_GPIO_Set_Example(void* userCtx, int argc, char *argv[])
usage();
return 0;
}
pin = atoi(argv[1]);
pin = XATOI(argv[1]);
if(pin < TPM_GPIO_NUM_MIN || pin > TPM_GPIO_NUM_MAX) {
usage();
return 0;
Expand All @@ -75,9 +74,12 @@ int TPM2_GPIO_Set_Example(void* userCtx, int argc, char *argv[])
if (XSTRCMP(argv[argc-1], "-high") == 0) {
pinState = 0x01;
}
if (XSTRCMP(argv[argc-1], "-low") == 0) {
else if (XSTRCMP(argv[argc-1], "-low") == 0) {
pinState = 0x00;
}
else {
printf("Warning: Unrecognized option: %s\n", argv[argc-1]);
}
argc--;
};
nvIndex = TPM_NV_GPIO_SPACE + (pin-TPM_GPIO_NUM_MIN);
Expand Down
25 changes: 14 additions & 11 deletions examples/keygen/create_primary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <examples/tpm_test_keys.h>

#include <stdio.h>
#include <stdlib.h> /* atoi */

#ifndef WOLFTPM2_NO_WRAPPER

Expand Down Expand Up @@ -94,37 +93,41 @@ int TPM2_CreatePrimaryKey_Example(void* userCtx, int argc, char *argv[])
if (XSTRCMP(argv[argc-1], "-rsa") == 0) {
alg = TPM_ALG_RSA;
}
if (XSTRCMP(argv[argc-1], "-ecc") == 0) {
else if (XSTRCMP(argv[argc-1], "-ecc") == 0) {
alg = TPM_ALG_ECC;
}
if (XSTRCMP(argv[argc-1], "-aes") == 0) {
else if (XSTRCMP(argv[argc-1], "-aes") == 0) {
paramEncAlg = TPM_ALG_CFB;
}
if (XSTRCMP(argv[argc-1], "-xor") == 0) {
else if (XSTRCMP(argv[argc-1], "-xor") == 0) {
paramEncAlg = TPM_ALG_XOR;
}
if (XSTRCMP(argv[argc-1], "-eh") == 0) {
else if (XSTRCMP(argv[argc-1], "-eh") == 0) {
hierarchy = TPM_RH_ENDORSEMENT;
}
if (XSTRCMP(argv[argc-1], "-ph") == 0) {
else if (XSTRCMP(argv[argc-1], "-ph") == 0) {
hierarchy = TPM_RH_PLATFORM;
}
if (XSTRCMP(argv[argc-1], "-oh") == 0) {
else if (XSTRCMP(argv[argc-1], "-oh") == 0) {
hierarchy = TPM_RH_OWNER;
}
if (XSTRCMP(argv[argc-1], "-unique=") == 0) {
else if (XSTRCMP(argv[argc-1], "-unique=") == 0) {
uniqueStr = argv[argc-1] + 8;
}
if (XSTRCMP(argv[argc-1], "-auth=") == 0) {
else if (XSTRCMP(argv[argc-1], "-auth=") == 0) {
authStr = argv[argc-1] + 6;
}
if (XSTRCMP(argv[argc-1], "-store=") == 0) {
persistHandle = (word32)strtol(argv[argc-1] + 7, NULL, 0);
else if (XSTRCMP(argv[argc-1], "-store=") == 0) {
persistHandle = (word32)XSTRTOL(argv[argc-1] + XSTRLEN("-store="),
NULL, 0);
if (persistHandle < 0x81000000 && persistHandle > 0x810FFFF) {
printf("Invalid storage handle %s\n", argv[argc-1] + 7);
persistHandle = 0;
}
}
else {
printf("Warning: Unrecognized option: %s\n", argv[argc-1]);
}

argc--;
}
Expand Down
25 changes: 14 additions & 11 deletions examples/keygen/keygen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <examples/tpm_test_keys.h>

#include <stdio.h>
#include <stdlib.h> /* atoi */

#ifndef WOLFTPM2_NO_WRAPPER

Expand Down Expand Up @@ -104,7 +103,7 @@ static int symChoice(const char* arg, TPM_ALG_ID* algSym, int* keyBits,
return TPM_RC_FAILURE;
}

*keyBits = atoi(&arg[SYM_EXTRA_OPTS_KEY_BITS_POS]);
*keyBits = XATOI(&arg[SYM_EXTRA_OPTS_KEY_BITS_POS]);
if (*keyBits != 128 && *keyBits != 192 && *keyBits != 256) {
return TPM_RC_FAILURE;
}
Expand Down Expand Up @@ -159,10 +158,10 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
if (XSTRCMP(argv[argc-1], "-rsa") == 0) {
alg = TPM_ALG_RSA;
}
if (XSTRCMP(argv[argc-1], "-ecc") == 0) {
else if (XSTRCMP(argv[argc-1], "-ecc") == 0) {
alg = TPM_ALG_ECC;
}
if (XSTRCMP(argv[argc-1], "-sym") == 0) {
else if (XSTRCMP(argv[argc-1], "-sym") == 0) {
len = XSTRLEN(argv[argc-1]);
if (len >= SYM_EXTRA_OPTS_LEN) {
/* Did the user provide specific options? */
Expand All @@ -179,28 +178,31 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
alg = TPM_ALG_SYMCIPHER;
bAIK = 0;
}
if (XSTRCMP(argv[argc-1], "-keyedhash") == 0) {
else if (XSTRCMP(argv[argc-1], "-keyedhash") == 0) {
alg = TPM_ALG_KEYEDHASH;
bAIK = 0;
}
if (XSTRCMP(argv[argc-1], "-t") == 0) {
else if (XSTRCMP(argv[argc-1], "-t") == 0) {
bAIK = 0;
}
if (XSTRCMP(argv[argc-1], "-eh") == 0) {
else if (XSTRCMP(argv[argc-1], "-eh") == 0) {
endorseKey = 1;
}
if (XSTRCMP(argv[argc-1], "-pem") == 0) {
else if (XSTRCMP(argv[argc-1], "-pem") == 0) {
pemFiles = 1;
}
if (XSTRCMP(argv[argc-1], "-aes") == 0) {
else if (XSTRCMP(argv[argc-1], "-aes") == 0) {
paramEncAlg = TPM_ALG_CFB;
}
if (XSTRCMP(argv[argc-1], "-xor") == 0) {
else if (XSTRCMP(argv[argc-1], "-xor") == 0) {
paramEncAlg = TPM_ALG_XOR;
}
if (XSTRCMP(argv[argc-1], "-unique=") == 0) {
else if (XSTRCMP(argv[argc-1], "-unique=") == 0) {
uniqueStr = argv[argc-1] + 8;
}
else {
printf("Warning: Unrecognized option: %s\n", argv[argc-1]);
}

argc--;
}
Expand Down Expand Up @@ -310,6 +312,7 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
printf("Keyed Hash template\n");
rc = wolfTPM2_GetKeyTemplate_KeyedHash(&publicTemplate,
TPM_ALG_SHA256, YES, NO);
publicTemplate.objectAttributes |= TPMA_OBJECT_sensitiveDataOrigin;
}
else {
rc = BAD_FUNC_ARG;
Expand Down
7 changes: 5 additions & 2 deletions examples/keygen/keyimport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,15 @@ int TPM2_Keyimport_Example(void* userCtx, int argc, char *argv[])
if (XSTRCMP(argv[argc-1], "-ecc") == 0) {
alg = TPM_ALG_ECC;
}
if (XSTRCMP(argv[argc-1], "-aes") == 0) {
else if (XSTRCMP(argv[argc-1], "-aes") == 0) {
paramEncAlg = TPM_ALG_CFB;
}
if (XSTRCMP(argv[argc-1], "-xor") == 0) {
else if (XSTRCMP(argv[argc-1], "-xor") == 0) {
paramEncAlg = TPM_ALG_XOR;
}
else {
printf("Warning: Unrecognized option: %s\n", argv[argc-1]);
}
argc--;
}

Expand Down
7 changes: 5 additions & 2 deletions examples/keygen/keyload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,15 @@ int TPM2_Keyload_Example(void* userCtx, int argc, char *argv[])
if (XSTRCMP(argv[argc-1], "-aes") == 0) {
paramEncAlg = TPM_ALG_CFB;
}
if (XSTRCMP(argv[argc-1], "-xor") == 0) {
else if (XSTRCMP(argv[argc-1], "-xor") == 0) {
paramEncAlg = TPM_ALG_XOR;
}
if (XSTRCMP(argv[argc-1], "-persistent") == 0) {
else if (XSTRCMP(argv[argc-1], "-persistent") == 0) {
persistent = 1;
}
else {
printf("Warning: Unrecognized option: %s\n", argv[argc-1]);
}
argc--;
}

Expand Down
1 change: 0 additions & 1 deletion examples/management/flush.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <examples/tpm_test.h>

#include <stdio.h>
#include <stdlib.h> /* atoi */

#ifndef WOLFTPM2_NO_WRAPPER
/******************************************************************************/
Expand Down
Loading