commit 5a804e92eff234941d497706033232f53c24d9c3
author William Roberts <william.c.roberts@intel.com> Wed Jun 08 11:17:51 2022 -0500
committer William Roberts <william.c.roberts@intel.com> Fri Jun 10 13:15:44 2022 -0500
tree 71d6c170203dcfc49033d1091d48d74acb02bb45
parent d4dee42e77a484e6c72f86ae3fac71ee8480544c

sapi: drop stub validation functions

Don't provide empty functions when disabling validation fuinctionality,
just provide the RC success value. This reduces object code by about 2k.

Signed-off-by: William Roberts <william.c.roberts@intel.com>

src/tss2-sys/sysapi_util.c

diff --git a/src/tss2-sys/sysapi_util.c b/src/tss2-sys/sysapi_util.c
index bd1df42..e80f63e 100644
--- a/src/tss2-sys/sysapi_util.c
+++ b/src/tss2-sys/sysapi_util.c
@@ -402,34 +402,4 @@
 
     return TSS2_RC_SUCCESS;
 }
-
-#else
-bool IsAlgorithmWeak(TPM2_ALG_ID algorithm, TPM2_KEY_SIZE key_size)
-{
-    UNUSED(algorithm);
-    UNUSED(key_size);
-
-    return false;
-}
-
-TSS2_RC ValidateNV_Public(const TPM2B_NV_PUBLIC *nv_public_info)
-{
-    UNUSED(nv_public_info);
-
-    return TSS2_RC_SUCCESS;
-}
-
-TSS2_RC ValidatePublicTemplate(const TPM2B_PUBLIC *pub)
-{
-    UNUSED(pub);
-
-    return TSS2_RC_SUCCESS;
-}
-
-TSS2_RC ValidateTPML_PCR_SELECTION(const TPML_PCR_SELECTION *pcr_selection)
-{
-    UNUSED(pcr_selection);
-
-    return TSS2_RC_SUCCESS;
-}
 #endif

src/tss2-sys/sysapi_util.h

diff --git a/src/tss2-sys/sysapi_util.h b/src/tss2-sys/sysapi_util.h
index b201c10..45c3ac3 100644
--- a/src/tss2-sys/sysapi_util.h
+++ b/src/tss2-sys/sysapi_util.h
@@ -105,10 +105,22 @@
     TPM2_CC commandCode);
 
 TSS2_RC CommonPrepareEpilogue(_TSS2_SYS_CONTEXT_BLOB *ctx);
+
+#ifdef DISABLE_WEAK_CRYPTO
 bool IsAlgorithmWeak(TPM2_ALG_ID algorith, TPM2_KEY_SIZE key_size);
 TSS2_RC ValidatePublicTemplate(const TPM2B_PUBLIC *pub);
 TSS2_RC ValidateNV_Public(const TPM2B_NV_PUBLIC *nv_public_info);
 TSS2_RC ValidateTPML_PCR_SELECTION(const TPML_PCR_SELECTION *pcr_selection);
+#else
+/*
+ * static inline is not portable, so make these empty defines to reduce generating functions
+ * and thus binary size for them.
+ */
+#define IsAlgorithmWeak(...) TSS2_RC_SUCCESS
+#define ValidatePublicTemplate(...) TSS2_RC_SUCCESS
+#define ValidateNV_Public(...) TSS2_RC_SUCCESS
+#define ValidateTPML_PCR_SELECTION(...) TSS2_RC_SUCCESS
+#endif
 
 #ifdef __cplusplus
 }