diff options
| author | Jonas Witschel <diabonas@gmx.de> | 2018-12-14 10:00:33 +0100 |
|---|---|---|
| committer | Tadeusz Struk <tadeusz.struk@intel.com> | 2018-12-14 10:22:18 -0800 |
| commit | 100cc46eb42adca65c707d915d82838111b36a56 (patch) | |
| tree | a743f5344423aec148c1f94a239929cf908a8b3c /test | |
| parent | 6996bc1fd2c9f40ac7f1fbdecc00f8f313974eb1 (diff) | |
| download | tpm2-tss-100cc46eb42adca65c707d915d82838111b36a56.tar.gz | |
tests: fix scan-build warnings with Clang 7.0.0
- Fix "uninitialized value" warning for sessionAttributes in
esys-create-session-auth.int.c.
- Supress "division by zero" warnings for HASH_ADD_INT in uthash.h,
reported upstream as https://github.com/troydhanson/uthash/issues/166.
Signed-off-by: Jonas Witschel <diabonas@gmx.de>
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/esys-create-session-auth.int.c | 7 | ||||
| -rw-r--r-- | test/integration/sapi-entity-util.c | 7 | ||||
| -rw-r--r-- | test/integration/sapi-session-util.c | 6 |
3 files changed, 16 insertions, 4 deletions
diff --git a/test/integration/esys-create-session-auth.int.c b/test/integration/esys-create-session-auth.int.c index 911479bc..75806246 100644 --- a/test/integration/esys-create-session-auth.int.c +++ b/test/integration/esys-create-session-auth.int.c @@ -217,10 +217,9 @@ test_esys_create_session_auth(ESYS_CONTEXT * esys_context) TPMA_SESSION sessionAttributes; TPMA_SESSION sessionAttributes2; - memset(&sessionAttributes, 0, sizeof sessionAttributes); - sessionAttributes |= TPMA_SESSION_DECRYPT; - sessionAttributes |= TPMA_SESSION_ENCRYPT; - sessionAttributes |= TPMA_SESSION_CONTINUESESSION; + sessionAttributes = (TPMA_SESSION_DECRYPT | + TPMA_SESSION_ENCRYPT | + TPMA_SESSION_CONTINUESESSION); TPM2_SE sessionType = TPM2_SE_HMAC; TPMI_ALG_HASH authHash = TPM2_ALG_SHA256; diff --git a/test/integration/sapi-entity-util.c b/test/integration/sapi-entity-util.c index 4ecaf02f..90ef689d 100644 --- a/test/integration/sapi-entity-util.c +++ b/test/integration/sapi-entity-util.c @@ -24,7 +24,14 @@ AddEntity(TPM2_HANDLE handle, TPM2B_AUTH *auth) return -1; e->entityHandle = handle; + + /* + * Exclude HASH_ADD_INT defined in uthash.h from Clang static analysis, + * see https://github.com/troydhanson/uthash/issues/166 + */ + #ifndef __clang_analyzer__ HASH_ADD_INT(entities, entityHandle, e); + #endif } CopySizedByteBuffer((TPM2B *)&e->entityAuth, (TPM2B *)auth); return 0; diff --git a/test/integration/sapi-session-util.c b/test/integration/sapi-session-util.c index 3ae6ad89..71abfe5d 100644 --- a/test/integration/sapi-session-util.c +++ b/test/integration/sapi-session-util.c @@ -315,7 +315,13 @@ TSS2_RC create_auth_session( if (tmp) HASH_DEL(sessions, tmp); + /* + * Exclude HASH_ADD_INT defined in uthash.h from Clang static analysis, see + * https://github.com/troydhanson/uthash/issues/166 + */ + #ifndef __clang_analyzer__ HASH_ADD_INT(sessions, sessionHandle, session); + #endif *psession = session; return TSS2_RC_SUCCESS; } |