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 "".
The branch, master has been updated via 981b778400a726121400dd4535f3cc2006d4ac67 (commit) via 8acb1d0a0c97d6902ad1b9f975facfc9c88f47b5 (commit) via af2c8ff31853d005aaa13247e3a19e5be7138c97 (commit) via 3f9e9b3f17627e35843eef7e3846a75298259b69 (commit) from 6c01f54700e5776d1f1b59517d053f0d9b62a10c (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 ----------------------------------------------------------------- commit 981b778400a726121400dd4535f3cc2006d4ac67 Author: Matias Elo matias.elo@nokia.com Date: Tue Jan 10 14:09:16 2017 +0200
validation: crypto: check auth options support before running tests
Skip running test if authentication options are not supported.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Nikhil Agarwal Nikhil.agarwal@linaro.org Reviewed-by: Balakrishna Garapati balakrishna.garapati@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index 426f842..43ddb2f 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -21,6 +21,22 @@ struct suite_context_s {
static struct suite_context_s suite_context;
+static const char *auth_alg_name(odp_auth_alg_t auth) +{ + switch (auth) { + case ODP_AUTH_ALG_NULL: + return "ODP_AUTH_ALG_NULL"; + case ODP_AUTH_ALG_MD5_HMAC: + return "ODP_AUTH_ALG_MD5_HMAC"; + case ODP_AUTH_ALG_SHA256_HMAC: + return "ODP_AUTH_ALG_SHA256_HMAC"; + case ODP_AUTH_ALG_AES_GCM: + return "ODP_AUTH_ALG_AES_GCM"; + default: + return "Unknown"; + } +} + static const char *cipher_alg_name(odp_cipher_alg_t cipher) { switch (cipher) { @@ -365,6 +381,41 @@ static int check_cipher_options(odp_cipher_alg_t cipher, uint32_t key_len, return 1; }
+/** + * Check if given authentication options are supported + * + * @param auth Authentication algorithm + * @param key_len Key length + * @param digest_len Digest length + * + * @retval non-zero if both authentication options are supported + * @retval 0 if both options are not supported + */ +static int check_auth_options(odp_auth_alg_t auth, uint32_t key_len, + uint32_t digest_len) +{ + int i; + int num; + odp_crypto_auth_capability_t capa[MAX_ALG_CAPA]; + + num = odp_crypto_auth_capability(auth, capa, MAX_ALG_CAPA); + CU_ASSERT_FATAL(num >= 1); + + for (i = 0; i < num; i++) { + if (key_len == capa[i].key_len && + digest_len == capa[i].digest_len) + break; + } + + if (i == num) { + printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " + "digest_len=%" PRIu32 "\n", auth_alg_name(auth), key_len, + digest_len); + return 0; + } + return 1; +} + static int check_alg_3des_cbc(void) { return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); @@ -546,6 +597,9 @@ void crypto_test_enc_alg_aes128_gcm(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue;
alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -586,6 +640,9 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue;
alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, @@ -629,6 +686,9 @@ void crypto_test_dec_alg_aes128_gcm(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue;
alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -670,6 +730,9 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void) if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, cipher_key.length, iv.length)) continue; + if (!check_auth_options(ODP_AUTH_ALG_AES_GCM, + auth_key.length, AES128_GCM_CHECK_LEN)) + continue;
alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, @@ -870,6 +933,10 @@ void crypto_test_alg_hmac_md5(void) auth_key.data = hmac_md5_reference_key[i]; auth_key.length = sizeof(hmac_md5_reference_key[i]);
+ if (!check_auth_options(ODP_AUTH_ALG_MD5_HMAC, auth_key.length, + HMAC_MD5_96_CHECK_LEN)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, iv, @@ -913,6 +980,11 @@ void crypto_test_alg_hmac_sha256(void) auth_key.data = hmac_sha256_reference_key[i]; auth_key.length = sizeof(hmac_sha256_reference_key[i]);
+ if (!check_auth_options(ODP_AUTH_ALG_SHA256_HMAC, + auth_key.length, + HMAC_SHA256_128_CHECK_LEN)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_NULL, iv,
commit 8acb1d0a0c97d6902ad1b9f975facfc9c88f47b5 Author: Matias Elo matias.elo@nokia.com Date: Tue Jan 10 14:09:15 2017 +0200
validation: crypto: check cipher options support before running tests
Skip running test if cipher options are not supported.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Nikhil Agarwal Nikhil.agarwal@linaro.org Reviewed-by: Balakrishna Garapati balakrishna.garapati@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index d96fa87..426f842 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -21,6 +21,24 @@ struct suite_context_s {
static struct suite_context_s suite_context;
+static const char *cipher_alg_name(odp_cipher_alg_t cipher) +{ + switch (cipher) { + case ODP_CIPHER_ALG_NULL: + return "ODP_CIPHER_ALG_NULL"; + case ODP_CIPHER_ALG_DES: + return "ODP_CIPHER_ALG_DES"; + case ODP_CIPHER_ALG_3DES_CBC: + return "ODP_CIPHER_ALG_3DES_CBC"; + case ODP_CIPHER_ALG_AES_CBC: + return "ODP_CIPHER_ALG_AES_CBC"; + case ODP_CIPHER_ALG_AES_GCM: + return "ODP_CIPHER_ALG_AES_GCM"; + default: + return "Unknown"; + } +} + /* Basic algorithm run function for async inplace mode. * Creates a session from input parameters and runs one operation * on input_vec. Checks the output of the crypto operation against @@ -312,6 +330,41 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) return ODP_TEST_ACTIVE; }
+/** + * Check if given cipher options are supported + * + * @param cipher Cipher algorithm + * @param key_len Key length + * @param iv_len IV length + * + * @retval non-zero if both cipher options are supported + * @retval 0 if both options are not supported + */ +static int check_cipher_options(odp_cipher_alg_t cipher, uint32_t key_len, + uint32_t iv_len) +{ + int i; + int num; + odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; + + num = odp_crypto_cipher_capability(cipher, cipher_capa, MAX_ALG_CAPA); + CU_ASSERT_FATAL(num >= 1); + + for (i = 0; i < num; i++) { + if (key_len == cipher_capa[i].key_len && + iv_len == cipher_capa[i].iv_len) + break; + } + + if (i == num) { + printf("\n Unsupported: alg=%s, key_len=%" PRIu32 ", " + "iv_len=%" PRIu32 "\n", cipher_alg_name(cipher), key_len, + iv_len); + return 0; + } + return 1; +} + static int check_alg_3des_cbc(void) { return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); @@ -336,6 +389,10 @@ void crypto_test_enc_alg_3des_cbc(void) iv.data = tdes_cbc_reference_iv[i]; iv.length = sizeof(tdes_cbc_reference_iv[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -367,6 +424,10 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -402,6 +463,10 @@ void crypto_test_dec_alg_3des_cbc(void) iv.data = tdes_cbc_reference_iv[i]; iv.length = sizeof(tdes_cbc_reference_iv[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -435,6 +500,10 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void) cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_3DES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_3DES_CBC, iv, @@ -474,6 +543,10 @@ void crypto_test_enc_alg_aes128_gcm(void) iv.data = aes128_gcm_reference_iv[i]; iv.length = sizeof(aes128_gcm_reference_iv[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -510,6 +583,10 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void) cipher_key.data = aes128_gcm_reference_key[i]; cipher_key.length = sizeof(aes128_gcm_reference_key[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -549,6 +626,10 @@ void crypto_test_dec_alg_aes128_gcm(void) iv.data = aes128_gcm_reference_iv[i]; iv.length = sizeof(aes128_gcm_reference_iv[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -586,6 +667,10 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void) cipher_key.data = aes128_gcm_reference_key[i]; cipher_key.length = sizeof(aes128_gcm_reference_key[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_GCM, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_GCM, iv, @@ -629,6 +714,10 @@ void crypto_test_enc_alg_aes128_cbc(void) iv.data = aes128_cbc_reference_iv[i]; iv.length = sizeof(aes128_cbc_reference_iv[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, iv, @@ -660,6 +749,10 @@ void crypto_test_enc_alg_aes128_cbc_ovr_iv(void) cipher_key.data = aes128_cbc_reference_key[i]; cipher_key.length = sizeof(aes128_cbc_reference_key[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_ENCODE, ODP_CIPHER_ALG_AES_CBC, iv, @@ -695,6 +788,10 @@ void crypto_test_dec_alg_aes128_cbc(void) iv.data = aes128_cbc_reference_iv[i]; iv.length = sizeof(aes128_cbc_reference_iv[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, iv, @@ -728,6 +825,10 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void) cipher_key.data = aes128_cbc_reference_key[i]; cipher_key.length = sizeof(aes128_cbc_reference_key[i]);
+ if (!check_cipher_options(ODP_CIPHER_ALG_AES_CBC, + cipher_key.length, iv.length)) + continue; + alg_test(ODP_CRYPTO_OP_DECODE, ODP_CIPHER_ALG_AES_CBC, iv,
commit af2c8ff31853d005aaa13247e3a19e5be7138c97 Author: Matias Elo matias.elo@nokia.com Date: Tue Jan 10 14:09:14 2017 +0200
validation: crypto: check cipher/auth algorithm support before use
Skip test if selected cipher/authentication algorithms are not supported.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Nikhil Agarwal Nikhil.agarwal@linaro.org Reviewed-by: Balakrishna Garapati balakrishna.garapati@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c index 2089016..e7c2bf3 100644 --- a/test/common_plat/validation/api/crypto/crypto.c +++ b/test/common_plat/validation/api/crypto/crypto.c @@ -13,8 +13,10 @@ #define PKT_POOL_LEN (1 * 1024)
odp_suiteinfo_t crypto_suites[] = { - {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, NULL, crypto_suite}, - {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, NULL, crypto_suite}, + {ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, crypto_suite_term, + crypto_suite}, + {ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, crypto_suite_term, + crypto_suite}, ODP_SUITE_INFO_NULL, };
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index db58344..d96fa87 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -243,6 +243,80 @@ cleanup: odp_packet_free(pkt); }
+/** + * Check if given cipher and authentication algorithms are supported + * + * @param cipher Cipher algorithm + * @param auth Authentication algorithm + * + * @retval ODP_TEST_ACTIVE when both algorithms are supported + * @retval ODP_TEST_INACTIVE when either algorithm is not supported + */ +static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) +{ + odp_crypto_capability_t capability; + + if (odp_crypto_capability(&capability)) + return ODP_TEST_INACTIVE; + + /* Cipher algorithms */ + switch (cipher) { + case ODP_CIPHER_ALG_NULL: + if (!capability.ciphers.bit.null) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_DES: + if (!capability.ciphers.bit.des) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_3DES_CBC: + if (!capability.ciphers.bit.trides_cbc) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_AES_CBC: + if (!capability.ciphers.bit.aes_cbc) + return ODP_TEST_INACTIVE; + break; + case ODP_CIPHER_ALG_AES_GCM: + if (!capability.ciphers.bit.aes_gcm) + return ODP_TEST_INACTIVE; + break; + default: + fprintf(stderr, "Unsupported cipher algorithm\n"); + return ODP_TEST_INACTIVE; + } + + /* Authentication algorithms */ + switch (auth) { + case ODP_AUTH_ALG_NULL: + if (!capability.auths.bit.null) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_MD5_HMAC: + if (!capability.auths.bit.md5_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_SHA256_HMAC: + if (!capability.auths.bit.sha256_hmac) + return ODP_TEST_INACTIVE; + break; + case ODP_AUTH_ALG_AES_GCM: + if (!capability.auths.bit.aes_gcm) + return ODP_TEST_INACTIVE; + break; + default: + fprintf(stderr, "Unsupported authentication algorithm\n"); + return ODP_TEST_INACTIVE; + } + + return ODP_TEST_ACTIVE; +} + +static int check_alg_3des_cbc(void) +{ + return check_alg_support(ODP_CIPHER_ALG_3DES_CBC, ODP_AUTH_ALG_NULL); +} + /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for 3DES_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the @@ -376,6 +450,11 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void) } }
+static int check_alg_aes_gcm(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_GCM, ODP_AUTH_ALG_AES_GCM); +} + /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_GCM algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the @@ -526,6 +605,11 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void) } }
+static int check_alg_aes_cbc(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_CBC, ODP_AUTH_ALG_NULL); +} + /* This test verifies the correctness of encode (plaintext -> ciphertext) * operation for AES128_CBC algorithm. IV for the operation is the session IV. * In addition the test verifies if the implementation can use the @@ -659,6 +743,11 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void) } }
+static int check_alg_hmac_md5(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC); +} + /* This test verifies the correctness of HMAC_MD5 digest operation. * The output check length is truncated to 12 bytes (96 bits) as * returned by the crypto operation API call. @@ -696,6 +785,11 @@ void crypto_test_alg_hmac_md5(void) } }
+static int check_alg_hmac_sha256(void) +{ + return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SHA256_HMAC); +} + /* This test verifies the correctness of HMAC_MD5 digest operation. * The output check length is truncated to 12 bytes (96 bits) as * returned by the crypto operation API call. @@ -759,19 +853,51 @@ int crypto_suite_async_init(void) }
odp_testinfo_t crypto_suite[] = { - ODP_TEST_INFO(crypto_test_enc_alg_3des_cbc), - ODP_TEST_INFO(crypto_test_dec_alg_3des_cbc), - ODP_TEST_INFO(crypto_test_enc_alg_3des_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_dec_alg_3des_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_cbc), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_cbc), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_cbc_ovr_iv), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_gcm), - ODP_TEST_INFO(crypto_test_enc_alg_aes128_gcm_ovr_iv), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_gcm), - ODP_TEST_INFO(crypto_test_dec_alg_aes128_gcm_ovr_iv), - ODP_TEST_INFO(crypto_test_alg_hmac_md5), - ODP_TEST_INFO(crypto_test_alg_hmac_sha256), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_3des_cbc_ovr_iv, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_3des_cbc_ovr_iv, + check_alg_3des_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_cbc, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_cbc, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_cbc_ovr_iv, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_cbc_ovr_iv, + check_alg_aes_cbc), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_gcm, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes128_gcm_ovr_iv, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_gcm, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes128_gcm_ovr_iv, + check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_alg_hmac_md5, + check_alg_hmac_md5), + ODP_TEST_INFO_CONDITIONAL(crypto_test_alg_hmac_sha256, + check_alg_hmac_sha256), ODP_TEST_INFO_NULL, }; + +int crypto_suite_term(void) +{ + int i; + int first = 1; + + for (i = 0; crypto_suite[i].pName; i++) { + if (crypto_suite[i].check_active && + crypto_suite[i].check_active() == ODP_TEST_INACTIVE) { + if (first) { + first = 0; + printf("\n\n Inactive tests:\n"); + } + printf(" %s\n", crypto_suite[i].pName); + } + } + return 0; +} diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h index 8bda344..0f69337 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h @@ -17,5 +17,6 @@ extern odp_testinfo_t crypto_suite[];
int crypto_suite_sync_init(void); int crypto_suite_async_init(void); +int crypto_suite_term(void);
#endif
commit 3f9e9b3f17627e35843eef7e3846a75298259b69 Author: Matias Elo matias.elo@nokia.com Date: Tue Jan 10 14:09:13 2017 +0200
validation: crypto: fix hw cipher/auth algorithm check
Some algorithms may be implemented using hardware and some using software. All supported algorithms should be set in capacity.auths /capacity.ciphers independent of implementation types.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Nikhil Agarwal Nikhil.agarwal@linaro.org Reviewed-by: Balakrishna Garapati balakrishna.garapati@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index de9d6e4..db58344 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -47,7 +47,7 @@ static void alg_test(odp_crypto_op_t op, uint32_t digest_len) { odp_crypto_session_t session; - odp_crypto_capability_t capability; + odp_crypto_capability_t capa; int rc; odp_crypto_ses_create_err_t status; odp_bool_t posted; @@ -63,50 +63,43 @@ static void alg_test(odp_crypto_op_t op, int num, i; int found;
- rc = odp_crypto_capability(&capability); + rc = odp_crypto_capability(&capa); CU_ASSERT(!rc);
- if (capability.hw_ciphers.all_bits) { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.hw_ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.hw_ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.hw_ciphers.bit.aes_gcm)) - rc = -1; - } else { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.ciphers.bit.aes_gcm)) - rc = -1; - } + if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && + !(capa.ciphers.bit.trides_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && + !(capa.ciphers.bit.aes_cbc)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && + !(capa.ciphers.bit.aes_gcm)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_DES && + !(capa.ciphers.bit.des)) + rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_NULL && + !(capa.ciphers.bit.null)) + rc = -1;
CU_ASSERT(!rc); - - if (capability.hw_auths.all_bits) { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.hw_auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.hw_auths.bit.null)) - rc = -1; - } else { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.auths.bit.null)) - rc = -1; - } + CU_ASSERT((~capa.ciphers.all_bits & capa.hw_ciphers.all_bits) == 0); + + if (auth_alg == ODP_AUTH_ALG_AES_GCM && + !(capa.auths.bit.aes_gcm)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_MD5_HMAC && + !(capa.auths.bit.md5_hmac)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_NULL && + !(capa.auths.bit.null)) + rc = -1; + if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && + !(capa.auths.bit.sha256_hmac)) + rc = -1;
CU_ASSERT(!rc); + CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0);
num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, MAX_ALG_CAPA);
-----------------------------------------------------------------------
Summary of changes: test/common_plat/validation/api/crypto/crypto.c | 6 +- .../validation/api/crypto/odp_crypto_test_inp.c | 398 ++++++++++++++++++--- .../validation/api/crypto/odp_crypto_test_inp.h | 1 + 3 files changed, 350 insertions(+), 55 deletions(-)
hooks/post-receive
-
git＠git-us.linaro.org