deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compiler warning

Browse Source 
Move #ifdef from the inside to the outside of assert()'s
to get rid of this compiler warning:

warning: embedding a directive within macro arguments has undefined
behavior [-Wembedded-directive]

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2021-04-07 00:58:49 +03:00 committed by Alexander Amelkin
parent fb176a1995
commit 61bb233c5b
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/lanplus/lanplus_crypt.c
View File

@ -84,12 +84,16 @@ lanplus_rakp2_hmac_matches(const struct ipmi_session * session,
return 1; return 1;
/* We don't yet support other algorithms */ /* We don't yet support other algorithms */
#ifdef HAVE_CRYPTO_SHA256 // assert() is a macro, must not put #ifdef inside it
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1) assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
#ifdef HAVE_CRYPTO_SHA256
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
#endif /* HAVE_CRYPTO_SHA256 */
); );
#else
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
);
#endif /* HAVE_CRYPTO_SHA256 */
bufferLength = bufferLength =
@ -251,12 +255,16 @@ lanplus_rakp4_hmac_matches(const struct ipmi_session * session,
return 1; return 1;
/* We don't yet support other algorithms */ /* We don't yet support other algorithms */
#ifdef HAVE_CRYPTO_SHA256 // assert() is a macro, must not put #ifdef inside it
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1) assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
#ifdef HAVE_CRYPTO_SHA256
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
#endif /* HAVE_CRYPTO_SHA256 */
); );
#else
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
);
#endif /* HAVE_CRYPTO_SHA256 */
} }
bufferLength = bufferLength =
@ -417,12 +425,16 @@ lanplus_generate_rakp3_authcode(uint8_t * output_buffer,
} }
/* We don't yet support other algorithms */ /* We don't yet support other algorithms */
#ifdef HAVE_CRYPTO_SHA256 // assert() is a macro, must not put #ifdef inside it
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1) assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
#ifdef HAVE_CRYPTO_SHA256
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
#endif /* HAVE_CRYPTO_SHA256 */
); );
#else
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
);
#endif /* HAVE_CRYPTO_SHA256 */
input_buffer_length = input_buffer_length =
16 + /* Rc */ 16 + /* Rc */
@ -539,12 +551,16 @@ lanplus_generate_sik(struct ipmi_session * session, struct ipmi_intf * intf)
return 0; return 0;
/* We don't yet support other algorithms */ /* We don't yet support other algorithms */
#ifdef HAVE_CRYPTO_SHA256 // assert() is a macro, must not put #ifdef inside it
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1) assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
#ifdef HAVE_CRYPTO_SHA256
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256) || (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
#endif /* HAVE_CRYPTO_SHA256 */
); );
#else
assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
);
#endif /* HAVE_CRYPTO_SHA256 */
input_buffer_length = input_buffer_length =
16 + /* Rm */ 16 + /* Rm */