Richard Maciel
2014-02-21 01:12:00 UTC
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Trousers".
The branch, master has been updated
via 48ed8431dd97ca7048db0c915499c27c8d47a4e8 (commit)
via 43f282a941bb3c682a9944120886475a4b3f8613 (commit)
from c6fe2de315610d00bf1def7e01e66fe44f7f0cdb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=48ed8431dd97ca7048db0c915499c27c8d47a4e8
commit 48ed8431dd97ca7048db0c915499c27c8d47a4e8
Author: Richard Maciel <***@linux.vnet.ibm.com>
Date: Thu Feb 20 13:57:04 2014 -0300
Removed references to 'list_init'
All macros that previously referred to list_init, now refers to
tspi_list_init.
Signed-off-by: Richard Maciel <***@linux.vnet.ibm.com>
Acked-by:Joel Schopp <***@linux.vnet.ibm.com>
diff --git a/src/include/obj_context.h b/src/include/obj_context.h
index 855e7d4..d864d11 100644
--- a/src/include/obj_context.h
+++ b/src/include/obj_context.h
@@ -86,7 +86,7 @@ struct tcs_api_table *obj_context_get_tcs_api(TSS_HCONTEXT);
#define CONTEXT_LIST_DECLARE struct obj_list context_list
#define CONTEXT_LIST_DECLARE_EXTERN extern struct obj_list context_list
-#define CONTEXT_LIST_INIT() list_init(&context_list)
+#define CONTEXT_LIST_INIT() tspi_list_init(&context_list)
#define CONTEXT_LIST_CONNECT(a,b) obj_connectContext_list(&context_list, a, b)
#define CONTEXT_LIST_CLOSE(a) obj_list_close(&context_list, &__tspi_obj_context_free, a)
diff --git a/src/include/obj_daa.h b/src/include/obj_daa.h
index d7e21a9..d25f7c7 100644
--- a/src/include/obj_daa.h
+++ b/src/include/obj_daa.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daa_set_session_handle(TSS_HDAA, UINT32);
#define DAA_LIST_DECLARE struct obj_list daa_list
#define DAA_LIST_DECLARE_EXTERN extern struct obj_list daa_list
-#define DAA_LIST_INIT() list_init(&daa_list)
+#define DAA_LIST_INIT() tspi_list_init(&daa_list)
#define DAA_LIST_CONNECT(a,b) obj_connectContext_list(&daa_list, a, b)
#define DAA_LIST_CLOSE(a) obj_list_close(&daa_list, &daa_free, a)
diff --git a/src/include/obj_daaarakey.h b/src/include/obj_daaarakey.h
index 9997f09..99e906d 100644
--- a/src/include/obj_daaarakey.h
+++ b/src/include/obj_daaarakey.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daaarakey_set_session_handle(TSS_HDAA_ISSUER_KEY, UINT32);
#define DAAARAKEY_LIST_DECLARE struct obj_list daaarakey_list
#define DAAARAKEY_LIST_DECLARE_EXTERN extern struct obj_list daaarakey_list
-#define DAAARAKEY_LIST_INIT() list_init(&daaarakey_list)
+#define DAAARAKEY_LIST_INIT() tspi_list_init(&daaarakey_list)
#define DAAARAKEY_LIST_CONNECT(a,b) obj_connectContext_list(&daaarakey_list, a, b)
#define DAAARAKEY_LIST_CLOSE(a) obj_list_close(&daaarakey_list, &daaarakey_free, a)
diff --git a/src/include/obj_daacred.h b/src/include/obj_daacred.h
index 4e1aa17..357a23e 100644
--- a/src/include/obj_daacred.h
+++ b/src/include/obj_daacred.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daacred_set_session_handle(TSS_HDAA_CREDENTIAL, UINT32);
#define DAACRED_LIST_DECLARE struct obj_list daacred_list
#define DAACRED_LIST_DECLARE_EXTERN extern struct obj_list daacred_list
-#define DAACRED_LIST_INIT() list_init(&daacred_list)
+#define DAACRED_LIST_INIT() tspi_list_init(&daacred_list)
#define DAACRED_LIST_CONNECT(a,b) obj_connectContext_list(&daacred_list, a, b)
#define DAACRED_LIST_CLOSE(a) obj_list_close(&daacred_list, &daacred_free, a)
diff --git a/src/include/obj_daaissuerkey.h b/src/include/obj_daaissuerkey.h
index 5a1e5ab..9eb69df 100644
--- a/src/include/obj_daaissuerkey.h
+++ b/src/include/obj_daaissuerkey.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daaissuerkey_set_session_handle(TSS_HDAA_ISSUER_KEY, UINT32);
#define DAAISSUERKEY_LIST_DECLARE struct obj_list daaissuerkey_list
#define DAAISSUERKEY_LIST_DECLARE_EXTERN extern struct obj_list daaissuerkey_list
-#define DAAISSUERKEY_LIST_INIT() list_init(&daaissuerkey_list)
+#define DAAISSUERKEY_LIST_INIT() tspi_list_init(&daaissuerkey_list)
#define DAAISSUERKEY_LIST_CONNECT(a,b) obj_connectContext_list(&daaissuerkey_list, a, b)
#define DAAISSUERKEY_LIST_CLOSE(a) obj_list_close(&daaissuerkey_list, \
&daaissuerkey_free, a)
diff --git a/src/include/obj_delfamily.h b/src/include/obj_delfamily.h
index 238bd56..4c91a84 100644
--- a/src/include/obj_delfamily.h
+++ b/src/include/obj_delfamily.h
@@ -45,7 +45,7 @@ TSS_RESULT obj_delfamily_get_label(TSS_HDELFAMILY, BYTE *);
#define DELFAMILY_LIST_DECLARE struct obj_list delfamily_list
#define DELFAMILY_LIST_DECLARE_EXTERN extern struct obj_list delfamily_list
-#define DELFAMILY_LIST_INIT() list_init(&delfamily_list)
+#define DELFAMILY_LIST_INIT() tspi_list_init(&delfamily_list)
#define DELFAMILY_LIST_CONNECT(a,b) obj_connectContext_list(&delfamily_list, a, b)
#define DELFAMILY_LIST_CLOSE(a) obj_list_close(&delfamily_list, &delfamily_free, a)
diff --git a/src/include/obj_encdata.h b/src/include/obj_encdata.h
index 922a07a..ad7f28c 100644
--- a/src/include/obj_encdata.h
+++ b/src/include/obj_encdata.h
@@ -52,7 +52,7 @@ TSS_RESULT obj_encdata_get_seal_protect_mode(TSS_HENCDATA, UINT32 *);
#define ENCDATA_LIST_DECLARE struct obj_list encdata_list
#define ENCDATA_LIST_DECLARE_EXTERN extern struct obj_list encdata_list
-#define ENCDATA_LIST_INIT() list_init(&encdata_list)
+#define ENCDATA_LIST_INIT() tspi_list_init(&encdata_list)
#define ENCDATA_LIST_CONNECT(a,b) obj_connectContext_list(&encdata_list, a, b)
#define ENCDATA_LIST_CLOSE(a) obj_list_close(&encdata_list, &encdata_free, a)
diff --git a/src/include/obj_hash.h b/src/include/obj_hash.h
index a835f7a..d621138 100644
--- a/src/include/obj_hash.h
+++ b/src/include/obj_hash.h
@@ -34,7 +34,7 @@ TSS_RESULT obj_hash_update_value(TSS_HHASH, UINT32, BYTE *);
#define HASH_LIST_DECLARE struct obj_list hash_list
#define HASH_LIST_DECLARE_EXTERN extern struct obj_list hash_list
-#define HASH_LIST_INIT() list_init(&hash_list)
+#define HASH_LIST_INIT() tspi_list_init(&hash_list)
#define HASH_LIST_CONNECT(a,b) obj_connectContext_list(&hash_list, a, b)
#define HASH_LIST_CLOSE(a) obj_list_close(&hash_list, &__tspi_hash_free, a)
diff --git a/src/include/obj_migdata.h b/src/include/obj_migdata.h
index 2432797..d082aea 100644
--- a/src/include/obj_migdata.h
+++ b/src/include/obj_migdata.h
@@ -118,7 +118,7 @@ TSS_RESULT obj_migdata_calc_sig_data_digest(struct tr_migdata_obj *);
#define MIGDATA_LIST_DECLARE struct obj_list migdata_list
#define MIGDATA_LIST_DECLARE_EXTERN extern struct obj_list migdata_list
-#define MIGDATA_LIST_INIT() list_init(&migdata_list)
+#define MIGDATA_LIST_INIT() tspi_list_init(&migdata_list)
#define MIGDATA_LIST_CONNECT(a,b) obj_connectContext_list(&migdata_list, a, b)
#define MIGDATA_LIST_CLOSE(a) obj_list_close(&migdata_list, &migdata_free, a)
diff --git a/src/include/obj_nv.h b/src/include/obj_nv.h
index 1b95386..088b999 100644
--- a/src/include/obj_nv.h
+++ b/src/include/obj_nv.h
@@ -68,7 +68,7 @@ TSS_RESULT obj_nvstore_create_pcrshortinfo(TSS_HNVSTORE, TSS_HPCRS, UINT32 *, BY
#define NVSTORE_LIST_DECLARE struct obj_list nvstore_list
#define NVSTORE_LIST_DECLARE_EXTERN extern struct obj_list nvstore_list
-#define NVSTORE_LIST_INIT() list_init(&nvstore_list)
+#define NVSTORE_LIST_INIT() tspi_list_init(&nvstore_list)
#define NVSTORE_LIST_CONNECT(a,b) obj_connectContext_list(&nvstore_list, a, b)
#define NVSTORE_LIST_CLOSE(a) obj_list_close(&nvstore_list, &nvstore_free, a)
#else
diff --git a/src/include/obj_pcrs.h b/src/include/obj_pcrs.h
index f6cc081..44981b1 100644
--- a/src/include/obj_pcrs.h
+++ b/src/include/obj_pcrs.h
@@ -48,7 +48,7 @@ TSS_RESULT obj_pcrs_set_locality(TSS_HPCRS, UINT32);
#define PCRS_LIST_DECLARE struct obj_list pcrs_list
#define PCRS_LIST_DECLARE_EXTERN extern struct obj_list pcrs_list
-#define PCRS_LIST_INIT() list_init(&pcrs_list)
+#define PCRS_LIST_INIT() tspi_list_init(&pcrs_list)
#define PCRS_LIST_CONNECT(a,b) obj_connectContext_list(&pcrs_list, a, b)
#define PCRS_LIST_CLOSE(a) obj_list_close(&pcrs_list, &pcrs_free, a)
diff --git a/src/include/obj_policy.h b/src/include/obj_policy.h
index 9686275..d42cc41 100644
--- a/src/include/obj_policy.h
+++ b/src/include/obj_policy.h
@@ -178,7 +178,7 @@ TSS_RESULT obj_policy_get_delegate_public(struct tsp_object *, TPM_DELEGATE_PUBL
#define POLICY_LIST_DECLARE struct obj_list policy_list
#define POLICY_LIST_DECLARE_EXTERN extern struct obj_list policy_list
-#define POLICY_LIST_INIT() list_init(&policy_list)
+#define POLICY_LIST_INIT() tspi_list_init(&policy_list)
#define POLICY_LIST_CONNECT(a,b) obj_connectContext_list(&policy_list, a, b)
#define POLICY_LIST_CLOSE(a) obj_list_close(&policy_list, &__tspi_policy_free, a)
diff --git a/src/include/obj_rsakey.h b/src/include/obj_rsakey.h
index 48c0931..4f15d25 100644
--- a/src/include/obj_rsakey.h
+++ b/src/include/obj_rsakey.h
@@ -110,7 +110,7 @@ TSS_RESULT obj_rsakey_set_srk_pubkey(BYTE *);
#define RSAKEY_LIST_DECLARE struct obj_list rsakey_list
#define RSAKEY_LIST_DECLARE_EXTERN extern struct obj_list rsakey_list
-#define RSAKEY_LIST_INIT() list_init(&rsakey_list)
+#define RSAKEY_LIST_INIT() tspi_list_init(&rsakey_list)
#define RSAKEY_LIST_CONNECT(a,b) obj_connectContext_list(&rsakey_list, a, b)
#define RSAKEY_LIST_CLOSE(a) obj_list_close(&rsakey_list, &__tspi_rsakey_free, a)
http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=43f282a941bb3c682a9944120886475a4b3f8613
commit 43f282a941bb3c682a9944120886475a4b3f8613
Author: Richard Maciel <***@linux.vnet.ibm.com>
Date: Thu Feb 20 13:57:03 2014 -0300
list_init symbol got a different name and is now local-only
list_init function in src/tspi/obj.c had a name too generic
and it was being exported which was causing issues with other
libraries.
Applying both solutions is unnecessary, but I think it needs to
have a more specific name.
Signed-off-by: Richard Maciel <***@linux.vnet.ibm.com>
Acked-by:Joel Schopp <***@linux.vnet.ibm.com>
diff --git a/src/include/obj_tpm.h b/src/include/obj_tpm.h
index 9eb1db7..b90812f 100644
--- a/src/include/obj_tpm.h
+++ b/src/include/obj_tpm.h
@@ -71,7 +71,7 @@ TSS_RESULT obj_tpm_get_cred(TSS_HTPM, TSS_FLAG, UINT32 *, BYTE **);
#define TPM_LIST_DECLARE struct obj_list tpm_list
#define TPM_LIST_DECLARE_EXTERN extern struct obj_list tpm_list
-#define TPM_LIST_INIT() list_init(&tpm_list)
+#define TPM_LIST_INIT() tspi_list_init(&tpm_list)
#define TPM_LIST_CONNECT(a,b) obj_connectContext_list(&tpm_list, a, b)
#define TPM_LIST_CLOSE(a) obj_list_close(&tpm_list, &tpm_free, a)
diff --git a/src/tspi/obj.c b/src/tspi/obj.c
index ad5c79a..c434d9a 100644
--- a/src/tspi/obj.c
+++ b/src/tspi/obj.c
@@ -39,8 +39,8 @@ NVSTORE_LIST_DECLARE;
DELFAMILY_LIST_DECLARE;
MIGDATA_LIST_DECLARE;
-void
-list_init(struct obj_list *list)
+static void
+tspi_list_init(struct obj_list *list)
{
list->head = NULL;
MUTEX_INIT(list->lock);
-----------------------------------------------------------------------
Summary of changes:
src/include/obj_context.h | 2 +-
src/include/obj_daa.h | 2 +-
src/include/obj_daaarakey.h | 2 +-
src/include/obj_daacred.h | 2 +-
src/include/obj_daaissuerkey.h | 2 +-
src/include/obj_delfamily.h | 2 +-
src/include/obj_encdata.h | 2 +-
src/include/obj_hash.h | 2 +-
src/include/obj_migdata.h | 2 +-
src/include/obj_nv.h | 2 +-
src/include/obj_pcrs.h | 2 +-
src/include/obj_policy.h | 2 +-
src/include/obj_rsakey.h | 2 +-
src/include/obj_tpm.h | 2 +-
src/tspi/obj.c | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
hooks/post-receive
generated because a ref change was pushed to the repository containing
the project "Trousers".
The branch, master has been updated
via 48ed8431dd97ca7048db0c915499c27c8d47a4e8 (commit)
via 43f282a941bb3c682a9944120886475a4b3f8613 (commit)
from c6fe2de315610d00bf1def7e01e66fe44f7f0cdb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=48ed8431dd97ca7048db0c915499c27c8d47a4e8
commit 48ed8431dd97ca7048db0c915499c27c8d47a4e8
Author: Richard Maciel <***@linux.vnet.ibm.com>
Date: Thu Feb 20 13:57:04 2014 -0300
Removed references to 'list_init'
All macros that previously referred to list_init, now refers to
tspi_list_init.
Signed-off-by: Richard Maciel <***@linux.vnet.ibm.com>
Acked-by:Joel Schopp <***@linux.vnet.ibm.com>
diff --git a/src/include/obj_context.h b/src/include/obj_context.h
index 855e7d4..d864d11 100644
--- a/src/include/obj_context.h
+++ b/src/include/obj_context.h
@@ -86,7 +86,7 @@ struct tcs_api_table *obj_context_get_tcs_api(TSS_HCONTEXT);
#define CONTEXT_LIST_DECLARE struct obj_list context_list
#define CONTEXT_LIST_DECLARE_EXTERN extern struct obj_list context_list
-#define CONTEXT_LIST_INIT() list_init(&context_list)
+#define CONTEXT_LIST_INIT() tspi_list_init(&context_list)
#define CONTEXT_LIST_CONNECT(a,b) obj_connectContext_list(&context_list, a, b)
#define CONTEXT_LIST_CLOSE(a) obj_list_close(&context_list, &__tspi_obj_context_free, a)
diff --git a/src/include/obj_daa.h b/src/include/obj_daa.h
index d7e21a9..d25f7c7 100644
--- a/src/include/obj_daa.h
+++ b/src/include/obj_daa.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daa_set_session_handle(TSS_HDAA, UINT32);
#define DAA_LIST_DECLARE struct obj_list daa_list
#define DAA_LIST_DECLARE_EXTERN extern struct obj_list daa_list
-#define DAA_LIST_INIT() list_init(&daa_list)
+#define DAA_LIST_INIT() tspi_list_init(&daa_list)
#define DAA_LIST_CONNECT(a,b) obj_connectContext_list(&daa_list, a, b)
#define DAA_LIST_CLOSE(a) obj_list_close(&daa_list, &daa_free, a)
diff --git a/src/include/obj_daaarakey.h b/src/include/obj_daaarakey.h
index 9997f09..99e906d 100644
--- a/src/include/obj_daaarakey.h
+++ b/src/include/obj_daaarakey.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daaarakey_set_session_handle(TSS_HDAA_ISSUER_KEY, UINT32);
#define DAAARAKEY_LIST_DECLARE struct obj_list daaarakey_list
#define DAAARAKEY_LIST_DECLARE_EXTERN extern struct obj_list daaarakey_list
-#define DAAARAKEY_LIST_INIT() list_init(&daaarakey_list)
+#define DAAARAKEY_LIST_INIT() tspi_list_init(&daaarakey_list)
#define DAAARAKEY_LIST_CONNECT(a,b) obj_connectContext_list(&daaarakey_list, a, b)
#define DAAARAKEY_LIST_CLOSE(a) obj_list_close(&daaarakey_list, &daaarakey_free, a)
diff --git a/src/include/obj_daacred.h b/src/include/obj_daacred.h
index 4e1aa17..357a23e 100644
--- a/src/include/obj_daacred.h
+++ b/src/include/obj_daacred.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daacred_set_session_handle(TSS_HDAA_CREDENTIAL, UINT32);
#define DAACRED_LIST_DECLARE struct obj_list daacred_list
#define DAACRED_LIST_DECLARE_EXTERN extern struct obj_list daacred_list
-#define DAACRED_LIST_INIT() list_init(&daacred_list)
+#define DAACRED_LIST_INIT() tspi_list_init(&daacred_list)
#define DAACRED_LIST_CONNECT(a,b) obj_connectContext_list(&daacred_list, a, b)
#define DAACRED_LIST_CLOSE(a) obj_list_close(&daacred_list, &daacred_free, a)
diff --git a/src/include/obj_daaissuerkey.h b/src/include/obj_daaissuerkey.h
index 5a1e5ab..9eb69df 100644
--- a/src/include/obj_daaissuerkey.h
+++ b/src/include/obj_daaissuerkey.h
@@ -32,7 +32,7 @@ TSS_RESULT obj_daaissuerkey_set_session_handle(TSS_HDAA_ISSUER_KEY, UINT32);
#define DAAISSUERKEY_LIST_DECLARE struct obj_list daaissuerkey_list
#define DAAISSUERKEY_LIST_DECLARE_EXTERN extern struct obj_list daaissuerkey_list
-#define DAAISSUERKEY_LIST_INIT() list_init(&daaissuerkey_list)
+#define DAAISSUERKEY_LIST_INIT() tspi_list_init(&daaissuerkey_list)
#define DAAISSUERKEY_LIST_CONNECT(a,b) obj_connectContext_list(&daaissuerkey_list, a, b)
#define DAAISSUERKEY_LIST_CLOSE(a) obj_list_close(&daaissuerkey_list, \
&daaissuerkey_free, a)
diff --git a/src/include/obj_delfamily.h b/src/include/obj_delfamily.h
index 238bd56..4c91a84 100644
--- a/src/include/obj_delfamily.h
+++ b/src/include/obj_delfamily.h
@@ -45,7 +45,7 @@ TSS_RESULT obj_delfamily_get_label(TSS_HDELFAMILY, BYTE *);
#define DELFAMILY_LIST_DECLARE struct obj_list delfamily_list
#define DELFAMILY_LIST_DECLARE_EXTERN extern struct obj_list delfamily_list
-#define DELFAMILY_LIST_INIT() list_init(&delfamily_list)
+#define DELFAMILY_LIST_INIT() tspi_list_init(&delfamily_list)
#define DELFAMILY_LIST_CONNECT(a,b) obj_connectContext_list(&delfamily_list, a, b)
#define DELFAMILY_LIST_CLOSE(a) obj_list_close(&delfamily_list, &delfamily_free, a)
diff --git a/src/include/obj_encdata.h b/src/include/obj_encdata.h
index 922a07a..ad7f28c 100644
--- a/src/include/obj_encdata.h
+++ b/src/include/obj_encdata.h
@@ -52,7 +52,7 @@ TSS_RESULT obj_encdata_get_seal_protect_mode(TSS_HENCDATA, UINT32 *);
#define ENCDATA_LIST_DECLARE struct obj_list encdata_list
#define ENCDATA_LIST_DECLARE_EXTERN extern struct obj_list encdata_list
-#define ENCDATA_LIST_INIT() list_init(&encdata_list)
+#define ENCDATA_LIST_INIT() tspi_list_init(&encdata_list)
#define ENCDATA_LIST_CONNECT(a,b) obj_connectContext_list(&encdata_list, a, b)
#define ENCDATA_LIST_CLOSE(a) obj_list_close(&encdata_list, &encdata_free, a)
diff --git a/src/include/obj_hash.h b/src/include/obj_hash.h
index a835f7a..d621138 100644
--- a/src/include/obj_hash.h
+++ b/src/include/obj_hash.h
@@ -34,7 +34,7 @@ TSS_RESULT obj_hash_update_value(TSS_HHASH, UINT32, BYTE *);
#define HASH_LIST_DECLARE struct obj_list hash_list
#define HASH_LIST_DECLARE_EXTERN extern struct obj_list hash_list
-#define HASH_LIST_INIT() list_init(&hash_list)
+#define HASH_LIST_INIT() tspi_list_init(&hash_list)
#define HASH_LIST_CONNECT(a,b) obj_connectContext_list(&hash_list, a, b)
#define HASH_LIST_CLOSE(a) obj_list_close(&hash_list, &__tspi_hash_free, a)
diff --git a/src/include/obj_migdata.h b/src/include/obj_migdata.h
index 2432797..d082aea 100644
--- a/src/include/obj_migdata.h
+++ b/src/include/obj_migdata.h
@@ -118,7 +118,7 @@ TSS_RESULT obj_migdata_calc_sig_data_digest(struct tr_migdata_obj *);
#define MIGDATA_LIST_DECLARE struct obj_list migdata_list
#define MIGDATA_LIST_DECLARE_EXTERN extern struct obj_list migdata_list
-#define MIGDATA_LIST_INIT() list_init(&migdata_list)
+#define MIGDATA_LIST_INIT() tspi_list_init(&migdata_list)
#define MIGDATA_LIST_CONNECT(a,b) obj_connectContext_list(&migdata_list, a, b)
#define MIGDATA_LIST_CLOSE(a) obj_list_close(&migdata_list, &migdata_free, a)
diff --git a/src/include/obj_nv.h b/src/include/obj_nv.h
index 1b95386..088b999 100644
--- a/src/include/obj_nv.h
+++ b/src/include/obj_nv.h
@@ -68,7 +68,7 @@ TSS_RESULT obj_nvstore_create_pcrshortinfo(TSS_HNVSTORE, TSS_HPCRS, UINT32 *, BY
#define NVSTORE_LIST_DECLARE struct obj_list nvstore_list
#define NVSTORE_LIST_DECLARE_EXTERN extern struct obj_list nvstore_list
-#define NVSTORE_LIST_INIT() list_init(&nvstore_list)
+#define NVSTORE_LIST_INIT() tspi_list_init(&nvstore_list)
#define NVSTORE_LIST_CONNECT(a,b) obj_connectContext_list(&nvstore_list, a, b)
#define NVSTORE_LIST_CLOSE(a) obj_list_close(&nvstore_list, &nvstore_free, a)
#else
diff --git a/src/include/obj_pcrs.h b/src/include/obj_pcrs.h
index f6cc081..44981b1 100644
--- a/src/include/obj_pcrs.h
+++ b/src/include/obj_pcrs.h
@@ -48,7 +48,7 @@ TSS_RESULT obj_pcrs_set_locality(TSS_HPCRS, UINT32);
#define PCRS_LIST_DECLARE struct obj_list pcrs_list
#define PCRS_LIST_DECLARE_EXTERN extern struct obj_list pcrs_list
-#define PCRS_LIST_INIT() list_init(&pcrs_list)
+#define PCRS_LIST_INIT() tspi_list_init(&pcrs_list)
#define PCRS_LIST_CONNECT(a,b) obj_connectContext_list(&pcrs_list, a, b)
#define PCRS_LIST_CLOSE(a) obj_list_close(&pcrs_list, &pcrs_free, a)
diff --git a/src/include/obj_policy.h b/src/include/obj_policy.h
index 9686275..d42cc41 100644
--- a/src/include/obj_policy.h
+++ b/src/include/obj_policy.h
@@ -178,7 +178,7 @@ TSS_RESULT obj_policy_get_delegate_public(struct tsp_object *, TPM_DELEGATE_PUBL
#define POLICY_LIST_DECLARE struct obj_list policy_list
#define POLICY_LIST_DECLARE_EXTERN extern struct obj_list policy_list
-#define POLICY_LIST_INIT() list_init(&policy_list)
+#define POLICY_LIST_INIT() tspi_list_init(&policy_list)
#define POLICY_LIST_CONNECT(a,b) obj_connectContext_list(&policy_list, a, b)
#define POLICY_LIST_CLOSE(a) obj_list_close(&policy_list, &__tspi_policy_free, a)
diff --git a/src/include/obj_rsakey.h b/src/include/obj_rsakey.h
index 48c0931..4f15d25 100644
--- a/src/include/obj_rsakey.h
+++ b/src/include/obj_rsakey.h
@@ -110,7 +110,7 @@ TSS_RESULT obj_rsakey_set_srk_pubkey(BYTE *);
#define RSAKEY_LIST_DECLARE struct obj_list rsakey_list
#define RSAKEY_LIST_DECLARE_EXTERN extern struct obj_list rsakey_list
-#define RSAKEY_LIST_INIT() list_init(&rsakey_list)
+#define RSAKEY_LIST_INIT() tspi_list_init(&rsakey_list)
#define RSAKEY_LIST_CONNECT(a,b) obj_connectContext_list(&rsakey_list, a, b)
#define RSAKEY_LIST_CLOSE(a) obj_list_close(&rsakey_list, &__tspi_rsakey_free, a)
http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=43f282a941bb3c682a9944120886475a4b3f8613
commit 43f282a941bb3c682a9944120886475a4b3f8613
Author: Richard Maciel <***@linux.vnet.ibm.com>
Date: Thu Feb 20 13:57:03 2014 -0300
list_init symbol got a different name and is now local-only
list_init function in src/tspi/obj.c had a name too generic
and it was being exported which was causing issues with other
libraries.
Applying both solutions is unnecessary, but I think it needs to
have a more specific name.
Signed-off-by: Richard Maciel <***@linux.vnet.ibm.com>
Acked-by:Joel Schopp <***@linux.vnet.ibm.com>
diff --git a/src/include/obj_tpm.h b/src/include/obj_tpm.h
index 9eb1db7..b90812f 100644
--- a/src/include/obj_tpm.h
+++ b/src/include/obj_tpm.h
@@ -71,7 +71,7 @@ TSS_RESULT obj_tpm_get_cred(TSS_HTPM, TSS_FLAG, UINT32 *, BYTE **);
#define TPM_LIST_DECLARE struct obj_list tpm_list
#define TPM_LIST_DECLARE_EXTERN extern struct obj_list tpm_list
-#define TPM_LIST_INIT() list_init(&tpm_list)
+#define TPM_LIST_INIT() tspi_list_init(&tpm_list)
#define TPM_LIST_CONNECT(a,b) obj_connectContext_list(&tpm_list, a, b)
#define TPM_LIST_CLOSE(a) obj_list_close(&tpm_list, &tpm_free, a)
diff --git a/src/tspi/obj.c b/src/tspi/obj.c
index ad5c79a..c434d9a 100644
--- a/src/tspi/obj.c
+++ b/src/tspi/obj.c
@@ -39,8 +39,8 @@ NVSTORE_LIST_DECLARE;
DELFAMILY_LIST_DECLARE;
MIGDATA_LIST_DECLARE;
-void
-list_init(struct obj_list *list)
+static void
+tspi_list_init(struct obj_list *list)
{
list->head = NULL;
MUTEX_INIT(list->lock);
-----------------------------------------------------------------------
Summary of changes:
src/include/obj_context.h | 2 +-
src/include/obj_daa.h | 2 +-
src/include/obj_daaarakey.h | 2 +-
src/include/obj_daacred.h | 2 +-
src/include/obj_daaissuerkey.h | 2 +-
src/include/obj_delfamily.h | 2 +-
src/include/obj_encdata.h | 2 +-
src/include/obj_hash.h | 2 +-
src/include/obj_migdata.h | 2 +-
src/include/obj_nv.h | 2 +-
src/include/obj_pcrs.h | 2 +-
src/include/obj_policy.h | 2 +-
src/include/obj_rsakey.h | 2 +-
src/include/obj_tpm.h | 2 +-
src/tspi/obj.c | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
hooks/post-receive
--
Trousers
Trousers