From patchwork Thu Oct 29 12:53:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 82768 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 60879A04B5; Thu, 29 Oct 2020 13:55:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E41A9CCA8; Thu, 29 Oct 2020 13:53:51 +0100 (CET) Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by dpdk.org (Postfix) with ESMTP id B8364CBA8 for ; Thu, 29 Oct 2020 13:53:49 +0100 (CET) Received: by mail-ej1-f67.google.com with SMTP id 7so3713330ejm.0 for ; Thu, 29 Oct 2020 05:53:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=j8sxZ8oZOjKK5/6ZOtA5tuPnqzUPJXPrdW18vOuQ8kI=; b=1U48cW5uy7jDvldc5tiUNLCh5RdliKjnWXAAAcfE5Bqewa/2npzC3OssY35A93x+Qh 9lDQwmLjrxEyl4808ToqpvvsQBYp5Hh08Qf66Ds4q8tJ6Ry1QcOvIKeyyroCMEc/4VJe LoQCRkQyl9aoScYJD1zANIoVgURWcAQMg/Yd28yVKBuYfM6Hx+l1RiB9CQGDmiWYJL7f BXyQwMVUOJitb4oay4IpZuimzPmyLi7NVspZxeaQ82OksqjwUiVSYQ7tV5kaC0Lsxrqs Ov258kGBJChpziYKZBLcmi+QrPxqyddxs5smoRGRhaqJTooMqtrcEgKkVOSO8HwAz/oC yQDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=j8sxZ8oZOjKK5/6ZOtA5tuPnqzUPJXPrdW18vOuQ8kI=; b=sqeBZGUr7uXHusSERA2hbiVkTY2rt1mmrzuNJI6Kt0F4J/h9udhVtwB57D36WXYxLl 4ibPeGmGevVv1NMdrM4JLc+D6QtOJkAdSM4/y1Zhmm2U7gyC1M7RYrqTHdG6VBD5Bbc6 ucByFzQBvZEsF4Xv/nocF8B2n6JwY5NOz5mztEnDUVQBhLnUvOzy69EBZXIAQllNtpME lZT+bTEy+ohHlLXwLgtZKm5Qo2eNq04CstXh52OS+AN2xm+4GZs0U2xUB4xBBu+UUTf4 yTmRJZFvPfB7J+qXkA/3xb9SEDtB+oNgRf2ey8RfDUfH3PF4U7Is6aiAHKBy/IvAlOMZ rd1A== X-Gm-Message-State: AOAM531e8iuCVXscfq9O5AumV/HD58RfTev8fe5h39Ze6VsnXhKRYOvG n4rWJbalYUYTz/OYX1aTPmc4gA== X-Google-Smtp-Source: ABdhPJwUKMluvSZmNydmSC0VH2Z+/9P80sPfLK//UsdLbIhzmbfpAIb6KWZxzD7ry8wT58o93f6V+w== X-Received: by 2002:a17:906:da03:: with SMTP id fi3mr3885181ejb.321.1603976029472; Thu, 29 Oct 2020 05:53:49 -0700 (PDT) Received: from localhost.localdomain ([39.33.228.207]) by smtp.gmail.com with ESMTPSA id q19sm1487951ejz.90.2020.10.29.05.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 05:53:48 -0700 (PDT) From: Ibtisam Tariq To: marko.kovacevic@intel.com, konstantin.ananyev@intel.com, reshma.pattan@intel.com, john.mcnamara@intel.com, cristian.dumitrescu@intel.com, jasvinder.singh@intel.com, chenbo.xia@intel.com, maxime.coquelin@redhat.com, xiaoyun.li@intel.com Cc: dev@dpdk.org, Ibtisam Tariq Date: Thu, 29 Oct 2020 12:53:32 +0000 Message-Id: <20201029125339.30916-1-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH 1/8] examples/fips_validation: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Instead of using getopt_long return value, strcmp was used to compare the input parameters with the struct option array. This patch get rid of all those strcmp by directly binding each longopt with an int enum. Bugzilla ID: 238 Fixes: 3d0fad56b74 ("examples/fips_validation: add crypto FIPS application"} Cc: marko.kovacevic@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- examples/fips_validation/main.c | 241 +++++++++++++++++++------------- 1 file changed, 143 insertions(+), 98 deletions(-) diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 07532c956..5fb76b421 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -15,17 +15,31 @@ #include "fips_validation.h" #include "fips_dev_self_test.h" +enum{ #define REQ_FILE_PATH_KEYWORD "req-file" + /* first long only option value must be >= 256, so that we won't + * conflict with short options + */ + REQ_FILE_PATH_KEYWORD_NUM = 256, #define RSP_FILE_PATH_KEYWORD "rsp-file" + RSP_FILE_PATH_KEYWORD_NUM, #define MBUF_DATAROOM_KEYWORD "mbuf-dataroom" + MBUF_DATAROOM_KEYWORD_NUM, #define FOLDER_KEYWORD "path-is-folder" + FOLDER_KEYWORD_NUM, #define CRYPTODEV_KEYWORD "cryptodev" + CRYPTODEV_KEYWORD_NUM, #define CRYPTODEV_ID_KEYWORD "cryptodev-id" + CRYPTODEV_ID_KEYWORD_NUM, #define CRYPTODEV_ST_KEYWORD "self-test" + CRYPTODEV_ST_KEYWORD_NUM, #define CRYPTODEV_BK_ID_KEYWORD "broken-test-id" + CRYPTODEV_BK_ID_KEYWORD_NUM, #define CRYPTODEV_BK_DIR_KEY "broken-test-dir" + CRYPTODEV_BK_DIR_KEY_NUM, #define CRYPTODEV_ENC_KEYWORD "enc" #define CRYPTODEV_DEC_KEYWORD "dec" +}; struct fips_test_vector vec; struct fips_test_interim_info info; @@ -226,15 +240,24 @@ cryptodev_fips_validate_parse_args(int argc, char **argv) char **argvopt; int option_index; struct option lgopts[] = { - {REQ_FILE_PATH_KEYWORD, required_argument, 0, 0}, - {RSP_FILE_PATH_KEYWORD, required_argument, 0, 0}, - {FOLDER_KEYWORD, no_argument, 0, 0}, - {MBUF_DATAROOM_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_ID_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_ST_KEYWORD, no_argument, 0, 0}, - {CRYPTODEV_BK_ID_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_BK_DIR_KEY, required_argument, 0, 0}, + {REQ_FILE_PATH_KEYWORD, required_argument, + NULL, REQ_FILE_PATH_KEYWORD_NUM}, + {RSP_FILE_PATH_KEYWORD, required_argument, + NULL, RSP_FILE_PATH_KEYWORD_NUM}, + {FOLDER_KEYWORD, no_argument, + NULL, FOLDER_KEYWORD_NUM}, + {MBUF_DATAROOM_KEYWORD, required_argument, + NULL, MBUF_DATAROOM_KEYWORD_NUM}, + {CRYPTODEV_KEYWORD, required_argument, + NULL, CRYPTODEV_KEYWORD_NUM}, + {CRYPTODEV_ID_KEYWORD, required_argument, + NULL, CRYPTODEV_ID_KEYWORD_NUM}, + {CRYPTODEV_ST_KEYWORD, no_argument, + NULL, CRYPTODEV_ST_KEYWORD_NUM}, + {CRYPTODEV_BK_ID_KEYWORD, required_argument, + NULL, CRYPTODEV_BK_ID_KEYWORD_NUM}, + {CRYPTODEV_BK_DIR_KEY, required_argument, + NULL, CRYPTODEV_BK_DIR_KEY_NUM}, {NULL, 0, 0, 0} }; @@ -251,105 +274,127 @@ cryptodev_fips_validate_parse_args(int argc, char **argv) while ((opt = getopt_long(argc, argvopt, "s:", lgopts, &option_index)) != EOF) { + if (opt == '?') { + cryptodev_fips_validate_usage(prgname); + return -1; + } + switch (opt) { - case 0: - if (strcmp(lgopts[option_index].name, - REQ_FILE_PATH_KEYWORD) == 0) - env.req_path = optarg; - else if (strcmp(lgopts[option_index].name, - RSP_FILE_PATH_KEYWORD) == 0) - env.rsp_path = optarg; - else if (strcmp(lgopts[option_index].name, - FOLDER_KEYWORD) == 0) - env.is_path_folder = 1; - else if (strcmp(lgopts[option_index].name, - CRYPTODEV_KEYWORD) == 0) { - ret = parse_cryptodev_arg(optarg); - if (ret < 0) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_ID_KEYWORD) == 0) { - ret = parse_cryptodev_id_arg(optarg); - if (ret < 0) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_ST_KEYWORD) == 0) { - env.self_test = 1; - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_BK_ID_KEYWORD) == 0) { - if (!env.broken_test_config) { - env.broken_test_config = rte_malloc( - NULL, - sizeof(*env.broken_test_config), - 0); - if (!env.broken_test_config) - return -ENOMEM; - - env.broken_test_config->expect_fail_dir = - self_test_dir_enc_auth_gen; - } + case REQ_FILE_PATH_KEYWORD_NUM: + { + env.req_path = optarg; + break; + } + case RSP_FILE_PATH_KEYWORD_NUM: + { + env.rsp_path = optarg; + break; + } + case FOLDER_KEYWORD_NUM: + { + env.is_path_folder = 1; + break; + } + case CRYPTODEV_KEYWORD_NUM: + { + ret = parse_cryptodev_arg(optarg); + if (ret < 0) { + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } - if (parser_read_uint32( - &env.broken_test_config->expect_fail_test_idx, - optarg) < 0) { - rte_free(env.broken_test_config); - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_BK_DIR_KEY) == 0) { - if (!env.broken_test_config) { - env.broken_test_config = rte_malloc( - NULL, - sizeof(*env.broken_test_config), - 0); - if (!env.broken_test_config) - return -ENOMEM; - - env.broken_test_config-> - expect_fail_test_idx = 0; - } + break; + } + case CRYPTODEV_ID_KEYWORD_NUM: + { + ret = parse_cryptodev_id_arg(optarg); + if (ret < 0) { + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + break; + } + case CRYPTODEV_ST_KEYWORD_NUM: + { + env.self_test = 1; + break; + } + case CRYPTODEV_BK_ID_KEYWORD_NUM: + { + if (!env.broken_test_config) { + env.broken_test_config = rte_malloc( + NULL, + sizeof(*env.broken_test_config), + 0); + if (!env.broken_test_config) + return -ENOMEM; + + env.broken_test_config->expect_fail_dir = + self_test_dir_enc_auth_gen; + } - if (strcmp(optarg, CRYPTODEV_ENC_KEYWORD) == 0) - env.broken_test_config->expect_fail_dir = - self_test_dir_enc_auth_gen; - else if (strcmp(optarg, CRYPTODEV_DEC_KEYWORD) - == 0) - env.broken_test_config->expect_fail_dir = - self_test_dir_dec_auth_verify; - else { - rte_free(env.broken_test_config); - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - MBUF_DATAROOM_KEYWORD) == 0) { - uint32_t data_room_size; - - if (parser_read_uint32(&data_room_size, - optarg) < 0) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } + if (parser_read_uint32( + &env.broken_test_config->expect_fail_test_idx, + optarg) < 0) { + rte_free(env.broken_test_config); + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + break; + } + case CRYPTODEV_BK_DIR_KEY_NUM: + { + if (!env.broken_test_config) { + env.broken_test_config = rte_malloc( + NULL, + sizeof(*env.broken_test_config), + 0); + if (!env.broken_test_config) + return -ENOMEM; + + env.broken_test_config-> + expect_fail_test_idx = 0; + } - if (data_room_size == 0 || - data_room_size > UINT16_MAX) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } + if (strcmp(optarg, CRYPTODEV_ENC_KEYWORD) == 0) + env.broken_test_config->expect_fail_dir = + self_test_dir_enc_auth_gen; + else if (strcmp(optarg, CRYPTODEV_DEC_KEYWORD) + == 0) + env.broken_test_config->expect_fail_dir = + self_test_dir_dec_auth_verify; + else { + rte_free(env.broken_test_config); + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + break; + } + case MBUF_DATAROOM_KEYWORD_NUM: + { + uint32_t data_room_size; - env.mbuf_data_room = data_room_size; - } else { + if (parser_read_uint32(&data_room_size, + optarg) < 0) { cryptodev_fips_validate_usage(prgname); return -EINVAL; } + + if (data_room_size == 0 || + data_room_size > UINT16_MAX) { + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + + env.mbuf_data_room = data_room_size; + break; + } default: - return -1; + { + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } } }