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.

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

Fixes for building wolfTPM examples with NO_FILESYSTEM #338

Merged
merged 1 commit into from
Mar 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 examples/boot/secret_seal.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ int TPM2_Boot_SecretSeal_Example(void* userCtx, int argc, char *argv[])
printHexString((const byte*)&sealBlob.pub.publicArea, sealBlob.pub.size, 32);
printf("Sealed keyed hash priv %d\n", sealBlob.priv.size);
printHexString(sealBlob.priv.buffer, sealBlob.priv.size, 32);
(void)outFile;
#endif

exit:
Expand Down
3 changes: 3 additions & 0 deletions examples/boot/secret_unseal.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,8 @@ int TPM2_Boot_SecretUnseal_Example(void* userCtx, int argc, char *argv[])
}
#else
printf("File system support not compiled in!\n");
(void)publicKeyFile;
(void)pcrSigFile;
rc = NOT_COMPILED_IN;
#endif
if (rc != TPM_RC_SUCCESS) {
Expand Down Expand Up @@ -314,6 +316,7 @@ int TPM2_Boot_SecretUnseal_Example(void* userCtx, int argc, char *argv[])
#ifndef NO_FILESYSTEM
rc = readKeyBlob(sealFile, &sealBlob);
#else
(void)sealFile;
rc = NOT_COMPILED_IN;
#endif
if (rc != TPM_RC_SUCCESS) {
Expand Down
5 changes: 5 additions & 0 deletions examples/keygen/keyimport.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,11 @@ int TPM2_Keyimport_Example(void* userCtx, int argc, char *argv[])
}
}
else
#else
(void)encType;
(void)attributes;
(void)bufSz;
(void)isPublicKey;
#endif
if (alg == TPM_ALG_RSA) {
printf("Loading example RSA key (see kRsaKeyPrivQ)\n");
Expand Down
14 changes: 5 additions & 9 deletions examples/pcr/policy_sign.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@

#include <stdio.h>

#if !defined(WOLFTPM2_NO_WRAPPER) && !defined(WOLFTPM2_NO_WOLFCRYPT)
#if !defined(WOLFTPM2_NO_WRAPPER) && !defined(WOLFTPM2_NO_WOLFCRYPT) && \
!defined(NO_FILESYSTEM)

#include <hal/tpm_io.h>
#include <examples/tpm_test.h>
Expand Down Expand Up @@ -66,7 +67,6 @@ static void usage(void)
printf("./examples/pcr/policy_sign -pcr=16 -pcr=15 -pcrdigest=ba8ac02be16d9d33080d98611d70bb869aa8ac3fc684ab732b91f75f164b36bc\n");
}

#ifndef NO_FILESYSTEM
#ifndef WC_MAX_ENCODED_DIG_ASN_SZ
#define WC_MAX_ENCODED_DIG_ASN_SZ 9 /* enum(bit or octet) + length(4) */
#endif
Expand Down Expand Up @@ -217,7 +217,6 @@ static int PolicySign(TPM_ALG_ID alg, const char* keyFile, const char* password,
}
return rc;
}
#endif /* !NO_FILESYSTEM */

int TPM2_PCR_PolicySign_Example(void* userCtx, int argc, char *argv[])
{
Expand Down Expand Up @@ -361,9 +360,7 @@ int TPM2_PCR_PolicySign_Example(void* userCtx, int argc, char *argv[])
if (rc == 0) {
printf("PCR Policy Signature (%d bytes):\n", sigSz);
printHexString(sig, sigSz, 32);
#if !defined(NO_FILESYSTEM)
rc = writeBin(outFile, sig, sigSz);
#endif
}
if (rc == 0) {
/* Create Signing Authority Policy */
Expand All @@ -377,9 +374,7 @@ int TPM2_PCR_PolicySign_Example(void* userCtx, int argc, char *argv[])
if (rc == 0) {
printf("Policy Authorize Digest (%d bytes):\n", digestSz);
printHexString(digest, digestSz, digestSz);
#if !defined(NO_FILESYSTEM)
rc = writeBin(outPolicyFile, digest, digestSz);
#endif
}
}
}
Expand All @@ -398,7 +393,7 @@ int TPM2_PCR_PolicySign_Example(void* userCtx, int argc, char *argv[])

