From b9087279a9307144e433e0ca80ffc19055bec8f7 Mon Sep 17 00:00:00 2001 From: Harsh Gandhi <63674702+HarshGandhi-AWS@users.noreply.github.com> Date: Wed, 8 Jun 2022 10:22:40 -0700 Subject: [PATCH] Add --version CLI option (#280) * Add --version CLI option * updated DC version * undone the version update in file .version Co-authored-by: marco morais <93558171+marcoemorais-aws@users.noreply.github.com> # Conflicts: # source/config/Config.cpp --- .version | 2 +- source/config/Config.cpp | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.version b/.version index d3ef87965..87226c2ab 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -v1.6.0-31d162e*v1.6*1*6*0*0*31d162e +v1.6.0-31d162e*v1.6*1*6*0*0*31d162e \ No newline at end of file diff --git a/source/config/Config.cpp b/source/config/Config.cpp index db9a6689e..502438d03 100644 --- a/source/config/Config.cpp +++ b/source/config/Config.cpp @@ -2066,6 +2066,7 @@ void Config::PrintHelpMessage() "%s [true|false]:\t\t\t\t\t\tEnables/Disables Pub/Sub Sample feature\n" "%s [true|false]:\t\t\t\t\tEnables/Disables Sample Shadow feature\n" "%s [true|false]:\t\t\t\t\tEnables/Disables Config Shadow feature\n" + "%s [true|false]:\t\t\t\t\t\tEnables/Disables Secure Element Configuration\n" "%s :\t\t\t\t\t\tUse Specified Endpoint\n" "%s :\t\t\t\t\t\t\tUse Specified Cert file\n" "%s :\t\t\t\t\t\t\tUse Specified Key file\n" @@ -2093,7 +2094,12 @@ void Config::PrintHelpMessage() "%s :\t\t\t\t\t\tThe name of shadow SampleShadow feature will create or update\n" "%s :\t\t\t\tThe file the Sample Shadow feature will read from when updating shadow data\n" "%s :\t\t\t\tThe file the Sample Shadow feature will write the latest shadow document " - "to\n"; + "to\n" + "%s :\t\t\t\t\tThe file path to PKCS#11 library\n" + "%s :\t\t\t\t\tThe user PIN for logging into PKCS#11 token.\n" + "%s :\t\t\t\t\tThe Label of private key on the PKCS#11 token (optional). \n" + "%s :\t\t\t\t\tThe Slot ID containing PKCS#11 token to use (optional).\n" + "%s :\t\t\t\t\tThe Label of the PKCS#11 token to use (optional).\n"; cout << FormatMessage( helpMessageTemplate, @@ -2134,7 +2140,12 @@ void Config::PrintHelpMessage() PlainConfig::PubSub::CLI_PUB_SUB_SUBSCRIBE_FILE, PlainConfig::SampleShadow::CLI_SAMPLE_SHADOW_NAME, PlainConfig::SampleShadow::CLI_SAMPLE_SHADOW_INPUT_FILE, - PlainConfig::SampleShadow::CLI_SAMPLE_SHADOW_OUTPUT_FILE); + PlainConfig::SampleShadow::CLI_SAMPLE_SHADOW_OUTPUT_FILE, + PlainConfig::SecureElement::CLI_PKCS11_LIB, + PlainConfig::SecureElement::CLI_SECURE_ELEMENT_PIN, + PlainConfig::SecureElement::CLI_SECURE_ELEMENT_KEY_LABEL, + PlainConfig::SecureElement::CLI_SECURE_ELEMENT_SLOT_ID, + PlainConfig::SecureElement::CLI_SECURE_ELEMENT_TOKEN_LABEL); } void Config::PrintVersion()