From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 21 Oct 2023 14:34:28 +0000 (+0200)
Subject: tpm2-util: make various marshalling/unmarshalling calls static, as we only use them... 
X-Git-Tag: v255-rc1~27^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40ce73214a3332b1da6de98e790b7c24680f69ec;p=thirdparty%2Fsystemd.git

tpm2-util: make various marshalling/unmarshalling calls static, as we only use them internally in tpm2-util.c

Note, some of these were just added in this same PR. We only exported
them initially to make sure gcc doesn't complained about unused local
symbols.
---

diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 7dbe02be2e2..5373fa12a59 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -2345,7 +2345,7 @@ int tpm2_create_loaded(
         return 0;
 }
 
-int tpm2_marshal_private(const TPM2B_PRIVATE *private, void **ret, size_t *ret_size) {
+static int tpm2_marshal_private(const TPM2B_PRIVATE *private, void **ret, size_t *ret_size) {
         size_t max_size = sizeof(*private), blob_size = 0;
         _cleanup_free_ void *blob = NULL;
         TSS2_RC rc;
@@ -2368,7 +2368,7 @@ int tpm2_marshal_private(const TPM2B_PRIVATE *private, void **ret, size_t *ret_s
         return 0;
 }
 
-int tpm2_unmarshal_private(const void *data, size_t size, TPM2B_PRIVATE *ret_private) {
+static int tpm2_unmarshal_private(const void *data, size_t size, TPM2B_PRIVATE *ret_private) {
         TPM2B_PRIVATE private = {};
         size_t offset = 0;
         TSS2_RC rc;
@@ -2388,7 +2388,7 @@ int tpm2_unmarshal_private(const void *data, size_t size, TPM2B_PRIVATE *ret_pri
         return 0;
 }
 
-int tpm2_marshal_public(const TPM2B_PUBLIC *public, void **ret, size_t *ret_size) {
+static int tpm2_marshal_public(const TPM2B_PUBLIC *public, void **ret, size_t *ret_size) {
         size_t max_size = sizeof(*public), blob_size = 0;
         _cleanup_free_ void *blob = NULL;
         TSS2_RC rc;
@@ -2411,7 +2411,7 @@ int tpm2_marshal_public(const TPM2B_PUBLIC *public, void **ret, size_t *ret_size
         return 0;
 }
 
-int tpm2_unmarshal_public(const void *data, size_t size, TPM2B_PUBLIC *ret_public) {
+static int tpm2_unmarshal_public(const void *data, size_t size, TPM2B_PUBLIC *ret_public) {
         TPM2B_PUBLIC public = {};
         size_t offset = 0;
         TSS2_RC rc;
diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h
index 167d141a445..20121222dd7 100644
--- a/src/shared/tpm2-util.h
+++ b/src/shared/tpm2-util.h
@@ -117,10 +117,6 @@ int tpm2_create_primary(Tpm2Context *c, const Tpm2Handle *session, const TPM2B_P
 int tpm2_create(Tpm2Context *c, const Tpm2Handle *parent, const Tpm2Handle *session, const TPMT_PUBLIC *template, const TPMS_SENSITIVE_CREATE *sensitive, TPM2B_PUBLIC **ret_public, TPM2B_PRIVATE **ret_private);
 int tpm2_create_loaded(Tpm2Context *c, const Tpm2Handle *parent, const Tpm2Handle *session, const TPMT_PUBLIC *template, const TPMS_SENSITIVE_CREATE *sensitive, TPM2B_PUBLIC **ret_public, TPM2B_PRIVATE **ret_private, Tpm2Handle **ret_handle);
 int tpm2_load(Tpm2Context *c, const Tpm2Handle *parent, const Tpm2Handle *session, const TPM2B_PUBLIC *public, const TPM2B_PRIVATE *private, Tpm2Handle **ret_handle);
-int tpm2_marshal_private(const TPM2B_PRIVATE *private, void **ret, size_t *ret_size);
-int tpm2_unmarshal_private(const void *data, size_t size, TPM2B_PRIVATE *ret_private);
-int tpm2_marshal_public(const TPM2B_PUBLIC *public, void **ret, size_t *ret_size);
-int tpm2_unmarshal_public(const void *data, size_t size, TPM2B_PUBLIC *ret_public);
 int tpm2_marshal_nv_public(const TPM2B_NV_PUBLIC *nv_public, void **ret, size_t *ret_size);
 int tpm2_unmarshal_nv_public(const void *data, size_t size, TPM2B_NV_PUBLIC *ret_nv_public);