return rc;
}
#endif /* !WOLFTPM2_NO_WRAPPER && !WOLFTPM2_NO_WOLFCRYPT */
#endif /* !WOLFTPM2_NO_WRAPPER && !WOLFTPM2_NO_WOLFCRYPT && !NO_FILESYSTEM */

/******************************************************************************/
/* --- END TPM Secure Boot Sign Policy Example -- */
Expand All @@ -409,7 +404,8 @@ int main(int argc, char *argv[])
{
int rc = NOT_COMPILED_IN;

#if !defined(WOLFTPM2_NO_WRAPPER) && !defined(WOLFTPM2_NO_WOLFCRYPT)
#if !defined(WOLFTPM2_NO_WRAPPER) && !defined(WOLFTPM2_NO_WOLFCRYPT) && \
!defined(NO_FILESYSTEM)
rc = TPM2_PCR_PolicySign_Example(NULL, argc, argv);
#else
printf("Example not compiled in! Requires Wrapper and wolfCrypt\n");
Expand Down
4 changes: 4 additions & 0 deletions examples/pkcs7/pkcs7.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ static int PKCS7_SignVerifyEx(WOLFTPM2_DEV* dev, int tpmDevId, WOLFTPM2_BUFFER*

XFCLOSE(pemFile);
}
#else
(void)outFile;
#endif

/* Test verify with TPM */
Expand Down Expand Up @@ -363,10 +365,12 @@ int TPM2_PKCS7_ExampleArgs(void* userCtx, int argc, char *argv[])
else if (XSTRCMP(argv[argc-1], "-rsa") == 0) {
alg = TPM_ALG_RSA;
}
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
else if (XSTRNCMP(argv[argc-1], "-incert=",
XSTRLEN("-incert=")) == 0) {
inCert = argv[argc-1] + XSTRLEN("-incert=");
}
#endif
else if (XSTRNCMP(argv[argc-1], "-out=",
XSTRLEN("-out=")) == 0) {
outFile = argv[argc-1] + XSTRLEN("-out=");
Expand Down
4 changes: 4 additions & 0 deletions examples/tls/tls_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,10 @@ int TPM2_TLS_ClientArgs(void* userCtx, int argc, char *argv[])
printf("Loading RSA certificate\n");
#ifdef NO_FILESYSTEM
/* Load "cert" buffer with ASN.1/DER certificate */
#if 0
rc = wolfSSL_CTX_use_certificate_buffer(ctx, cert.buffer, (long)cert.size,
WOLFSSL_FILETYPE_ASN1);
#endif
#else
rc = wolfSSL_CTX_use_certificate_file(ctx, "./certs/client-rsa-cert.pem",
WOLFSSL_FILETYPE_PEM);
Expand All @@ -425,8 +427,10 @@ int TPM2_TLS_ClientArgs(void* userCtx, int argc, char *argv[])
printf("Loading ECC certificate\n");
#ifdef NO_FILESYSTEM
/* Load "cert" buffer with ASN.1/DER certificate */
#if 0
rc = wolfSSL_CTX_use_certificate_buffer(ctx, cert.buffer, (long)cert.size,
WOLFSSL_FILETYPE_ASN1);
#endif
#else
rc = wolfSSL_CTX_use_certificate_file(ctx, "./certs/client-ecc-cert.pem",
WOLFSSL_FILETYPE_PEM);
Expand Down
1 change: 1 addition & 0 deletions examples/tls/tls_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ int TPM2_TLS_ServerArgs(void* userCtx, int argc, char *argv[])
goto exit;
}
#endif
(void)useSelfSign;
#else
{
/* Export TPM public key as DER */
Expand Down
Loading