From 8a9867a635c0572e926d87b7207dd064546388de Mon Sep 17 00:00:00 2001 From: Slawomir Mrozowicz Date: Tue, 18 Oct 2016 13:36:13 +0200 Subject: [PATCH] crypto/openssl: rename libcrypto to openssl This patch replaces name "libcrypto" to "openssl" from file directories, symbol prefixes and sub-names connected with old name. Renamed poll mode driver files, test files, and documentations. It is done to better name association with library because the cryptography operations are using Openssl library crypto API. Fixes: d61f70b4c918 ("crypto/libcrypto: add driver for OpenSSL library") Signed-off-by: Slawomir Mrozowicz Acked-by: Deepak Kumar Jain --- MAINTAINERS | 6 +- app/test/test_cryptodev.c | 56 ++-- app/test/test_cryptodev_aes_test_vectors.h | 62 ++--- app/test/test_cryptodev_blockcipher.c | 6 +- app/test/test_cryptodev_blockcipher.h | 2 +- app/test/test_cryptodev_des_test_vectors.h | 56 ++-- app/test/test_cryptodev_hash_test_vectors.h | 48 ++-- app/test/test_cryptodev_perf.c | 52 ++-- config/common_base | 4 +- doc/guides/cryptodevs/index.rst | 2 +- .../cryptodevs/{libcrypto.rst => openssl.rst} | 18 +- doc/guides/rel_notes/release_16_11.rst | 2 +- drivers/crypto/Makefile | 2 +- .../crypto/{libcrypto => openssl}/Makefile | 18 +- .../rte_openssl_pmd.c} | 240 +++++++++--------- .../rte_openssl_pmd_ops.c} | 110 ++++---- .../rte_openssl_pmd_private.h} | 84 +++--- .../rte_pmd_openssl_version.map} | 0 lib/librte_cryptodev/rte_cryptodev.h | 4 +- mk/rte.app.mk | 2 +- scripts/test-build.sh | 2 +- 21 files changed, 388 insertions(+), 388 deletions(-) rename doc/guides/cryptodevs/{libcrypto.rst => openssl.rst} (88%) rename drivers/crypto/{libcrypto => openssl}/Makefile (78%) rename drivers/crypto/{libcrypto/rte_libcrypto_pmd.c => openssl/rte_openssl_pmd.c} (79%) rename drivers/crypto/{libcrypto/rte_libcrypto_pmd_ops.c => openssl/rte_openssl_pmd_ops.c} (81%) rename drivers/crypto/{libcrypto/rte_libcrypto_pmd_private.h => openssl/rte_openssl_pmd_private.h} (70%) rename drivers/crypto/{libcrypto/rte_pmd_libcrypto_version.map => openssl/rte_pmd_openssl_version.map} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 621bda6707..ccba4c9780 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -437,10 +437,10 @@ M: Pablo de Lara F: drivers/crypto/zuc/ F: doc/guides/cryptodevs/zuc.rst -LibCrypto PMD +OpenSSL PMD M: Declan Doherty -F: drivers/crypto/libcrypto/ -F: doc/guides/cryptodevs/libcrypto.rst +F: drivers/crypto/openssl/ +F: doc/guides/cryptodevs/openssl.rst Null Crypto PMD M: Declan Doherty diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index c7e88c4dea..872f8b431e 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -326,24 +326,24 @@ testsuite_setup(void) } } - /* Create 2 LIBCRYPTO devices if required */ - if (gbl_cryptodev_type == RTE_CRYPTODEV_LIBCRYPTO_PMD) { -#ifndef RTE_LIBRTE_PMD_LIBCRYPTO - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO must be" + /* Create 2 OPENSSL devices if required */ + if (gbl_cryptodev_type == RTE_CRYPTODEV_OPENSSL_PMD) { +#ifndef RTE_LIBRTE_PMD_OPENSSL + RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_OPENSSL must be" " enabled in config file to run this testsuite.\n"); return TEST_FAILED; #endif nb_devs = rte_cryptodev_count_devtype( - RTE_CRYPTODEV_LIBCRYPTO_PMD); + RTE_CRYPTODEV_OPENSSL_PMD); if (nb_devs < 2) { for (i = nb_devs; i < 2; i++) { ret = rte_eal_vdev_init( - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD), + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), NULL); TEST_ASSERT(ret == 0, "Failed to create " "instance %u of pmd : %s", i, - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD)); + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); } } } @@ -1482,14 +1482,14 @@ test_AES_chain_mb_all(void) } static int -test_AES_chain_libcrypto_all(void) +test_AES_chain_openssl_all(void) { struct crypto_testsuite_params *ts_params = &testsuite_params; int status; status = test_blockcipher_all_tests(ts_params->mbuf_pool, ts_params->op_mpool, ts_params->valid_devs[0], - RTE_CRYPTODEV_LIBCRYPTO_PMD, + RTE_CRYPTODEV_OPENSSL_PMD, BLKCIPHER_AES_CHAIN_TYPE); TEST_ASSERT_EQUAL(status, 0, "Test failed"); @@ -1498,14 +1498,14 @@ test_AES_chain_libcrypto_all(void) } static int -test_AES_cipheronly_libcrypto_all(void) +test_AES_cipheronly_openssl_all(void) { struct crypto_testsuite_params *ts_params = &testsuite_params; int status; status = test_blockcipher_all_tests(ts_params->mbuf_pool, ts_params->op_mpool, ts_params->valid_devs[0], - RTE_CRYPTODEV_LIBCRYPTO_PMD, + RTE_CRYPTODEV_OPENSSL_PMD, BLKCIPHER_AES_CIPHERONLY_TYPE); TEST_ASSERT_EQUAL(status, 0, "Test failed"); @@ -1530,14 +1530,14 @@ test_AES_chain_qat_all(void) } static int -test_authonly_libcrypto_all(void) +test_authonly_openssl_all(void) { struct crypto_testsuite_params *ts_params = &testsuite_params; int status; status = test_blockcipher_all_tests(ts_params->mbuf_pool, ts_params->op_mpool, ts_params->valid_devs[0], - RTE_CRYPTODEV_LIBCRYPTO_PMD, + RTE_CRYPTODEV_OPENSSL_PMD, BLKCIPHER_AUTHONLY_TYPE); TEST_ASSERT_EQUAL(status, 0, "Test failed"); @@ -3829,14 +3829,14 @@ test_3DES_cipheronly_qat_all(void) } static int -test_3DES_chain_libcrypto_all(void) +test_3DES_chain_openssl_all(void) { struct crypto_testsuite_params *ts_params = &testsuite_params; int status; status = test_blockcipher_all_tests(ts_params->mbuf_pool, ts_params->op_mpool, ts_params->valid_devs[0], - RTE_CRYPTODEV_LIBCRYPTO_PMD, + RTE_CRYPTODEV_OPENSSL_PMD, BLKCIPHER_3DES_CHAIN_TYPE); TEST_ASSERT_EQUAL(status, 0, "Test failed"); @@ -3845,14 +3845,14 @@ test_3DES_chain_libcrypto_all(void) } static int -test_3DES_cipheronly_libcrypto_all(void) +test_3DES_cipheronly_openssl_all(void) { struct crypto_testsuite_params *ts_params = &testsuite_params; int status; status = test_blockcipher_all_tests(ts_params->mbuf_pool, ts_params->op_mpool, ts_params->valid_devs[0], - RTE_CRYPTODEV_LIBCRYPTO_PMD, + RTE_CRYPTODEV_OPENSSL_PMD, BLKCIPHER_3DES_CIPHERONLY_TYPE); TEST_ASSERT_EQUAL(status, 0, "Test failed"); @@ -6190,8 +6190,8 @@ static struct unit_test_suite cryptodev_aesni_mb_testsuite = { } }; -static struct unit_test_suite cryptodev_libcrypto_testsuite = { - .suite_name = "Crypto Device LIBCRYPTO Unit Test Suite", +static struct unit_test_suite cryptodev_openssl_testsuite = { + .suite_name = "Crypto Device OPENSSL Unit Test Suite", .setup = testsuite_setup, .teardown = testsuite_teardown, .unit_test_cases = { @@ -6199,15 +6199,15 @@ static struct unit_test_suite cryptodev_libcrypto_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session_random_usage), TEST_CASE_ST(ut_setup, ut_teardown, - test_AES_chain_libcrypto_all), + test_AES_chain_openssl_all), TEST_CASE_ST(ut_setup, ut_teardown, - test_AES_cipheronly_libcrypto_all), + test_AES_cipheronly_openssl_all), TEST_CASE_ST(ut_setup, ut_teardown, - test_3DES_chain_libcrypto_all), + test_3DES_chain_openssl_all), TEST_CASE_ST(ut_setup, ut_teardown, - test_3DES_cipheronly_libcrypto_all), + test_3DES_cipheronly_openssl_all), TEST_CASE_ST(ut_setup, ut_teardown, - test_authonly_libcrypto_all), + test_authonly_openssl_all), /** AES GCM Authenticated Encryption */ TEST_CASE_ST(ut_setup, ut_teardown, @@ -6520,11 +6520,11 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/) } static int -test_cryptodev_libcrypto(void) +test_cryptodev_openssl(void) { - gbl_cryptodev_type = RTE_CRYPTODEV_LIBCRYPTO_PMD; + gbl_cryptodev_type = RTE_CRYPTODEV_OPENSSL_PMD; - return unit_test_suite_runner(&cryptodev_libcrypto_testsuite); + return unit_test_suite_runner(&cryptodev_openssl_testsuite); } static int @@ -6569,7 +6569,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/) REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat); REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb); -REGISTER_TEST_COMMAND(cryptodev_libcrypto_autotest, test_cryptodev_libcrypto); +REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl); REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm); REGISTER_TEST_COMMAND(cryptodev_null_autotest, test_cryptodev_null); REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g); diff --git a/app/test/test_cryptodev_aes_test_vectors.h b/app/test/test_cryptodev_aes_test_vectors.h index e922cd3af3..1c68f93e6a 100644 --- a/app/test/test_cryptodev_aes_test_vectors.h +++ b/app/test/test_cryptodev_aes_test_vectors.h @@ -831,7 +831,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_1, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -840,7 +840,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_1, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -862,7 +862,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_3, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -871,7 +871,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_3, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -879,7 +879,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_4, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -888,7 +888,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_4, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -896,7 +896,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_5, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -905,7 +905,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_5, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -913,7 +913,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_6, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -923,7 +923,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-128-CBC HMAC-SHA512 Decryption Digest " @@ -931,7 +931,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_6, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -955,7 +955,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_QAT | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest " @@ -964,14 +964,14 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_QAT | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-128-CBC HMAC-SHA224 Encryption Digest", .test_data = &aes_test_data_8, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -980,7 +980,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_8, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -988,7 +988,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_9, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -997,7 +997,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_9, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB | - BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -1006,7 +1006,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_4, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = @@ -1015,7 +1015,7 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .test_data = &aes_test_data_4, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, }; @@ -1024,73 +1024,73 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = { .test_descr = "AES-128-CBC Encryption", .test_data = &aes_test_data_4, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-128-CBC Decryption", .test_data = &aes_test_data_4, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-192-CBC Encryption", .test_data = &aes_test_data_10, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-192-CBC Decryption", .test_data = &aes_test_data_10, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-256-CBC Encryption", .test_data = &aes_test_data_11, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-256-CBC Decryption", .test_data = &aes_test_data_11, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-128-CTR Encryption", .test_data = &aes_test_data_1, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-128-CTR Decryption", .test_data = &aes_test_data_1, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-192-CTR Encryption", .test_data = &aes_test_data_2, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-192-CTR Decryption", .test_data = &aes_test_data_2, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-256-CTR Encryption", .test_data = &aes_test_data_3, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "AES-256-CTR Decryption", .test_data = &aes_test_data_3, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, }; diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c index deb2ada285..37b10cf3e1 100644 --- a/app/test/test_cryptodev_blockcipher.c +++ b/app/test/test_cryptodev_blockcipher.c @@ -81,7 +81,7 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t, switch (cryptodev_type) { case RTE_CRYPTODEV_QAT_SYM_PMD: - case RTE_CRYPTODEV_LIBCRYPTO_PMD: + case RTE_CRYPTODEV_OPENSSL_PMD: digest_len = tdata->digest.len; break; case RTE_CRYPTODEV_AESNI_MB_PMD: @@ -505,8 +505,8 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool, case RTE_CRYPTODEV_QAT_SYM_PMD: target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_QAT; break; - case RTE_CRYPTODEV_LIBCRYPTO_PMD: - target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO; + case RTE_CRYPTODEV_OPENSSL_PMD: + target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL; break; default: TEST_ASSERT(0, "Unrecognized cryptodev type"); diff --git a/app/test/test_cryptodev_blockcipher.h b/app/test/test_cryptodev_blockcipher.h index cce094d15c..04ff1ee3ea 100644 --- a/app/test/test_cryptodev_blockcipher.h +++ b/app/test/test_cryptodev_blockcipher.h @@ -48,7 +48,7 @@ #define BLOCKCIPHER_TEST_TARGET_PMD_MB 0x0001 /* Multi-buffer flag */ #define BLOCKCIPHER_TEST_TARGET_PMD_QAT 0x0002 /* QAT flag */ -#define BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO 0x0004 /* SW LIBCRYPTO flag */ +#define BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL 0x0004 /* SW OPENSSL flag */ #define BLOCKCIPHER_TEST_OP_CIPHER (BLOCKCIPHER_TEST_OP_ENCRYPT | \ BLOCKCIPHER_TEST_OP_DECRYPT) diff --git a/app/test/test_cryptodev_des_test_vectors.h b/app/test/test_cryptodev_des_test_vectors.h index 687ccbea3b..a1d2d978cd 100644 --- a/app/test/test_cryptodev_des_test_vectors.h +++ b/app/test/test_cryptodev_des_test_vectors.h @@ -757,112 +757,112 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = { .test_descr = "3DES-128-CBC HMAC-SHA1 Encryption Digest", .test_data = &triple_des128cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-128-CBC HMAC-SHA1 Decryption Digest Verify", .test_data = &triple_des128cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-128-CBC SHA1 Encryption Digest", .test_data = &triple_des128cbc_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-128-CBC SHA1 Decryption Digest Verify", .test_data = &triple_des128cbc_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-192-CBC HMAC-SHA1 Encryption Digest", .test_data = &triple_des192cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CBC HMAC-SHA1 Decryption Digest Verify", .test_data = &triple_des192cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CBC SHA1 Encryption Digest", .test_data = &triple_des192cbc_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-192-CBC SHA1 Decryption Digest Verify", .test_data = &triple_des192cbc_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-128-CTR HMAC-SHA1 Encryption Digest", .test_data = &triple_des128ctr_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-128-CTR HMAC-SHA1 Decryption Digest Verify", .test_data = &triple_des128ctr_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-128-CTR SHA1 Encryption Digest", .test_data = &triple_des128ctr_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-128-CTR SHA1 Decryption Digest Verify", .test_data = &triple_des128ctr_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-192-CTR HMAC-SHA1 Encryption Digest", .test_data = &triple_des192ctr_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CTR HMAC-SHA1 Decryption Digest Verify", .test_data = &triple_des192ctr_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CTR SHA1 Encryption Digest", .test_data = &triple_des192ctr_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-192-CTR SHA1 Decryption Digest Verify", .test_data = &triple_des192ctr_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "3DES-128-CBC HMAC-SHA1 Encryption Digest OOP", .test_data = &triple_des128cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -871,7 +871,7 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = { .test_data = &triple_des128cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { @@ -880,7 +880,7 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = { .test_data = &triple_des128cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = @@ -889,7 +889,7 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = { .test_data = &triple_des128cbc_hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, }; @@ -898,56 +898,56 @@ static const struct blockcipher_test_case triple_des_cipheronly_test_cases[] = { .test_descr = "3DES-128-CBC Encryption", .test_data = &triple_des128cbc_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-128-CBC Decryption", .test_data = &triple_des128cbc_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CBC Encryption", .test_data = &triple_des192cbc_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CBC Decryption", .test_data = &triple_des192cbc_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-128-CTR Encryption", .test_data = &triple_des128ctr_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-128-CTR Decryption", .test_data = &triple_des128ctr_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CTR Encryption", .test_data = &triple_des192ctr_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT }, { .test_descr = "3DES-192-CTR Decryption", .test_data = &triple_des192ctr_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO | + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | BLOCKCIPHER_TEST_TARGET_PMD_QAT } }; diff --git a/app/test/test_cryptodev_hash_test_vectors.h b/app/test/test_cryptodev_hash_test_vectors.h index dfc84db6f7..9f095cf322 100644 --- a/app/test/test_cryptodev_hash_test_vectors.h +++ b/app/test/test_cryptodev_hash_test_vectors.h @@ -346,145 +346,145 @@ static const struct blockcipher_test_case hash_test_cases[] = { .test_descr = "MD5 Digest", .test_data = &md5_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "MD5 Digest Verify", .test_data = &md5_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-MD5 Digest", .test_data = &hmac_md5_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-MD5 Digest Verify", .test_data = &hmac_md5_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA1 Digest", .test_data = &sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA1 Digest Verify", .test_data = &sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA1 Digest", .test_data = &hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA1 Digest Verify", .test_data = &hmac_sha1_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA224 Digest", .test_data = &sha224_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA224 Digest Verify", .test_data = &sha224_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA224 Digest", .test_data = &hmac_sha224_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA224 Digest Verify", .test_data = &hmac_sha224_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA256 Digest", .test_data = &sha256_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA256 Digest Verify", .test_data = &sha256_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA256 Digest", .test_data = &hmac_sha256_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA256 Digest Verify", .test_data = &hmac_sha256_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA384 Digest", .test_data = &sha384_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA384 Digest Verify", .test_data = &sha384_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA384 Digest", .test_data = &hmac_sha384_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA384 Digest Verify", .test_data = &hmac_sha384_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA512 Digest", .test_data = &sha512_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "SHA512 Digest Verify", .test_data = &sha512_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA512 Digest", .test_data = &hmac_sha512_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, { .test_descr = "HMAC-SHA512 Digest Verify", .test_data = &hmac_sha512_test_vector, .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY, - .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_LIBCRYPTO + .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL }, }; diff --git a/app/test/test_cryptodev_perf.c b/app/test/test_cryptodev_perf.c index e931ac537f..e05e11bc90 100644 --- a/app/test/test_cryptodev_perf.c +++ b/app/test/test_cryptodev_perf.c @@ -153,7 +153,7 @@ test_perf_create_snow3g_session(uint8_t dev_id, enum chain_mode chain, unsigned int cipher_key_len, enum rte_crypto_auth_algorithm auth_algo); static struct rte_cryptodev_sym_session * -test_perf_create_libcrypto_session(uint8_t dev_id, enum chain_mode chain, +test_perf_create_openssl_session(uint8_t dev_id, enum chain_mode chain, enum rte_crypto_cipher_algorithm cipher_algo, unsigned int cipher_key_len, enum rte_crypto_auth_algorithm auth_algo); @@ -375,24 +375,24 @@ testsuite_setup(void) } } - /* Create 2 LIBCRYPTO devices if required */ - if (gbl_cryptodev_perftest_devtype == RTE_CRYPTODEV_LIBCRYPTO_PMD) { -#ifndef RTE_LIBRTE_PMD_LIBCRYPTO - RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO must be" + /* Create 2 OPENSSL devices if required */ + if (gbl_cryptodev_perftest_devtype == RTE_CRYPTODEV_OPENSSL_PMD) { +#ifndef RTE_LIBRTE_PMD_OPENSSL + RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_OPENSSL must be" " enabled in config file to run this testsuite.\n"); return TEST_FAILED; #endif nb_devs = rte_cryptodev_count_devtype( - RTE_CRYPTODEV_LIBCRYPTO_PMD); + RTE_CRYPTODEV_OPENSSL_PMD); if (nb_devs < 2) { for (i = nb_devs; i < 2; i++) { ret = rte_eal_vdev_init( - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD), + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), NULL); TEST_ASSERT(ret == 0, "Failed to create " "instance %u of pmd : %s", i, - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD)); + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)); } } } @@ -2268,7 +2268,7 @@ test_perf_snow3G_vary_burst_size(void) } static int -test_perf_libcrypto_optimise_cyclecount(struct perf_test_params *pparams) +test_perf_openssl_optimise_cyclecount(struct perf_test_params *pparams) { uint32_t num_to_submit = pparams->total_operations; struct rte_crypto_op *c_ops[num_to_submit]; @@ -2295,7 +2295,7 @@ test_perf_libcrypto_optimise_cyclecount(struct perf_test_params *pparams) } /* Create Crypto session*/ - sess = test_perf_create_libcrypto_session(ts_params->dev_id, + sess = test_perf_create_openssl_session(ts_params->dev_id, pparams->chain, pparams->cipher_algo, pparams->cipher_key_length, pparams->auth_algo); TEST_ASSERT_NOT_NULL(sess, "Session creation failed"); @@ -2616,7 +2616,7 @@ test_perf_create_snow3g_session(uint8_t dev_id, enum chain_mode chain, } static struct rte_cryptodev_sym_session * -test_perf_create_libcrypto_session(uint8_t dev_id, enum chain_mode chain, +test_perf_create_openssl_session(uint8_t dev_id, enum chain_mode chain, enum rte_crypto_cipher_algorithm cipher_algo, unsigned int cipher_key_len, enum rte_crypto_auth_algorithm auth_algo) @@ -3128,7 +3128,7 @@ test_perf_snow3g(uint8_t dev_id, uint16_t queue_id, } static int -test_perf_libcrypto(uint8_t dev_id, uint16_t queue_id, +test_perf_openssl(uint8_t dev_id, uint16_t queue_id, struct perf_test_params *pparams) { uint16_t i, k, l, m; @@ -3177,7 +3177,7 @@ test_perf_libcrypto(uint8_t dev_id, uint16_t queue_id, } /* Create Crypto session*/ - sess = test_perf_create_libcrypto_session(ts_params->dev_id, + sess = test_perf_create_openssl_session(ts_params->dev_id, pparams->chain, pparams->cipher_algo, pparams->cipher_key_length, pparams->auth_algo); TEST_ASSERT_NOT_NULL(sess, "Session creation failed"); @@ -3423,7 +3423,7 @@ test_perf_snow3G_vary_pkt_size(void) } static int -test_perf_libcrypto_vary_pkt_size(void) +test_perf_openssl_vary_pkt_size(void) { unsigned int total_operations = 10000; unsigned int burst_size = { 64 }; @@ -3497,7 +3497,7 @@ test_perf_libcrypto_vary_pkt_size(void) "EmptyPolls\n"); for (j = 0; j < RTE_DIM(buf_lengths); j++) { params_set[i].buf_size = buf_lengths[j]; - test_perf_libcrypto(testsuite_params.dev_id, 0, + test_perf_openssl(testsuite_params.dev_id, 0, ¶ms_set[i]); } } @@ -3506,7 +3506,7 @@ test_perf_libcrypto_vary_pkt_size(void) } static int -test_perf_libcrypto_vary_burst_size(void) +test_perf_openssl_vary_burst_size(void) { unsigned int total_operations = 4096; uint16_t buf_lengths[] = { 40 }; @@ -3576,7 +3576,7 @@ test_perf_libcrypto_vary_burst_size(void) for (j = 0; j < RTE_DIM(buf_lengths); j++) { params_set[i].buf_size = buf_lengths[j]; - test_perf_libcrypto_optimise_cyclecount(¶ms_set[i]); + test_perf_openssl_optimise_cyclecount(¶ms_set[i]); } } @@ -4121,15 +4121,15 @@ static struct unit_test_suite cryptodev_snow3g_testsuite = { } }; -static struct unit_test_suite cryptodev_libcrypto_testsuite = { - .suite_name = "Crypto Device LIBCRYPTO Unit Test Suite", +static struct unit_test_suite cryptodev_openssl_testsuite = { + .suite_name = "Crypto Device OPENSSL Unit Test Suite", .setup = testsuite_setup, .teardown = testsuite_teardown, .unit_test_cases = { TEST_CASE_ST(ut_setup, ut_teardown, - test_perf_libcrypto_vary_pkt_size), + test_perf_openssl_vary_pkt_size), TEST_CASE_ST(ut_setup, ut_teardown, - test_perf_libcrypto_vary_burst_size), + test_perf_openssl_vary_burst_size), TEST_CASES_END() /**< NULL terminate unit test array */ } }; @@ -4175,11 +4175,11 @@ perftest_qat_snow3g_cryptodev(void /*argv __rte_unused, int argc __rte_unused*/) } static int -perftest_libcrypto_cryptodev(void /*argv __rte_unused, int argc __rte_unused*/) +perftest_openssl_cryptodev(void /*argv __rte_unused, int argc __rte_unused*/) { - gbl_cryptodev_perftest_devtype = RTE_CRYPTODEV_LIBCRYPTO_PMD; + gbl_cryptodev_perftest_devtype = RTE_CRYPTODEV_OPENSSL_PMD; - return unit_test_suite_runner(&cryptodev_libcrypto_testsuite); + return unit_test_suite_runner(&cryptodev_openssl_testsuite); } static int @@ -4195,7 +4195,7 @@ REGISTER_TEST_COMMAND(cryptodev_qat_perftest, perftest_qat_cryptodev); REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_perftest, perftest_sw_snow3g_cryptodev); REGISTER_TEST_COMMAND(cryptodev_qat_snow3g_perftest, perftest_qat_snow3g_cryptodev); REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_perftest, perftest_aesni_gcm_cryptodev); -REGISTER_TEST_COMMAND(cryptodev_libcrypto_perftest, - perftest_libcrypto_cryptodev); +REGISTER_TEST_COMMAND(cryptodev_openssl_perftest, + perftest_openssl_cryptodev); REGISTER_TEST_COMMAND(cryptodev_qat_continual_perftest, perftest_qat_continual_cryptodev); diff --git a/config/common_base b/config/common_base index 750577dd92..21d18f80ec 100644 --- a/config/common_base +++ b/config/common_base @@ -378,8 +378,8 @@ CONFIG_RTE_LIBRTE_PMD_AESNI_MB_DEBUG=n # # Compile PMD for Software backed device # -CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO=n -CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO_DEBUG=n +CONFIG_RTE_LIBRTE_PMD_OPENSSL=n +CONFIG_RTE_LIBRTE_PMD_OPENSSL_DEBUG=n # # Compile PMD for AESNI GCM device diff --git a/doc/guides/cryptodevs/index.rst b/doc/guides/cryptodevs/index.rst index bae8e53ea4..a6a9f23c4e 100644 --- a/doc/guides/cryptodevs/index.rst +++ b/doc/guides/cryptodevs/index.rst @@ -39,7 +39,7 @@ Crypto Device Drivers aesni_mb aesni_gcm kasumi - libcrypto + openssl null snow3g qat diff --git a/doc/guides/cryptodevs/libcrypto.rst b/doc/guides/cryptodevs/openssl.rst similarity index 88% rename from doc/guides/cryptodevs/libcrypto.rst rename to doc/guides/cryptodevs/openssl.rst index 5e9c76a945..d2b5906d60 100644 --- a/doc/guides/cryptodevs/libcrypto.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -27,10 +27,10 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -LibCrypto Crypto Poll Mode Driver -================================= +OpenSSL Crypto Poll Mode Driver +=============================== -This code provides the initial implementation of the libcrypto poll mode +This code provides the initial implementation of the openssl poll mode driver. All cryptography operations are using Openssl library crypto API. Each algorithm uses EVP interface from openssl API - which is recommended by Openssl maintainers. @@ -41,7 +41,7 @@ https://www.openssl.org/ Features -------- -LibCrypto PMD has support for: +OpenSSL PMD has support for: Supported cipher algorithms: * ``RTE_CRYPTO_CIPHER_3DES_CBC`` @@ -69,7 +69,7 @@ Supported authentication algorithms: Installation ------------ -To compile libcrypto PMD, it has to be enabled in the config/common_base file +To compile openssl PMD, it has to be enabled in the config/common_base file and appropriate openssl packages have to be installed in the build environment. The newest openssl library version is supported: @@ -91,15 +91,15 @@ Initialization User can use app/test application to check how to use this pmd and to verify crypto processing. -Test name is cryptodev_libcrypto_autotest. -For performance test cryptodev_libcrypto_perftest can be used. +Test name is cryptodev_openssl_autotest. +For performance test cryptodev_openssl_perftest can be used. To verify real traffic l2fwd-crypto example can be used with this command: .. code-block:: console -sudo ./build/l2fwd-crypto -c 0x3 -n 4 --vdev "cryptodev_libcrypto_pmd" ---vdev "cryptodev_libcrypto_pmd"-- -p 0x3 --chain CIPHER_HASH +sudo ./build/l2fwd-crypto -c 0x3 -n 4 --vdev "crypto_openssl" +--vdev "crypto_openssl"-- -p 0x3 --chain CIPHER_HASH --cipher_op ENCRYPT --cipher_algo AES_CBC --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:ff diff --git a/doc/guides/rel_notes/release_16_11.rst b/doc/guides/rel_notes/release_16_11.rst index 26cdd62587..aa0c09a0a1 100644 --- a/doc/guides/rel_notes/release_16_11.rst +++ b/doc/guides/rel_notes/release_16_11.rst @@ -115,7 +115,7 @@ New Features * C3XXX device * C62XX device -* **Added libcrypto PMD.** +* **Added openssl PMD.** A new crypto PMD has been added, which provides several ciphering and hashing. All cryptography operations are using Openssl library crypto API. diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index b452ea61da..745c61468a 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -33,7 +33,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb -DIRS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += libcrypto +DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi diff --git a/drivers/crypto/libcrypto/Makefile b/drivers/crypto/openssl/Makefile similarity index 78% rename from drivers/crypto/libcrypto/Makefile rename to drivers/crypto/openssl/Makefile index c5f8cf2a31..8c4250c8a7 100644 --- a/drivers/crypto/libcrypto/Makefile +++ b/drivers/crypto/openssl/Makefile @@ -31,7 +31,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name -LIB = librte_pmd_libcrypto.a +LIB = librte_pmd_openssl.a # build flags CFLAGS += -O3 @@ -41,20 +41,20 @@ CFLAGS += $(WERROR_FLAGS) LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_libcrypto_version.map +EXPORT_MAP := rte_pmd_openssl_version.map # external library dependencies LDLIBS += -lcrypto # library source files -SRCS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += rte_libcrypto_pmd.c -SRCS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += rte_libcrypto_pmd_ops.c +SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd.c +SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd_ops.c # library dependencies -DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += lib/librte_eal -DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += lib/librte_mbuf -DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += lib/librte_mempool -DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += lib/librte_ring -DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += lib/librte_cryptodev +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += lib/librte_mbuf +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += lib/librte_mempool +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += lib/librte_ring +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += lib/librte_cryptodev include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/crypto/libcrypto/rte_libcrypto_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c similarity index 79% rename from drivers/crypto/libcrypto/rte_libcrypto_pmd.c rename to drivers/crypto/openssl/rte_openssl_pmd.c index 30fcecbc25..5f8fa3311d 100644 --- a/drivers/crypto/libcrypto/rte_libcrypto_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -40,15 +40,15 @@ #include -#include "rte_libcrypto_pmd_private.h" +#include "rte_openssl_pmd_private.h" -static int cryptodev_libcrypto_remove(const char *name); +static int cryptodev_openssl_remove(const char *name); /*----------------------------------------------------------------------------*/ /** * Global static parameter used to create a unique name for each - * LIBCRYPTO crypto device. + * OPENSSL crypto device. */ static unsigned int unique_name_id; @@ -61,7 +61,7 @@ create_unique_device_name(char *name, size_t size) return -EINVAL; ret = snprintf(name, size, "%s_%u", - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD), + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), unique_name_id++); if (ret < 0) return ret; @@ -89,24 +89,24 @@ ctr_inc(uint8_t *ctr) */ /** Get xform chain order */ -static enum libcrypto_chain_order -libcrypto_get_chain_order(const struct rte_crypto_sym_xform *xform) +static enum openssl_chain_order +openssl_get_chain_order(const struct rte_crypto_sym_xform *xform) { - enum libcrypto_chain_order res = LIBCRYPTO_CHAIN_NOT_SUPPORTED; + enum openssl_chain_order res = OPENSSL_CHAIN_NOT_SUPPORTED; if (xform != NULL) { if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) { if (xform->next == NULL) - res = LIBCRYPTO_CHAIN_ONLY_AUTH; + res = OPENSSL_CHAIN_ONLY_AUTH; else if (xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) - res = LIBCRYPTO_CHAIN_AUTH_CIPHER; + res = OPENSSL_CHAIN_AUTH_CIPHER; } if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { if (xform->next == NULL) - res = LIBCRYPTO_CHAIN_ONLY_CIPHER; + res = OPENSSL_CHAIN_ONLY_CIPHER; else if (xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) - res = LIBCRYPTO_CHAIN_CIPHER_AUTH; + res = OPENSSL_CHAIN_CIPHER_AUTH; } } @@ -143,14 +143,14 @@ get_cipher_key_ede(uint8_t *key, int keylen, uint8_t *key_ede) memcpy(key_ede + 16, key, 8); break; default: - LIBCRYPTO_LOG_ERR("Unsupported key size"); + OPENSSL_LOG_ERR("Unsupported key size"); res = -EINVAL; } return res; } -/** Get adequate libcrypto function for input cipher algorithm */ +/** Get adequate openssl function for input cipher algorithm */ static uint8_t get_cipher_algo(enum rte_crypto_cipher_algorithm sess_algo, size_t keylen, const EVP_CIPHER **algo) @@ -229,7 +229,7 @@ get_cipher_algo(enum rte_crypto_cipher_algorithm sess_algo, size_t keylen, return res; } -/** Get adequate libcrypto function for input auth algorithm */ +/** Get adequate openssl function for input auth algorithm */ static uint8_t get_auth_algo(enum rte_crypto_auth_algorithm sessalgo, const EVP_MD **algo) @@ -275,7 +275,7 @@ get_auth_algo(enum rte_crypto_auth_algorithm sessalgo, /** Set session cipher parameters */ static int -libcrypto_set_session_cipher_parameters(struct libcrypto_session *sess, +openssl_set_session_cipher_parameters(struct openssl_session *sess, const struct rte_crypto_sym_xform *xform) { /* Select cipher direction */ @@ -289,7 +289,7 @@ libcrypto_set_session_cipher_parameters(struct libcrypto_session *sess, case RTE_CRYPTO_CIPHER_AES_CBC: case RTE_CRYPTO_CIPHER_AES_CTR: case RTE_CRYPTO_CIPHER_AES_GCM: - sess->cipher.mode = LIBCRYPTO_CIPHER_LIB; + sess->cipher.mode = OPENSSL_CIPHER_LIB; sess->cipher.algo = xform->cipher.algo; sess->cipher.ctx = EVP_CIPHER_CTX_new(); @@ -303,7 +303,7 @@ libcrypto_set_session_cipher_parameters(struct libcrypto_session *sess, break; case RTE_CRYPTO_CIPHER_3DES_CTR: - sess->cipher.mode = LIBCRYPTO_CIPHER_DES3CTR; + sess->cipher.mode = OPENSSL_CIPHER_DES3CTR; sess->cipher.ctx = EVP_CIPHER_CTX_new(); if (get_cipher_key_ede(xform->cipher.key.data, @@ -322,7 +322,7 @@ libcrypto_set_session_cipher_parameters(struct libcrypto_session *sess, /* Set session auth parameters */ static int -libcrypto_set_session_auth_parameters(struct libcrypto_session *sess, +openssl_set_session_auth_parameters(struct openssl_session *sess, const struct rte_crypto_sym_xform *xform) { /* Select auth generate/verify */ @@ -336,7 +336,7 @@ libcrypto_set_session_auth_parameters(struct libcrypto_session *sess, /* Check additional condition for AES_GMAC/GCM */ if (sess->cipher.algo != RTE_CRYPTO_CIPHER_AES_GCM) return -EINVAL; - sess->chain_order = LIBCRYPTO_CHAIN_COMBINED; + sess->chain_order = OPENSSL_CHAIN_COMBINED; break; case RTE_CRYPTO_AUTH_MD5: @@ -345,7 +345,7 @@ libcrypto_set_session_auth_parameters(struct libcrypto_session *sess, case RTE_CRYPTO_AUTH_SHA256: case RTE_CRYPTO_AUTH_SHA384: case RTE_CRYPTO_AUTH_SHA512: - sess->auth.mode = LIBCRYPTO_AUTH_AS_AUTH; + sess->auth.mode = OPENSSL_AUTH_AS_AUTH; if (get_auth_algo(xform->auth.algo, &sess->auth.auth.evp_algo) != 0) return -EINVAL; @@ -358,7 +358,7 @@ libcrypto_set_session_auth_parameters(struct libcrypto_session *sess, case RTE_CRYPTO_AUTH_SHA256_HMAC: case RTE_CRYPTO_AUTH_SHA384_HMAC: case RTE_CRYPTO_AUTH_SHA512_HMAC: - sess->auth.mode = LIBCRYPTO_AUTH_AS_HMAC; + sess->auth.mode = OPENSSL_AUTH_AS_HMAC; sess->auth.hmac.ctx = EVP_MD_CTX_create(); if (get_auth_algo(xform->auth.algo, &sess->auth.hmac.evp_algo) != 0) @@ -376,25 +376,25 @@ libcrypto_set_session_auth_parameters(struct libcrypto_session *sess, /** Parse crypto xform chain and set private session parameters */ int -libcrypto_set_session_parameters(struct libcrypto_session *sess, +openssl_set_session_parameters(struct openssl_session *sess, const struct rte_crypto_sym_xform *xform) { const struct rte_crypto_sym_xform *cipher_xform = NULL; const struct rte_crypto_sym_xform *auth_xform = NULL; - sess->chain_order = libcrypto_get_chain_order(xform); + sess->chain_order = openssl_get_chain_order(xform); switch (sess->chain_order) { - case LIBCRYPTO_CHAIN_ONLY_CIPHER: + case OPENSSL_CHAIN_ONLY_CIPHER: cipher_xform = xform; break; - case LIBCRYPTO_CHAIN_ONLY_AUTH: + case OPENSSL_CHAIN_ONLY_AUTH: auth_xform = xform; break; - case LIBCRYPTO_CHAIN_CIPHER_AUTH: + case OPENSSL_CHAIN_CIPHER_AUTH: cipher_xform = xform; auth_xform = xform->next; break; - case LIBCRYPTO_CHAIN_AUTH_CIPHER: + case OPENSSL_CHAIN_AUTH_CIPHER: auth_xform = xform; cipher_xform = xform->next; break; @@ -404,17 +404,17 @@ libcrypto_set_session_parameters(struct libcrypto_session *sess, /* cipher_xform must be check before auth_xform */ if (cipher_xform) { - if (libcrypto_set_session_cipher_parameters( + if (openssl_set_session_cipher_parameters( sess, cipher_xform)) { - LIBCRYPTO_LOG_ERR( + OPENSSL_LOG_ERR( "Invalid/unsupported cipher parameters"); return -EINVAL; } } if (auth_xform) { - if (libcrypto_set_session_auth_parameters(sess, auth_xform)) { - LIBCRYPTO_LOG_ERR( + if (openssl_set_session_auth_parameters(sess, auth_xform)) { + OPENSSL_LOG_ERR( "Invalid/unsupported auth parameters"); return -EINVAL; } @@ -425,15 +425,15 @@ libcrypto_set_session_parameters(struct libcrypto_session *sess, /** Reset private session parameters */ void -libcrypto_reset_session(struct libcrypto_session *sess) +openssl_reset_session(struct openssl_session *sess) { EVP_CIPHER_CTX_free(sess->cipher.ctx); switch (sess->auth.mode) { - case LIBCRYPTO_AUTH_AS_AUTH: + case OPENSSL_AUTH_AS_AUTH: EVP_MD_CTX_destroy(sess->auth.auth.ctx); break; - case LIBCRYPTO_AUTH_AS_HMAC: + case OPENSSL_AUTH_AS_HMAC: EVP_PKEY_free(sess->auth.hmac.pkey); EVP_MD_CTX_destroy(sess->auth.hmac.ctx); break; @@ -443,28 +443,28 @@ libcrypto_reset_session(struct libcrypto_session *sess) } /** Provide session for operation */ -static struct libcrypto_session * -get_session(struct libcrypto_qp *qp, struct rte_crypto_op *op) +static struct openssl_session * +get_session(struct openssl_qp *qp, struct rte_crypto_op *op) { - struct libcrypto_session *sess = NULL; + struct openssl_session *sess = NULL; if (op->sym->sess_type == RTE_CRYPTO_SYM_OP_WITH_SESSION) { /* get existing session */ if (likely(op->sym->session != NULL && op->sym->session->dev_type == - RTE_CRYPTODEV_LIBCRYPTO_PMD)) - sess = (struct libcrypto_session *) + RTE_CRYPTODEV_OPENSSL_PMD)) + sess = (struct openssl_session *) op->sym->session->_private; } else { /* provide internal session */ void *_sess = NULL; if (!rte_mempool_get(qp->sess_mp, (void **)&_sess)) { - sess = (struct libcrypto_session *) + sess = (struct openssl_session *) ((struct rte_cryptodev_sym_session *)_sess) ->_private; - if (unlikely(libcrypto_set_session_parameters( + if (unlikely(openssl_set_session_parameters( sess, op->sym->xform) != 0)) { rte_mempool_put(qp->sess_mp, _sess); sess = NULL; @@ -485,9 +485,9 @@ get_session(struct libcrypto_qp *qp, struct rte_crypto_op *op) *------------------------------------------------------------------------------ */ -/** Process standard libcrypto cipher encryption */ +/** Process standard openssl cipher encryption */ static int -process_libcrypto_cipher_encrypt(uint8_t *src, uint8_t *dst, +process_openssl_cipher_encrypt(uint8_t *src, uint8_t *dst, uint8_t *iv, uint8_t *key, int srclen, EVP_CIPHER_CTX *ctx, const EVP_CIPHER *algo) { @@ -505,13 +505,13 @@ process_libcrypto_cipher_encrypt(uint8_t *src, uint8_t *dst, return 0; process_cipher_encrypt_err: - LIBCRYPTO_LOG_ERR("Process libcrypto cipher encrypt failed"); + OPENSSL_LOG_ERR("Process openssl cipher encrypt failed"); return -EINVAL; } -/** Process standard libcrypto cipher decryption */ +/** Process standard openssl cipher decryption */ static int -process_libcrypto_cipher_decrypt(uint8_t *src, uint8_t *dst, +process_openssl_cipher_decrypt(uint8_t *src, uint8_t *dst, uint8_t *iv, uint8_t *key, int srclen, EVP_CIPHER_CTX *ctx, const EVP_CIPHER *algo) { @@ -532,13 +532,13 @@ process_libcrypto_cipher_decrypt(uint8_t *src, uint8_t *dst, return 0; process_cipher_decrypt_err: - LIBCRYPTO_LOG_ERR("Process libcrypto cipher decrypt failed"); + OPENSSL_LOG_ERR("Process openssl cipher decrypt failed"); return -EINVAL; } /** Process cipher des 3 ctr encryption, decryption algorithm */ static int -process_libcrypto_cipher_des3ctr(uint8_t *src, uint8_t *dst, +process_openssl_cipher_des3ctr(uint8_t *src, uint8_t *dst, uint8_t *iv, uint8_t *key, int srclen, EVP_CIPHER_CTX *ctx) { uint8_t ebuf[8], ctr[8]; @@ -568,13 +568,13 @@ process_libcrypto_cipher_des3ctr(uint8_t *src, uint8_t *dst, return 0; process_cipher_des3ctr_err: - LIBCRYPTO_LOG_ERR("Process libcrypto cipher des 3 ede ctr failed"); + OPENSSL_LOG_ERR("Process openssl cipher des 3 ede ctr failed"); return -EINVAL; } /** Process auth/encription aes-gcm algorithm */ static int -process_libcrypto_auth_encryption_gcm(uint8_t *src, int srclen, +process_openssl_auth_encryption_gcm(uint8_t *src, int srclen, uint8_t *aad, int aadlen, uint8_t *iv, int ivlen, uint8_t *key, uint8_t *dst, uint8_t *tag, EVP_CIPHER_CTX *ctx, const EVP_CIPHER *algo) @@ -613,12 +613,12 @@ process_libcrypto_auth_encryption_gcm(uint8_t *src, int srclen, return 0; process_auth_encryption_gcm_err: - LIBCRYPTO_LOG_ERR("Process libcrypto auth encryption gcm failed"); + OPENSSL_LOG_ERR("Process openssl auth encryption gcm failed"); return -EINVAL; } static int -process_libcrypto_auth_decryption_gcm(uint8_t *src, int srclen, +process_openssl_auth_decryption_gcm(uint8_t *src, int srclen, uint8_t *aad, int aadlen, uint8_t *iv, int ivlen, uint8_t *key, uint8_t *dst, uint8_t *tag, EVP_CIPHER_CTX *ctx, const EVP_CIPHER *algo) @@ -657,16 +657,16 @@ process_libcrypto_auth_decryption_gcm(uint8_t *src, int srclen, return 0; process_auth_decryption_gcm_err: - LIBCRYPTO_LOG_ERR("Process libcrypto auth description gcm failed"); + OPENSSL_LOG_ERR("Process openssl auth description gcm failed"); return -EINVAL; process_auth_decryption_gcm_final_err: return -EFAULT; } -/** Process standard libcrypto auth algorithms */ +/** Process standard openssl auth algorithms */ static int -process_libcrypto_auth(uint8_t *src, uint8_t *dst, +process_openssl_auth(uint8_t *src, uint8_t *dst, __rte_unused uint8_t *iv, __rte_unused EVP_PKEY * pkey, int srclen, EVP_MD_CTX *ctx, const EVP_MD *algo) { @@ -684,13 +684,13 @@ process_libcrypto_auth(uint8_t *src, uint8_t *dst, return 0; process_auth_err: - LIBCRYPTO_LOG_ERR("Process libcrypto auth failed"); + OPENSSL_LOG_ERR("Process openssl auth failed"); return -EINVAL; } -/** Process standard libcrypto auth algorithms with hmac */ +/** Process standard openssl auth algorithms with hmac */ static int -process_libcrypto_auth_hmac(uint8_t *src, uint8_t *dst, +process_openssl_auth_hmac(uint8_t *src, uint8_t *dst, __rte_unused uint8_t *iv, EVP_PKEY *pkey, int srclen, EVP_MD_CTX *ctx, const EVP_MD *algo) { @@ -708,7 +708,7 @@ process_libcrypto_auth_hmac(uint8_t *src, uint8_t *dst, return 0; process_auth_err: - LIBCRYPTO_LOG_ERR("Process libcrypto auth failed"); + OPENSSL_LOG_ERR("Process openssl auth failed"); return -EINVAL; } @@ -716,8 +716,8 @@ process_auth_err: /** Process auth/cipher combined operation */ static void -process_libcrypto_combined_op - (struct rte_crypto_op *op, struct libcrypto_session *sess, +process_openssl_combined_op + (struct rte_crypto_op *op, struct openssl_session *sess, struct rte_mbuf *mbuf_src, struct rte_mbuf *mbuf_dst) { /* cipher */ @@ -746,12 +746,12 @@ process_libcrypto_combined_op } if (sess->cipher.direction == RTE_CRYPTO_CIPHER_OP_ENCRYPT) - status = process_libcrypto_auth_encryption_gcm( + status = process_openssl_auth_encryption_gcm( src, srclen, aad, aadlen, iv, ivlen, sess->cipher.key.data, dst, tag, sess->cipher.ctx, sess->cipher.evp_algo); else - status = process_libcrypto_auth_decryption_gcm( + status = process_openssl_auth_decryption_gcm( src, srclen, aad, aadlen, iv, ivlen, sess->cipher.key.data, dst, tag, sess->cipher.ctx, sess->cipher.evp_algo); @@ -768,8 +768,8 @@ process_libcrypto_combined_op /** Process cipher operation */ static void -process_libcrypto_cipher_op - (struct rte_crypto_op *op, struct libcrypto_session *sess, +process_openssl_cipher_op + (struct rte_crypto_op *op, struct openssl_session *sess, struct rte_mbuf *mbuf_src, struct rte_mbuf *mbuf_dst) { uint8_t *src, *dst, *iv; @@ -783,19 +783,19 @@ process_libcrypto_cipher_op iv = op->sym->cipher.iv.data; - if (sess->cipher.mode == LIBCRYPTO_CIPHER_LIB) + if (sess->cipher.mode == OPENSSL_CIPHER_LIB) if (sess->cipher.direction == RTE_CRYPTO_CIPHER_OP_ENCRYPT) - status = process_libcrypto_cipher_encrypt(src, dst, iv, + status = process_openssl_cipher_encrypt(src, dst, iv, sess->cipher.key.data, srclen, sess->cipher.ctx, sess->cipher.evp_algo); else - status = process_libcrypto_cipher_decrypt(src, dst, iv, + status = process_openssl_cipher_decrypt(src, dst, iv, sess->cipher.key.data, srclen, sess->cipher.ctx, sess->cipher.evp_algo); else - status = process_libcrypto_cipher_des3ctr(src, dst, iv, + status = process_openssl_cipher_des3ctr(src, dst, iv, sess->cipher.key.data, srclen, sess->cipher.ctx); @@ -805,8 +805,8 @@ process_libcrypto_cipher_op /** Process auth operation */ static void -process_libcrypto_auth_op - (struct rte_crypto_op *op, struct libcrypto_session *sess, +process_openssl_auth_op + (struct rte_crypto_op *op, struct openssl_session *sess, struct rte_mbuf *mbuf_src, struct rte_mbuf *mbuf_dst) { uint8_t *src, *dst; @@ -828,13 +828,13 @@ process_libcrypto_auth_op } switch (sess->auth.mode) { - case LIBCRYPTO_AUTH_AS_AUTH: - status = process_libcrypto_auth(src, dst, + case OPENSSL_AUTH_AS_AUTH: + status = process_openssl_auth(src, dst, NULL, NULL, srclen, sess->auth.auth.ctx, sess->auth.auth.evp_algo); break; - case LIBCRYPTO_AUTH_AS_HMAC: - status = process_libcrypto_auth_hmac(src, dst, + case OPENSSL_AUTH_AS_HMAC: + status = process_openssl_auth_hmac(src, dst, NULL, sess->auth.hmac.pkey, srclen, sess->auth.hmac.ctx, sess->auth.hmac.evp_algo); break; @@ -859,8 +859,8 @@ process_libcrypto_auth_op /** Process crypto operation for mbuf */ static int -process_op(const struct libcrypto_qp *qp, struct rte_crypto_op *op, - struct libcrypto_session *sess) +process_op(const struct openssl_qp *qp, struct rte_crypto_op *op, + struct openssl_session *sess) { struct rte_mbuf *msrc, *mdst; int retval; @@ -871,22 +871,22 @@ process_op(const struct libcrypto_qp *qp, struct rte_crypto_op *op, op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; switch (sess->chain_order) { - case LIBCRYPTO_CHAIN_ONLY_CIPHER: - process_libcrypto_cipher_op(op, sess, msrc, mdst); + case OPENSSL_CHAIN_ONLY_CIPHER: + process_openssl_cipher_op(op, sess, msrc, mdst); break; - case LIBCRYPTO_CHAIN_ONLY_AUTH: - process_libcrypto_auth_op(op, sess, msrc, mdst); + case OPENSSL_CHAIN_ONLY_AUTH: + process_openssl_auth_op(op, sess, msrc, mdst); break; - case LIBCRYPTO_CHAIN_CIPHER_AUTH: - process_libcrypto_cipher_op(op, sess, msrc, mdst); - process_libcrypto_auth_op(op, sess, mdst, mdst); + case OPENSSL_CHAIN_CIPHER_AUTH: + process_openssl_cipher_op(op, sess, msrc, mdst); + process_openssl_auth_op(op, sess, mdst, mdst); break; - case LIBCRYPTO_CHAIN_AUTH_CIPHER: - process_libcrypto_auth_op(op, sess, msrc, mdst); - process_libcrypto_cipher_op(op, sess, msrc, mdst); + case OPENSSL_CHAIN_AUTH_CIPHER: + process_openssl_auth_op(op, sess, msrc, mdst); + process_openssl_cipher_op(op, sess, msrc, mdst); break; - case LIBCRYPTO_CHAIN_COMBINED: - process_libcrypto_combined_op(op, sess, msrc, mdst); + case OPENSSL_CHAIN_COMBINED: + process_openssl_combined_op(op, sess, msrc, mdst); break; default: op->status = RTE_CRYPTO_OP_STATUS_ERROR; @@ -895,8 +895,8 @@ process_op(const struct libcrypto_qp *qp, struct rte_crypto_op *op, /* Free session if a session-less crypto op */ if (op->sym->sess_type == RTE_CRYPTO_SYM_OP_SESSIONLESS) { - libcrypto_reset_session(sess); - memset(sess, 0, sizeof(struct libcrypto_session)); + openssl_reset_session(sess); + memset(sess, 0, sizeof(struct openssl_session)); rte_mempool_put(qp->sess_mp, op->sym->session); op->sym->session = NULL; } @@ -921,11 +921,11 @@ process_op(const struct libcrypto_qp *qp, struct rte_crypto_op *op, /** Enqueue burst */ static uint16_t -libcrypto_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, +openssl_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, uint16_t nb_ops) { - struct libcrypto_session *sess; - struct libcrypto_qp *qp = queue_pair; + struct openssl_session *sess; + struct openssl_qp *qp = queue_pair; int i, retval; for (i = 0; i < nb_ops; i++) { @@ -948,10 +948,10 @@ enqueue_err: /** Dequeue burst */ static uint16_t -libcrypto_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, +openssl_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, uint16_t nb_ops) { - struct libcrypto_qp *qp = queue_pair; + struct openssl_qp *qp = queue_pair; unsigned int nb_dequeued = 0; @@ -962,36 +962,36 @@ libcrypto_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops, return nb_dequeued; } -/** Create LIBCRYPTO crypto device */ +/** Create OPENSSL crypto device */ static int -cryptodev_libcrypto_create(const char *name, +cryptodev_openssl_create(const char *name, struct rte_crypto_vdev_init_params *init_params) { struct rte_cryptodev *dev; char crypto_dev_name[RTE_CRYPTODEV_NAME_MAX_LEN]; - struct libcrypto_private *internals; + struct openssl_private *internals; /* create a unique device name */ if (create_unique_device_name(crypto_dev_name, RTE_CRYPTODEV_NAME_MAX_LEN) != 0) { - LIBCRYPTO_LOG_ERR("failed to create unique cryptodev name"); + OPENSSL_LOG_ERR("failed to create unique cryptodev name"); return -EINVAL; } dev = rte_cryptodev_pmd_virtual_dev_init(crypto_dev_name, - sizeof(struct libcrypto_private), + sizeof(struct openssl_private), init_params->socket_id); if (dev == NULL) { - LIBCRYPTO_LOG_ERR("failed to create cryptodev vdev"); + OPENSSL_LOG_ERR("failed to create cryptodev vdev"); goto init_error; } - dev->dev_type = RTE_CRYPTODEV_LIBCRYPTO_PMD; - dev->dev_ops = rte_libcrypto_pmd_ops; + dev->dev_type = RTE_CRYPTODEV_OPENSSL_PMD; + dev->dev_ops = rte_openssl_pmd_ops; /* register rx/tx burst functions for data path */ - dev->dequeue_burst = libcrypto_pmd_dequeue_burst; - dev->enqueue_burst = libcrypto_pmd_enqueue_burst; + dev->dequeue_burst = openssl_pmd_dequeue_burst; + dev->enqueue_burst = openssl_pmd_enqueue_burst; dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | @@ -1006,15 +1006,15 @@ cryptodev_libcrypto_create(const char *name, return 0; init_error: - LIBCRYPTO_LOG_ERR("driver %s: cryptodev_libcrypto_create failed", name); + OPENSSL_LOG_ERR("driver %s: cryptodev_openssl_create failed", name); - cryptodev_libcrypto_remove(crypto_dev_name); + cryptodev_openssl_remove(crypto_dev_name); return -EFAULT; } -/** Initialise LIBCRYPTO crypto device */ +/** Initialise OPENSSL crypto device */ static int -cryptodev_libcrypto_probe(const char *name, +cryptodev_openssl_probe(const char *name, const char *input_args) { struct rte_crypto_vdev_init_params init_params = { @@ -1032,31 +1032,31 @@ cryptodev_libcrypto_probe(const char *name, RTE_LOG(INFO, PMD, " Max number of sessions = %d\n", init_params.max_nb_sessions); - return cryptodev_libcrypto_create(name, &init_params); + return cryptodev_openssl_create(name, &init_params); } -/** Uninitialise LIBCRYPTO crypto device */ +/** Uninitialise OPENSSL crypto device */ static int -cryptodev_libcrypto_remove(const char *name) +cryptodev_openssl_remove(const char *name) { if (name == NULL) return -EINVAL; RTE_LOG(INFO, PMD, - "Closing LIBCRYPTO crypto device %s on numa socket %u\n", + "Closing OPENSSL crypto device %s on numa socket %u\n", name, rte_socket_id()); return 0; } -static struct rte_vdev_driver cryptodev_libcrypto_pmd_drv = { - .probe = cryptodev_libcrypto_probe, - .remove = cryptodev_libcrypto_remove +static struct rte_vdev_driver cryptodev_openssl_pmd_drv = { + .probe = cryptodev_openssl_probe, + .remove = cryptodev_openssl_remove }; -RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_LIBCRYPTO_PMD, - cryptodev_libcrypto_pmd_drv); -RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_LIBCRYPTO_PMD, +RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_OPENSSL_PMD, + cryptodev_openssl_pmd_drv); +RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_OPENSSL_PMD, "max_nb_queue_pairs= " "max_nb_sessions= " "socket_id="); diff --git a/drivers/crypto/libcrypto/rte_libcrypto_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c similarity index 81% rename from drivers/crypto/libcrypto/rte_libcrypto_pmd_ops.c rename to drivers/crypto/openssl/rte_openssl_pmd_ops.c index b5d7bd5bb1..875550c76f 100644 --- a/drivers/crypto/libcrypto/rte_libcrypto_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -36,10 +36,10 @@ #include #include -#include "rte_libcrypto_pmd_private.h" +#include "rte_openssl_pmd_private.h" -static const struct rte_cryptodev_capabilities libcrypto_pmd_capabilities[] = { +static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { { /* MD5 HMAC */ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, {.sym = { @@ -449,27 +449,27 @@ static const struct rte_cryptodev_capabilities libcrypto_pmd_capabilities[] = { /** Configure device */ static int -libcrypto_pmd_config(__rte_unused struct rte_cryptodev *dev) +openssl_pmd_config(__rte_unused struct rte_cryptodev *dev) { return 0; } /** Start device */ static int -libcrypto_pmd_start(__rte_unused struct rte_cryptodev *dev) +openssl_pmd_start(__rte_unused struct rte_cryptodev *dev) { return 0; } /** Stop device */ static void -libcrypto_pmd_stop(__rte_unused struct rte_cryptodev *dev) +openssl_pmd_stop(__rte_unused struct rte_cryptodev *dev) { } /** Close device */ static int -libcrypto_pmd_close(__rte_unused struct rte_cryptodev *dev) +openssl_pmd_close(__rte_unused struct rte_cryptodev *dev) { return 0; } @@ -477,13 +477,13 @@ libcrypto_pmd_close(__rte_unused struct rte_cryptodev *dev) /** Get device statistics */ static void -libcrypto_pmd_stats_get(struct rte_cryptodev *dev, +openssl_pmd_stats_get(struct rte_cryptodev *dev, struct rte_cryptodev_stats *stats) { int qp_id; for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) { - struct libcrypto_qp *qp = dev->data->queue_pairs[qp_id]; + struct openssl_qp *qp = dev->data->queue_pairs[qp_id]; stats->enqueued_count += qp->stats.enqueued_count; stats->dequeued_count += qp->stats.dequeued_count; @@ -495,12 +495,12 @@ libcrypto_pmd_stats_get(struct rte_cryptodev *dev, /** Reset device statistics */ static void -libcrypto_pmd_stats_reset(struct rte_cryptodev *dev) +openssl_pmd_stats_reset(struct rte_cryptodev *dev) { int qp_id; for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) { - struct libcrypto_qp *qp = dev->data->queue_pairs[qp_id]; + struct openssl_qp *qp = dev->data->queue_pairs[qp_id]; memset(&qp->stats, 0, sizeof(qp->stats)); } @@ -509,15 +509,15 @@ libcrypto_pmd_stats_reset(struct rte_cryptodev *dev) /** Get device info */ static void -libcrypto_pmd_info_get(struct rte_cryptodev *dev, +openssl_pmd_info_get(struct rte_cryptodev *dev, struct rte_cryptodev_info *dev_info) { - struct libcrypto_private *internals = dev->data->dev_private; + struct openssl_private *internals = dev->data->dev_private; if (dev_info != NULL) { dev_info->dev_type = dev->dev_type; dev_info->feature_flags = dev->feature_flags; - dev_info->capabilities = libcrypto_pmd_capabilities; + dev_info->capabilities = openssl_pmd_capabilities; dev_info->max_nb_queue_pairs = internals->max_nb_qpairs; dev_info->sym.max_nb_sessions = internals->max_nb_sessions; } @@ -525,7 +525,7 @@ libcrypto_pmd_info_get(struct rte_cryptodev *dev, /** Release queue pair */ static int -libcrypto_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id) +openssl_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id) { if (dev->data->queue_pairs[qp_id] != NULL) { rte_free(dev->data->queue_pairs[qp_id]); @@ -536,11 +536,11 @@ libcrypto_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id) /** set a unique name for the queue pair based on it's name, dev_id and qp_id */ static int -libcrypto_pmd_qp_set_unique_name(struct rte_cryptodev *dev, - struct libcrypto_qp *qp) +openssl_pmd_qp_set_unique_name(struct rte_cryptodev *dev, + struct openssl_qp *qp) { unsigned int n = snprintf(qp->name, sizeof(qp->name), - "libcrypto_pmd_%u_qp_%u", + "openssl_pmd_%u_qp_%u", dev->data->dev_id, qp->id); if (n > sizeof(qp->name)) @@ -552,7 +552,7 @@ libcrypto_pmd_qp_set_unique_name(struct rte_cryptodev *dev, /** Create a ring to place processed operations on */ static struct rte_ring * -libcrypto_pmd_qp_create_processed_ops_ring(struct libcrypto_qp *qp, +openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp, unsigned int ring_size, int socket_id) { struct rte_ring *r; @@ -560,13 +560,13 @@ libcrypto_pmd_qp_create_processed_ops_ring(struct libcrypto_qp *qp, r = rte_ring_lookup(qp->name); if (r) { if (r->prod.size >= ring_size) { - LIBCRYPTO_LOG_INFO( + OPENSSL_LOG_INFO( "Reusing existing ring %s for processed ops", qp->name); return r; } - LIBCRYPTO_LOG_ERR( + OPENSSL_LOG_ERR( "Unable to reuse existing ring %s for processed ops", qp->name); return NULL; @@ -579,18 +579,18 @@ libcrypto_pmd_qp_create_processed_ops_ring(struct libcrypto_qp *qp, /** Setup a queue pair */ static int -libcrypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, +openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, const struct rte_cryptodev_qp_conf *qp_conf, int socket_id) { - struct libcrypto_qp *qp = NULL; + struct openssl_qp *qp = NULL; /* Free memory prior to re-allocation if needed. */ if (dev->data->queue_pairs[qp_id] != NULL) - libcrypto_pmd_qp_release(dev, qp_id); + openssl_pmd_qp_release(dev, qp_id); /* Allocate the queue pair data structure. */ - qp = rte_zmalloc_socket("LIBCRYPTO PMD Queue Pair", sizeof(*qp), + qp = rte_zmalloc_socket("OPENSSL PMD Queue Pair", sizeof(*qp), RTE_CACHE_LINE_SIZE, socket_id); if (qp == NULL) return -ENOMEM; @@ -598,10 +598,10 @@ libcrypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, qp->id = qp_id; dev->data->queue_pairs[qp_id] = qp; - if (libcrypto_pmd_qp_set_unique_name(dev, qp)) + if (openssl_pmd_qp_set_unique_name(dev, qp)) goto qp_setup_cleanup; - qp->processed_ops = libcrypto_pmd_qp_create_processed_ops_ring(qp, + qp->processed_ops = openssl_pmd_qp_create_processed_ops_ring(qp, qp_conf->nb_descriptors, socket_id); if (qp->processed_ops == NULL) goto qp_setup_cleanup; @@ -621,7 +621,7 @@ qp_setup_cleanup: /** Start queue pair */ static int -libcrypto_pmd_qp_start(__rte_unused struct rte_cryptodev *dev, +openssl_pmd_qp_start(__rte_unused struct rte_cryptodev *dev, __rte_unused uint16_t queue_pair_id) { return -ENOTSUP; @@ -629,7 +629,7 @@ libcrypto_pmd_qp_start(__rte_unused struct rte_cryptodev *dev, /** Stop queue pair */ static int -libcrypto_pmd_qp_stop(__rte_unused struct rte_cryptodev *dev, +openssl_pmd_qp_stop(__rte_unused struct rte_cryptodev *dev, __rte_unused uint16_t queue_pair_id) { return -ENOTSUP; @@ -637,31 +637,31 @@ libcrypto_pmd_qp_stop(__rte_unused struct rte_cryptodev *dev, /** Return the number of allocated queue pairs */ static uint32_t -libcrypto_pmd_qp_count(struct rte_cryptodev *dev) +openssl_pmd_qp_count(struct rte_cryptodev *dev) { return dev->data->nb_queue_pairs; } /** Returns the size of the session structure */ static unsigned -libcrypto_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused) +openssl_pmd_session_get_size(struct rte_cryptodev *dev __rte_unused) { - return sizeof(struct libcrypto_session); + return sizeof(struct openssl_session); } /** Configure the session from a crypto xform chain */ static void * -libcrypto_pmd_session_configure(struct rte_cryptodev *dev __rte_unused, +openssl_pmd_session_configure(struct rte_cryptodev *dev __rte_unused, struct rte_crypto_sym_xform *xform, void *sess) { if (unlikely(sess == NULL)) { - LIBCRYPTO_LOG_ERR("invalid session struct"); + OPENSSL_LOG_ERR("invalid session struct"); return NULL; } - if (libcrypto_set_session_parameters( + if (openssl_set_session_parameters( sess, xform) != 0) { - LIBCRYPTO_LOG_ERR("failed configure session parameters"); + OPENSSL_LOG_ERR("failed configure session parameters"); return NULL; } @@ -671,38 +671,38 @@ libcrypto_pmd_session_configure(struct rte_cryptodev *dev __rte_unused, /** Clear the memory of session so it doesn't leave key material behind */ static void -libcrypto_pmd_session_clear(struct rte_cryptodev *dev __rte_unused, void *sess) +openssl_pmd_session_clear(struct rte_cryptodev *dev __rte_unused, void *sess) { /* * Current just resetting the whole data structure, need to investigate * whether a more selective reset of key would be more performant */ if (sess) { - libcrypto_reset_session(sess); - memset(sess, 0, sizeof(struct libcrypto_session)); + openssl_reset_session(sess); + memset(sess, 0, sizeof(struct openssl_session)); } } -struct rte_cryptodev_ops libcrypto_pmd_ops = { - .dev_configure = libcrypto_pmd_config, - .dev_start = libcrypto_pmd_start, - .dev_stop = libcrypto_pmd_stop, - .dev_close = libcrypto_pmd_close, +struct rte_cryptodev_ops openssl_pmd_ops = { + .dev_configure = openssl_pmd_config, + .dev_start = openssl_pmd_start, + .dev_stop = openssl_pmd_stop, + .dev_close = openssl_pmd_close, - .stats_get = libcrypto_pmd_stats_get, - .stats_reset = libcrypto_pmd_stats_reset, + .stats_get = openssl_pmd_stats_get, + .stats_reset = openssl_pmd_stats_reset, - .dev_infos_get = libcrypto_pmd_info_get, + .dev_infos_get = openssl_pmd_info_get, - .queue_pair_setup = libcrypto_pmd_qp_setup, - .queue_pair_release = libcrypto_pmd_qp_release, - .queue_pair_start = libcrypto_pmd_qp_start, - .queue_pair_stop = libcrypto_pmd_qp_stop, - .queue_pair_count = libcrypto_pmd_qp_count, + .queue_pair_setup = openssl_pmd_qp_setup, + .queue_pair_release = openssl_pmd_qp_release, + .queue_pair_start = openssl_pmd_qp_start, + .queue_pair_stop = openssl_pmd_qp_stop, + .queue_pair_count = openssl_pmd_qp_count, - .session_get_size = libcrypto_pmd_session_get_size, - .session_configure = libcrypto_pmd_session_configure, - .session_clear = libcrypto_pmd_session_clear + .session_get_size = openssl_pmd_session_get_size, + .session_configure = openssl_pmd_session_configure, + .session_clear = openssl_pmd_session_clear }; -struct rte_cryptodev_ops *rte_libcrypto_pmd_ops = &libcrypto_pmd_ops; +struct rte_cryptodev_ops *rte_openssl_pmd_ops = &openssl_pmd_ops; diff --git a/drivers/crypto/libcrypto/rte_libcrypto_pmd_private.h b/drivers/crypto/openssl/rte_openssl_pmd_private.h similarity index 70% rename from drivers/crypto/libcrypto/rte_libcrypto_pmd_private.h rename to drivers/crypto/openssl/rte_openssl_pmd_private.h index dbef57ff43..65c5f9794b 100644 --- a/drivers/crypto/libcrypto/rte_libcrypto_pmd_private.h +++ b/drivers/crypto/openssl/rte_openssl_pmd_private.h @@ -30,66 +30,66 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _LIBCRYPTO_PMD_PRIVATE_H_ -#define _LIBCRYPTO_PMD_PRIVATE_H_ +#ifndef _OPENSSL_PMD_PRIVATE_H_ +#define _OPENSSL_PMD_PRIVATE_H_ #include #include -#define LIBCRYPTO_LOG_ERR(fmt, args...) \ +#define OPENSSL_LOG_ERR(fmt, args...) \ RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD), \ + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), \ __func__, __LINE__, ## args) -#ifdef RTE_LIBRTE_LIBCRYPTO_DEBUG -#define LIBCRYPTO_LOG_INFO(fmt, args...) \ +#ifdef RTE_LIBRTE_OPENSSL_DEBUG +#define OPENSSL_LOG_INFO(fmt, args...) \ RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD), \ + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), \ __func__, __LINE__, ## args) -#define LIBCRYPTO_LOG_DBG(fmt, args...) \ +#define OPENSSL_LOG_DBG(fmt, args...) \ RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ - RTE_STR(CRYPTODEV_NAME_LIBCRYPTO_PMD), \ + RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), \ __func__, __LINE__, ## args) #else -#define LIBCRYPTO_LOG_INFO(fmt, args...) -#define LIBCRYPTO_LOG_DBG(fmt, args...) +#define OPENSSL_LOG_INFO(fmt, args...) +#define OPENSSL_LOG_DBG(fmt, args...) #endif -/** LIBCRYPTO operation order mode enumerator */ -enum libcrypto_chain_order { - LIBCRYPTO_CHAIN_ONLY_CIPHER, - LIBCRYPTO_CHAIN_ONLY_AUTH, - LIBCRYPTO_CHAIN_CIPHER_AUTH, - LIBCRYPTO_CHAIN_AUTH_CIPHER, - LIBCRYPTO_CHAIN_COMBINED, - LIBCRYPTO_CHAIN_NOT_SUPPORTED +/** OPENSSL operation order mode enumerator */ +enum openssl_chain_order { + OPENSSL_CHAIN_ONLY_CIPHER, + OPENSSL_CHAIN_ONLY_AUTH, + OPENSSL_CHAIN_CIPHER_AUTH, + OPENSSL_CHAIN_AUTH_CIPHER, + OPENSSL_CHAIN_COMBINED, + OPENSSL_CHAIN_NOT_SUPPORTED }; -/** LIBCRYPTO cipher mode enumerator */ -enum libcrypto_cipher_mode { - LIBCRYPTO_CIPHER_LIB, - LIBCRYPTO_CIPHER_DES3CTR, +/** OPENSSL cipher mode enumerator */ +enum openssl_cipher_mode { + OPENSSL_CIPHER_LIB, + OPENSSL_CIPHER_DES3CTR, }; -/** LIBCRYPTO auth mode enumerator */ -enum libcrypto_auth_mode { - LIBCRYPTO_AUTH_AS_AUTH, - LIBCRYPTO_AUTH_AS_HMAC, +/** OPENSSL auth mode enumerator */ +enum openssl_auth_mode { + OPENSSL_AUTH_AS_AUTH, + OPENSSL_AUTH_AS_HMAC, }; -/** private data structure for each LIBCRYPTO crypto device */ -struct libcrypto_private { +/** private data structure for each OPENSSL crypto device */ +struct openssl_private { unsigned int max_nb_qpairs; /**< Max number of queue pairs */ unsigned int max_nb_sessions; /**< Max number of sessions */ }; -/** LIBCRYPTO crypto queue pair */ -struct libcrypto_qp { +/** OPENSSL crypto queue pair */ +struct openssl_qp { uint16_t id; /**< Queue Pair Identifier */ char name[RTE_CRYPTODEV_NAME_LEN]; @@ -102,16 +102,16 @@ struct libcrypto_qp { /**< Queue pair statistics */ } __rte_cache_aligned; -/** LIBCRYPTO crypto private session structure */ -struct libcrypto_session { - enum libcrypto_chain_order chain_order; +/** OPENSSL crypto private session structure */ +struct openssl_session { + enum openssl_chain_order chain_order; /**< chain order mode */ /** Cipher Parameters */ struct { enum rte_crypto_cipher_operation direction; /**< cipher operation direction */ - enum libcrypto_cipher_mode mode; + enum openssl_cipher_mode mode; /**< cipher operation mode */ enum rte_crypto_cipher_algorithm algo; /**< cipher algorithm */ @@ -133,7 +133,7 @@ struct libcrypto_session { struct { enum rte_crypto_auth_operation operation; /**< auth operation generate or verify */ - enum libcrypto_auth_mode mode; + enum openssl_auth_mode mode; /**< auth operation mode */ enum rte_crypto_auth_algorithm algo; /**< cipher algorithm */ @@ -159,16 +159,16 @@ struct libcrypto_session { } __rte_cache_aligned; -/** Set and validate LIBCRYPTO crypto session parameters */ +/** Set and validate OPENSSL crypto session parameters */ extern int -libcrypto_set_session_parameters(struct libcrypto_session *sess, +openssl_set_session_parameters(struct openssl_session *sess, const struct rte_crypto_sym_xform *xform); -/** Reset LIBCRYPTO crypto session parameters */ +/** Reset OPENSSL crypto session parameters */ extern void -libcrypto_reset_session(struct libcrypto_session *sess); +openssl_reset_session(struct openssl_session *sess); /** device specific operations function pointer structure */ -extern struct rte_cryptodev_ops *rte_libcrypto_pmd_ops; +extern struct rte_cryptodev_ops *rte_openssl_pmd_ops; -#endif /* _LIBCRYPTO_PMD_PRIVATE_H_ */ +#endif /* _OPENSSL_PMD_PRIVATE_H_ */ diff --git a/drivers/crypto/libcrypto/rte_pmd_libcrypto_version.map b/drivers/crypto/openssl/rte_pmd_openssl_version.map similarity index 100% rename from drivers/crypto/libcrypto/rte_pmd_libcrypto_version.map rename to drivers/crypto/openssl/rte_pmd_openssl_version.map diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h index 232f34a64b..8f63e8f6b1 100644 --- a/lib/librte_cryptodev/rte_cryptodev.h +++ b/lib/librte_cryptodev/rte_cryptodev.h @@ -56,7 +56,7 @@ extern "C" { /**< AES-NI Multi buffer PMD device name */ #define CRYPTODEV_NAME_AESNI_GCM_PMD crypto_aesni_gcm /**< AES-NI GCM PMD device name */ -#define CRYPTODEV_NAME_LIBCRYPTO_PMD crypto_libcrypto +#define CRYPTODEV_NAME_OPENSSL_PMD crypto_openssl /**< Open SSL Crypto PMD device name */ #define CRYPTODEV_NAME_QAT_SYM_PMD crypto_qat /**< Intel QAT Symmetric Crypto PMD device name */ @@ -76,7 +76,7 @@ enum rte_cryptodev_type { RTE_CRYPTODEV_SNOW3G_PMD, /**< SNOW 3G PMD */ RTE_CRYPTODEV_KASUMI_PMD, /**< KASUMI PMD */ RTE_CRYPTODEV_ZUC_PMD, /**< ZUC PMD */ - RTE_CRYPTODEV_LIBCRYPTO_PMD, /**< LibCrypto PMD */ + RTE_CRYPTODEV_OPENSSL_PMD, /**< OpenSSL PMD */ }; extern const char **rte_cyptodev_names; diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 2b95b75cc7..51bc3b067f 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -136,7 +136,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lrte_pmd_aesni_mb _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lrte_pmd_aesni_gcm -lcrypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_LIBCRYPTO) += -lrte_pmd_libcrypto -lcrypto +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += -lrte_pmd_openssl -lcrypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -lcrypto _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g diff --git a/scripts/test-build.sh b/scripts/test-build.sh index e556fb5dcb..e0163edb5d 100755 --- a/scripts/test-build.sh +++ b/scripts/test-build.sh @@ -187,7 +187,7 @@ config () # test -z "$LIBSSO_ZUC_PATH" || \ sed -ri 's,(PMD_ZUC=)n,\1y,' $1/.config test "$DPDK_DEP_SSL" != y || \ - sed -ri 's,(PMD_LIBCRYPTO=)n,\1y,' $1/.config + sed -ri 's,(PMD_OPENSSL=)n,\1y,' $1/.config test "$DPDK_DEP_SSL" != y || \ sed -ri 's,(PMD_QAT=)n,\1y,' $1/.config sed -ri 's,(KNI_VHOST.*=)n,\1y,' $1/.config -- 2.20.1