From 4de29626b7e0230d48424303ce851c5f03d7e748 Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Fri, 26 Jun 2026 22:06:57 +0800 Subject: [PATCH] Format help message --- CMakeLists.txt | 2 +- include/gmssl/version.h | 2 +- tools/certgen.c | 4 ++-- tools/certparse.c | 1 + tools/certrevoke.c | 1 + tools/crlget.c | 2 +- tools/crlparse.c | 1 + tools/ghash.c | 8 ++++---- tools/p256keygen.c | 4 ++-- tools/quic_help.h | 8 ++++---- tools/reqgen.c | 2 +- tools/reqparse.c | 1 + tools/reqsign.c | 2 +- tools/sdfdecrypt.c | 6 +++--- tools/sdfdigest.c | 8 ++++---- tools/sdfencrypt.c | 6 +++--- tools/sdfexport.c | 4 ++-- tools/sdfinfo.c | 2 +- tools/sdfsign.c | 6 +++--- tools/sdftest.c | 2 +- tools/skfutil.c | 1 + tools/sm2decrypt.c | 6 +++--- tools/sm2encrypt.c | 6 +++--- tools/sm2keygen.c | 4 ++-- tools/sm2sign.c | 6 +++--- tools/sm2verify.c | 6 +++--- tools/sm3.c | 8 ++++---- tools/sm3_pbkdf2.c | 4 ++-- tools/sm3hmac.c | 8 ++++---- tools/sm4.c | 9 ++++----- tools/sm4_cbc.c | 12 ++++++------ tools/sm4_cbc_mac.c | 18 +++++++++--------- tools/sm4_ccm.c | 8 ++++---- tools/sm4_cfb.c | 16 ++++++++-------- tools/sm4_ctr.c | 8 ++++---- tools/sm4_ecb.c | 6 +++--- tools/sm4_ff1.c | 6 +++--- tools/sm4_gcm.c | 8 ++++---- tools/sm4_ofb.c | 8 ++++---- tools/sm4_xts.c | 10 +++++----- tools/sm9decrypt.c | 8 ++++---- tools/sm9encrypt.c | 8 ++++---- tools/sm9keygen.c | 10 +++++----- tools/sm9setup.c | 4 ++-- tools/sm9sign.c | 8 ++++---- tools/sm9verify.c | 8 ++++---- tools/tlcp_help.h | 8 ++++---- tools/tls12_help.h | 10 +++++----- tools/tls13_help.h | 8 ++++---- 49 files changed, 153 insertions(+), 149 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca84604e..3eb0f04d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1026,7 +1026,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.3.0-dev.1174") +set(CPACK_PACKAGE_VERSION "3.3.0-dev.1175") set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_NSIS_MODIFY_PATH ON) include(CPack) diff --git a/include/gmssl/version.h b/include/gmssl/version.h index d893c479..6085c353 100644 --- a/include/gmssl/version.h +++ b/include/gmssl/version.h @@ -18,7 +18,7 @@ extern "C" { #define GMSSL_VERSION_NUM 30300 -#define GMSSL_VERSION_STR "GmSSL 3.3.0-dev.1174" +#define GMSSL_VERSION_STR "GmSSL 3.3.0-dev.1175" int gmssl_version_num(void); const char *gmssl_version_str(void); diff --git a/tools/certgen.c b/tools/certgen.c index 7d7156e8..20a541ae 100644 --- a/tools/certgen.c +++ b/tools/certgen.c @@ -59,7 +59,7 @@ static char *usage = " the default string '1234567812345678' is used\n" " -out file Output certificate file in PEM format\n" "\n" -" Subject and Issuer options\n" +" Subject and Issuer options\n" "\n" " -C str Country\n" " -ST str State or province name\n" @@ -68,7 +68,7 @@ static char *usage = " -OU str Organizational unit\n" " -CN str Common name\n" "\n" -" Extension options\n" +" Extension options\n" "\n" " -gen_authority_key_id Generate AuthorityKeyIdentifier extension use SM3\n" " -gen_subject_key_id Generate SubjectKeyIdentifier extension use SM3\n" diff --git a/tools/certparse.c b/tools/certparse.c index 5bd1c869..502baa07 100644 --- a/tools/certparse.c +++ b/tools/certparse.c @@ -49,6 +49,7 @@ int certparse_main(int argc, char **argv) if (!strcmp(*argv, "-help")) { printf("usage: gmssl %s %s\n\n", prog, options); printf("%s\n", usage); + ret = 0; goto end; } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; diff --git a/tools/certrevoke.c b/tools/certrevoke.c index 8d111026..7202ec05 100644 --- a/tools/certrevoke.c +++ b/tools/certrevoke.c @@ -76,6 +76,7 @@ int certrevoke_main(int argc, char **argv) if (!strcmp(*argv, "-help")) { printf("usage: gmssl %s %s\n\n", prog, options); printf("%s", usage); + ret = 0; goto end; } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; diff --git a/tools/crlget.c b/tools/crlget.c index c2b91f03..e81fe73c 100644 --- a/tools/crlget.c +++ b/tools/crlget.c @@ -53,6 +53,7 @@ int crlget_main(int argc, char **argv) if (!strcmp(*argv, "-help")) { printf("usage: gmssl %s %s\n\n", prog, usage); printf("%s\n", options); + ret = 0; goto end; } else if (!strcmp(*argv, "-cert")) { if (--argc < 1) goto bad; @@ -156,4 +157,3 @@ end: if (outfile && outfp) fclose(outfp); return ret; } - diff --git a/tools/crlparse.c b/tools/crlparse.c index f591d14d..0cdd3686 100644 --- a/tools/crlparse.c +++ b/tools/crlparse.c @@ -44,6 +44,7 @@ int crlparse_main(int argc, char **argv) while (argc > 0) { if (!strcmp(*argv, "-help")) { printf("usage: %s %s\n", prog, options); + ret = 0; goto end; } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; diff --git a/tools/ghash.c b/tools/ghash.c index 8f452650..04397793 100644 --- a/tools/ghash.c +++ b/tools/ghash.c @@ -35,10 +35,10 @@ static const char *help = "\n" "Examples\n" "\n" -" $ TEXT=`gmssl rand -outlen 20 -hex`\n" -" $ KEY=`gmssl rand -outlen 16 -hex`\n" -" $ AAD=\"The AAD Data\"\n" -" $ gmssl ghash -h $KEY -aad $AAD -in_str $TEXT\n" +" TEXT=`gmssl rand -outlen 20 -hex`\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" AAD=\"The AAD Data\"\n" +" gmssl ghash -h $KEY -aad $AAD -in_str $TEXT\n" "\n"; diff --git a/tools/p256keygen.c b/tools/p256keygen.c index 5db54713..e1c38fc0 100644 --- a/tools/p256keygen.c +++ b/tools/p256keygen.c @@ -29,8 +29,8 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl p256keygen -pass P@ssw0rd -out p256.pem\n" -" $ gmssl p256keygen -pass P@ssw0rd -out p256.pem -pubout p256pub.pem\n" +" gmssl p256keygen -pass P@ssw0rd -out p256.pem\n" +" gmssl p256keygen -pass P@ssw0rd -out p256.pem -pubout p256pub.pem\n" "\n"; int p256keygen_main(int argc, char **argv) diff --git a/tools/quic_help.h b/tools/quic_help.h index 07b293ab..a97c687a 100644 --- a/tools/quic_help.h +++ b/tools/quic_help.h @@ -1,14 +1,14 @@ "\n" "Supported cipher suites:\n" #if defined(ENABLE_AES) && defined(ENABLE_SHA2) -" TLS_AES_128_GCM_SHA256\n" +" TLS_AES_128_GCM_SHA256\n" #ifdef ENABLE_AES_CCM -" TLS_AES_128_CCM_SHA256\n" +" TLS_AES_128_CCM_SHA256\n" #endif #endif -" TLS_SM4_GCM_SM3\n" +" TLS_SM4_GCM_SM3\n" #ifdef ENABLE_SM4_CCM -" TLS_SM4_CCM_SM3\n" +" TLS_SM4_CCM_SM3\n" #endif "\n" "Examples\n" diff --git a/tools/reqgen.c b/tools/reqgen.c index 1c75203e..f68b02a1 100644 --- a/tools/reqgen.c +++ b/tools/reqgen.c @@ -50,7 +50,7 @@ static char *usage = " the default string '1234567812345678' is used\n" " -out file Output Certificate Request (CSR) file in PEM format\n" "\n" -" Subject options\n" +" Subject options\n" "\n" " -C str Country\n" " -ST str State or province name\n" diff --git a/tools/reqparse.c b/tools/reqparse.c index 3a9e1c6e..26238a06 100644 --- a/tools/reqparse.c +++ b/tools/reqparse.c @@ -35,6 +35,7 @@ int reqparse_main(int argc, char **argv) while (argc > 0) { if (!strcmp(*argv, "-help")) { printf("usage: %s %s\n", prog, options); + ret = 0; goto end; } else if(!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; diff --git a/tools/reqsign.c b/tools/reqsign.c index 4f45fad4..4d785c5a 100644 --- a/tools/reqsign.c +++ b/tools/reqsign.c @@ -68,7 +68,7 @@ static char *usage = " -pass pass Password for decrypting private key file, prompt if not given\n" " -out pem Output certificate file in PEM format\n" "\n" -" Extension options\n" +" Extension options\n" "\n" " -gen_authority_key_id Generate AuthorityKeyIdentifier extension use SM3\n" " -gen_subject_key_id Generate SubjectKeyIdentifier extension use SM3\n" diff --git a/tools/sdfdecrypt.c b/tools/sdfdecrypt.c index 5c3b3209..21d4ef07 100755 --- a/tools/sdfdecrypt.c +++ b/tools/sdfdecrypt.c @@ -36,9 +36,9 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sdfexport -encrypt -key 1 -lib libsoftsdf.so -out sm2encpub.pem\n" -" $ echo 'Secret message' | gmssl sdfencrypt -lib libsoftsdf.so -pubkey sm2encpub.pem -out sdf_ciphertext.bin\n" -" $ gmssl sdfdecrypt -lib libsoftsdf.so -key 1 -pass P@ssw0rd -in sdf_ciphertext.bin\n" +" gmssl sdfexport -encrypt -key 1 -lib libsoftsdf.so -out sm2encpub.pem\n" +" echo 'Secret message' | gmssl sdfencrypt -lib libsoftsdf.so -pubkey sm2encpub.pem -out sdf_ciphertext.bin\n" +" gmssl sdfdecrypt -lib libsoftsdf.so -key 1 -pass P@ssw0rd -in sdf_ciphertext.bin\n" "\n"; int sdfdecrypt_main(int argc, char **argv) diff --git a/tools/sdfdigest.c b/tools/sdfdigest.c index 61bb6eb6..9b3c212c 100644 --- a/tools/sdfdigest.c +++ b/tools/sdfdigest.c @@ -50,13 +50,13 @@ static const char *help = "\n" " gmssl sdfdigest -pubkey sm2pubkey.pem -id alice -in /path/to/file -bin\n" "\n" -" When reading from stdin, make sure the trailing newline character is removed\n" +" When reading from stdin, make sure the trailing newline character is removed\n" "\n" -" Linux/Mac:\n" +" Linux/Mac:\n" " echo -n abc | gmssl sdfdigest\n" "\n" -" Windows:\n" -" C:\\> echo |set/p=\"abc\" | gmssl sdfdigest\n" +" Windows:\n" +" echo |set/p=\"abc\" | gmssl sdfdigest\n" "\n"; diff --git a/tools/sdfencrypt.c b/tools/sdfencrypt.c index caa894c6..af3a460d 100755 --- a/tools/sdfencrypt.c +++ b/tools/sdfencrypt.c @@ -35,9 +35,9 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sdfexport -encrypt -key 1 -lib libsoftsdf.so -out sm2encpub.pem\n" -" $ echo 'Secret message' | gmssl sdfencrypt -lib libsoftsdf.so -pubkey sm2encpub.pem -out sdf_ciphertext.bin\n" -" $ gmssl sdfdecrypt -lib libsoftsdf.so -key 1 -pass P@ssw0rd -in sdf_ciphertext.bin\n" +" gmssl sdfexport -encrypt -key 1 -lib libsoftsdf.so -out sm2encpub.pem\n" +" echo 'Secret message' | gmssl sdfencrypt -lib libsoftsdf.so -pubkey sm2encpub.pem -out sdf_ciphertext.bin\n" +" gmssl sdfdecrypt -lib libsoftsdf.so -key 1 -pass P@ssw0rd -in sdf_ciphertext.bin\n" "\n"; int sdfencrypt_main(int argc, char **argv) diff --git a/tools/sdfexport.c b/tools/sdfexport.c index c28de6a5..78ec7c1a 100644 --- a/tools/sdfexport.c +++ b/tools/sdfexport.c @@ -30,8 +30,8 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sdfexport -sign -key 1 -out sm2signpub.pem\n" -" $ gmssl sdfexport -encrypt -key 1 -out sm2signpub.pem\n" +" gmssl sdfexport -sign -key 1 -out sm2signpub.pem\n" +" gmssl sdfexport -encrypt -key 1 -out sm2signpub.pem\n" "\n"; diff --git a/tools/sdfinfo.c b/tools/sdfinfo.c index 6e393692..b1a4ac4e 100644 --- a/tools/sdfinfo.c +++ b/tools/sdfinfo.c @@ -26,7 +26,7 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sdfinfo\n" +" gmssl sdfinfo\n" "\n"; diff --git a/tools/sdfsign.c b/tools/sdfsign.c index 90955f4f..ae16aa3c 100644 --- a/tools/sdfsign.c +++ b/tools/sdfsign.c @@ -32,9 +32,9 @@ static const char *options = "\n" "Examples\n" "\n" -" $ echo -n 'message to be signed' | gmssl sdfsign -lib libsoftsdf.so -key 1 -pass P@ssw0rd -out sm2.sig\n" -" $ gmssl sdfexport -lib libsoftsdf.so -sign -key 1 -out sm2pub.pem\n" -" $ echo -n 'message to be signed' | gmssl sm2verify -pubkey sm2pub.pem -sig sm2.sig\n" +" echo -n 'message to be signed' | gmssl sdfsign -lib libsoftsdf.so -key 1 -pass P@ssw0rd -out sm2.sig\n" +" gmssl sdfexport -lib libsoftsdf.so -sign -key 1 -out sm2pub.pem\n" +" echo -n 'message to be signed' | gmssl sm2verify -pubkey sm2pub.pem -sig sm2.sig\n" "\n"; diff --git a/tools/sdftest.c b/tools/sdftest.c index f8bffdbe..5dfbe5f8 100644 --- a/tools/sdftest.c +++ b/tools/sdftest.c @@ -38,7 +38,7 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sdftest -lib soft_sdf.so -kek 1 -key 1 -pass P@ssw0rd\n" +" gmssl sdftest -lib soft_sdf.so -kek 1 -key 1 -pass P@ssw0rd\n" "\n"; diff --git a/tools/skfutil.c b/tools/skfutil.c index 044a86e4..73d51a4e 100644 --- a/tools/skfutil.c +++ b/tools/skfutil.c @@ -80,6 +80,7 @@ int skfutil_main(int argc, char **argv) while (argc > 0) { if (!strcmp(*argv, "-help")) { print_usage(stdout, prog); + ret = 0; goto end; } else if (!strcmp(*argv, "-lib")) { if (--argc < 1) goto bad; diff --git a/tools/sm2decrypt.c b/tools/sm2decrypt.c index 7cf27049..7dbb4c23 100644 --- a/tools/sm2decrypt.c +++ b/tools/sm2decrypt.c @@ -30,9 +30,9 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" -" $ echo 'Secret message' | gmssl sm2encrypt -pubkey sm2pub.pem -out sm2.der\n" -" $ gmssl sm2decrypt -key sm2.pem -pass P@ssw0rd -in sm2.der\n" +" gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" +" echo 'Secret message' | gmssl sm2encrypt -pubkey sm2pub.pem -out sm2.der\n" +" gmssl sm2decrypt -key sm2.pem -pass P@ssw0rd -in sm2.der\n" "\n"; int sm2decrypt_main(int argc, char **argv) diff --git a/tools/sm2encrypt.c b/tools/sm2encrypt.c index 090026a4..25565b1c 100644 --- a/tools/sm2encrypt.c +++ b/tools/sm2encrypt.c @@ -29,9 +29,9 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" -" $ echo 'Secret message' | gmssl sm2encrypt -pubkey sm2pub.pem -out sm2.der\n" -" $ gmssl sm2decrypt -key sm2.pem -pass P@ssw0rd -in sm2.der\n" +" gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" +" echo 'Secret message' | gmssl sm2encrypt -pubkey sm2pub.pem -out sm2.der\n" +" gmssl sm2decrypt -key sm2.pem -pass P@ssw0rd -in sm2.der\n" "\n"; int sm2encrypt_main(int argc, char **argv) diff --git a/tools/sm2keygen.c b/tools/sm2keygen.c index 573cec98..6e1fad8b 100644 --- a/tools/sm2keygen.c +++ b/tools/sm2keygen.c @@ -28,8 +28,8 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm2keygen -pass P@ssw0rd -out sm2.pem\n" -" $ gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" +" gmssl sm2keygen -pass P@ssw0rd -out sm2.pem\n" +" gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" "\n"; int sm2keygen_main(int argc, char **argv) diff --git a/tools/sm2sign.c b/tools/sm2sign.c index 0c07c76d..14024dca 100644 --- a/tools/sm2sign.c +++ b/tools/sm2sign.c @@ -31,9 +31,9 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" -" $ echo -n 'message to be signed' | gmssl sm2sign -key sm2.pem -pass P@ssw0rd -out sm2.sig\n" -" $ echo -n 'message to be signed' | gmssl sm2verify -pubkey sm2pub.pem -sig sm2.sig\n" +" gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" +" echo -n 'message to be signed' | gmssl sm2sign -key sm2.pem -pass P@ssw0rd -out sm2.sig\n" +" echo -n 'message to be signed' | gmssl sm2verify -pubkey sm2pub.pem -sig sm2.sig\n" "\n"; diff --git a/tools/sm2verify.c b/tools/sm2verify.c index 9fbaf65b..057ceea6 100644 --- a/tools/sm2verify.c +++ b/tools/sm2verify.c @@ -30,9 +30,9 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" -" $ echo -n 'message to be signed' | gmssl sm2sign -key sm2.pem -pass P@ssw0rd -out sm2.sig\n" -" $ echo -n 'message to be signed' | gmssl sm2verify -pubkey sm2pub.pem -sig sm2.sig\n" +" gmssl sm2keygen -pass P@ssw0rd -out sm2.pem -pubout sm2pub.pem\n" +" echo -n 'message to be signed' | gmssl sm2sign -key sm2.pem -pass P@ssw0rd -out sm2.sig\n" +" echo -n 'message to be signed' | gmssl sm2verify -pubkey sm2pub.pem -sig sm2.sig\n" "\n"; diff --git a/tools/sm3.c b/tools/sm3.c index 9ee6bd9c..72fbffc3 100644 --- a/tools/sm3.c +++ b/tools/sm3.c @@ -48,13 +48,13 @@ static const char *help = "\n" " gmssl sm3 -pubkey sm2pubkey.pem -id alice -in /path/to/file -bin\n" "\n" -" When reading from stdin, make sure the trailing newline character is removed\n" +" When reading from stdin, make sure the trailing newline character is removed\n" "\n" -" Linux/Mac:\n" +" Linux/Mac:\n" " echo -n abc | gmssl sm3\n" "\n" -" Windows:\n" -" C:\\> echo |set/p=\"abc\" | gmssl sm3\n" +" Windows:\n" +" echo |set/p=\"abc\" | gmssl sm3\n" "\n"; diff --git a/tools/sm3_pbkdf2.c b/tools/sm3_pbkdf2.c index 4002fc68..aee8f216 100644 --- a/tools/sm3_pbkdf2.c +++ b/tools/sm3_pbkdf2.c @@ -34,8 +34,8 @@ static const char *options = "\n" "Examples\n" "\n" -" $ SALT=`gmssl rand -outlen 8 -hex`\n" -" $ gmssl sm3_pbkdf2 -pass P@ssw0rd -salt $SALT -iter 10000 -outlen 16 -hex\n" +" SALT=`gmssl rand -outlen 8 -hex`\n" +" gmssl sm3_pbkdf2 -pass P@ssw0rd -salt $SALT -iter 10000 -outlen 16 -hex\n" "\n"; diff --git a/tools/sm3hmac.c b/tools/sm3hmac.c index e2b92a42..2efe5388 100644 --- a/tools/sm3hmac.c +++ b/tools/sm3hmac.c @@ -41,13 +41,13 @@ static const char *help = "\n" " gmssl sm3hmac -key $KEY_HEX -in /path/to/file\n" "\n" -" When reading from stdin, make sure the trailing newline character is removed\n" +" When reading from stdin, make sure the trailing newline character is removed\n" "\n" -" Linux/Mac:\n" +" Linux/Mac:\n" " echo -n abc | gmssl sm3hmac -key $KEY_HEX\n" "\n" -" Windows:\n" -" C:\\> echo |set/p=\"abc\" | gmssl sm3hmac -key 11223344556677881122334455667788\n" +" Windows:\n" +" echo |set/p=\"abc\" | gmssl sm3hmac -key 11223344556677881122334455667788\n" "\n"; int sm3hmac_main(int argc, char **argv) diff --git a/tools/sm4.c b/tools/sm4.c index 7f41743f..87110eb6 100755 --- a/tools/sm4.c +++ b/tools/sm4.c @@ -177,7 +177,7 @@ static const char *usage = static const char *options = "Options\n" "\n" -" Modes\n" +" Modes\n" "\n" " -ecb ECB mode\n" " -cbc CBC mode with padding, need 16-byte key and 16-byte iv\n" @@ -197,10 +197,9 @@ static const char *options = " -in file | stdin Input data\n" " -out file | stdout Output data\n" "\n" -"Examples" -"\n" -" echo \"hello\" | gmssl sm4 -gcm -encrypt -key 11223344556677881122334455667788 -iv 112233445566778811223344 -out ciphertext.bin\n" -" gmssl sm4 -gcm -decrypt -key 11223344556677881122334455667788 -iv 112233445566778811223344 -in ciphertext.bin\n" +"Examples\n" +" echo \"hello\" | gmssl sm4 -gcm -encrypt -key 11223344556677881122334455667788 -iv 112233445566778811223344 -out ciphertext.bin\n" +" gmssl sm4 -gcm -decrypt -key 11223344556677881122334455667788 -iv 112233445566778811223344 -in ciphertext.bin\n" "\n"; int sm4_main(int argc, char **argv) diff --git a/tools/sm4_cbc.c b/tools/sm4_cbc.c index bfa374df..c738acbf 100755 --- a/tools/sm4_cbc.c +++ b/tools/sm4_cbc.c @@ -35,13 +35,13 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" IV=`gmssl rand -outlen 16 -hex`\n" -" echo -n 0123456789abcdef | gmssl sm4_cbc -encrypt -key $KEY -iv $IV -out sm4_cbc_ciphertext.bin\n" -" gmssl sm4_cbc -decrypt -key $KEY -iv $IV -in sm4_cbc_ciphertext.bin\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" IV=`gmssl rand -outlen 16 -hex`\n" +" echo -n 0123456789abcdef | gmssl sm4_cbc -encrypt -key $KEY -iv $IV -out sm4_cbc_ciphertext.bin\n" +" gmssl sm4_cbc -decrypt -key $KEY -iv $IV -in sm4_cbc_ciphertext.bin\n" "\n" -" echo -n abc | gmssl sm4_cbc -encrypt -pkcs7_padding -key $KEY -iv $IV -out sm4_cbc_ciphertext.bin\n" -" gmssl sm4_cbc -decrypt -pkcs7_padding -key $KEY -iv $IV -in sm4_cbc_ciphertext.bin\n" +" echo -n abc | gmssl sm4_cbc -encrypt -pkcs7_padding -key $KEY -iv $IV -out sm4_cbc_ciphertext.bin\n" +" gmssl sm4_cbc -decrypt -pkcs7_padding -key $KEY -iv $IV -in sm4_cbc_ciphertext.bin\n" "\n"; int sm4_cbc_main(int argc, char **argv) diff --git a/tools/sm4_cbc_mac.c b/tools/sm4_cbc_mac.c index a7063926..f0c8acd8 100644 --- a/tools/sm4_cbc_mac.c +++ b/tools/sm4_cbc_mac.c @@ -35,20 +35,20 @@ static const char *help = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" gmssl sm4_cbc_mac -key $KEY -in_str abc\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" gmssl sm4_cbc_mac -key $KEY -in_str abc\n" "\n" -" gmssl sm4_cbc_mac -key $KEY -in_str abc -bin\n" +" gmssl sm4_cbc_mac -key $KEY -in_str abc -bin\n" "\n" -" gmssl sm4_cbc_mac -key $KEY -in /path/to/file\n" +" gmssl sm4_cbc_mac -key $KEY -in /path/to/file\n" "\n" -" When reading from stdin, make sure the trailing newline character is removed\n" +" When reading from stdin, make sure the trailing newline character is removed\n" "\n" -" Linux/Mac:\n" -" echo -n abc | gmssl sm4_cbc_mac -key $KEY\n" +" Linux/Mac:\n" +" echo -n abc | gmssl sm4_cbc_mac -key $KEY\n" "\n" -" Windows:\n" -" echo |set/p=\"abc\" | gmssl sm4_cbc_mac -key 11223344556677881122334455667788\n" +" Windows:\n" +" echo |set/p=\"abc\" | gmssl sm4_cbc_mac -key 11223344556677881122334455667788\n" "\n"; int sm4_cbc_mac_main(int argc, char **argv) diff --git a/tools/sm4_ccm.c b/tools/sm4_ccm.c index 515f0754..5cf3a3df 100755 --- a/tools/sm4_ccm.c +++ b/tools/sm4_ccm.c @@ -37,10 +37,10 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" IV=`gmssl rand -outlen 12 -hex`\n" -" echo -n abc | gmssl sm4_ccm -encrypt -key $KEY -iv $IV -aad_hex 001122 -out sm4_ccm_ciphertext.bin\n" -" gmssl sm4_ccm -decrypt -key $KEY -iv $IV -aad_hex 001122 -in sm4_ccm_ciphertext.bin\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" IV=`gmssl rand -outlen 12 -hex`\n" +" echo -n abc | gmssl sm4_ccm -encrypt -key $KEY -iv $IV -aad_hex 001122 -out sm4_ccm_ciphertext.bin\n" +" gmssl sm4_ccm -decrypt -key $KEY -iv $IV -aad_hex 001122 -in sm4_ccm_ciphertext.bin\n" "\n"; static uint8_t *read_content(FILE *infp, size_t *outlen, const char *prog) diff --git a/tools/sm4_cfb.c b/tools/sm4_cfb.c index 2553987b..e919e8c3 100755 --- a/tools/sm4_cfb.c +++ b/tools/sm4_cfb.c @@ -34,16 +34,16 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" IV=`gmssl rand -outlen 16 -hex`\n" -" echo -n abc | gmssl sm4_cfb -encrypt -key $KEY -iv $IV -out sm4_cfb128_ciphertext.bin\n" -" gmssl sm4_cfb -decrypt -key $KEY -iv $IV -in sm4_cfb128_ciphertext.bin\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" IV=`gmssl rand -outlen 16 -hex`\n" +" echo -n abc | gmssl sm4_cfb -encrypt -key $KEY -iv $IV -out sm4_cfb128_ciphertext.bin\n" +" gmssl sm4_cfb -decrypt -key $KEY -iv $IV -in sm4_cfb128_ciphertext.bin\n" "\n" -" echo -n abc | gmssl sm4_cfb -sbytes 1 -encrypt -key $KEY -iv $IV -out sm4_cfb8_ciphertext.bin\n" -" gmssl sm4_cfb -sbytes 1 -decrypt -key $KEY -iv $IV -in sm4_cfb8_ciphertext.bin\n" +" echo -n abc | gmssl sm4_cfb -sbytes 1 -encrypt -key $KEY -iv $IV -out sm4_cfb8_ciphertext.bin\n" +" gmssl sm4_cfb -sbytes 1 -decrypt -key $KEY -iv $IV -in sm4_cfb8_ciphertext.bin\n" "\n" -" echo -n 01234567 | gmssl sm4_cfb -sbytes 8 -encrypt -key $KEY -iv $IV -out sm4_cfb64_ciphertext.bin\n" -" gmssl sm4_cfb -sbytes 8 -decrypt -key $KEY -iv $IV -in sm4_cfb64_ciphertext.bin\n" +" echo -n 01234567 | gmssl sm4_cfb -sbytes 8 -encrypt -key $KEY -iv $IV -out sm4_cfb64_ciphertext.bin\n" +" gmssl sm4_cfb -sbytes 8 -decrypt -key $KEY -iv $IV -in sm4_cfb64_ciphertext.bin\n" "\n"; int sm4_cfb_main(int argc, char **argv) diff --git a/tools/sm4_ctr.c b/tools/sm4_ctr.c index e3adb6ac..ff7b0373 100755 --- a/tools/sm4_ctr.c +++ b/tools/sm4_ctr.c @@ -33,10 +33,10 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" IV=`gmssl rand -outlen 16 -hex`\n" -" echo -n abc | gmssl sm4_ctr -encrypt -key $KEY -iv $IV -out sm4_ctr_ciphertext.bin\n" -" gmssl sm4_ctr -decrypt -key $KEY -iv $IV -in sm4_ctr_ciphertext.bin\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" IV=`gmssl rand -outlen 16 -hex`\n" +" echo -n abc | gmssl sm4_ctr -encrypt -key $KEY -iv $IV -out sm4_ctr_ciphertext.bin\n" +" gmssl sm4_ctr -decrypt -key $KEY -iv $IV -in sm4_ctr_ciphertext.bin\n" "\n"; int sm4_ctr_main(int argc, char **argv) diff --git a/tools/sm4_ecb.c b/tools/sm4_ecb.c index 26186f99..f78fba19 100755 --- a/tools/sm4_ecb.c +++ b/tools/sm4_ecb.c @@ -32,9 +32,9 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" echo -n 0123456789abcdef | gmssl sm4_ecb -encrypt -key $KEY -out sm4_ecb_ciphertext.bin\n" -" gmssl sm4_ecb -decrypt -key $KEY -in sm4_ecb_ciphertext.bin\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" echo -n 0123456789abcdef | gmssl sm4_ecb -encrypt -key $KEY -out sm4_ecb_ciphertext.bin\n" +" gmssl sm4_ecb -decrypt -key $KEY -in sm4_ecb_ciphertext.bin\n" "\n"; int sm4_ecb_main(int argc, char **argv) diff --git a/tools/sm4_ff1.c b/tools/sm4_ff1.c index 183f883f..8481e603 100644 --- a/tools/sm4_ff1.c +++ b/tools/sm4_ff1.c @@ -40,9 +40,9 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" CIPHERTEXT=`gmssl sm4_ff1 -encrypt -key $KEY -digits 0123456789012345`\n" -" gmssl sm4_ff1 -decrypt -key $KEY -digits $CIPHERTEXT\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" CIPHERTEXT=`gmssl sm4_ff1 -encrypt -key $KEY -digits 0123456789012345`\n" +" gmssl sm4_ff1 -decrypt -key $KEY -digits $CIPHERTEXT\n" "\n"; static uint8_t *read_content(FILE *infp, size_t *outlen, const char *prog) diff --git a/tools/sm4_gcm.c b/tools/sm4_gcm.c index 143c9364..159c4af4 100755 --- a/tools/sm4_gcm.c +++ b/tools/sm4_gcm.c @@ -37,10 +37,10 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" IV=`gmssl rand -outlen 12 -hex`\n" -" echo -n abc | gmssl sm4_gcm -encrypt -key $KEY -iv $IV -aad_hex 001122 -out sm4_gcm_ciphertext.bin\n" -" gmssl sm4_gcm -decrypt -key $KEY -iv $IV -aad_hex 001122 -in sm4_gcm_ciphertext.bin\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" IV=`gmssl rand -outlen 12 -hex`\n" +" echo -n abc | gmssl sm4_gcm -encrypt -key $KEY -iv $IV -aad_hex 001122 -out sm4_gcm_ciphertext.bin\n" +" gmssl sm4_gcm -decrypt -key $KEY -iv $IV -aad_hex 001122 -in sm4_gcm_ciphertext.bin\n" "\n"; int sm4_gcm_main(int argc, char **argv) diff --git a/tools/sm4_ofb.c b/tools/sm4_ofb.c index c84e9dcf..4b374bee 100755 --- a/tools/sm4_ofb.c +++ b/tools/sm4_ofb.c @@ -33,10 +33,10 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 16 -hex`\n" -" IV=`gmssl rand -outlen 16 -hex`\n" -" echo -n abc | gmssl sm4_ofb -encrypt -key $KEY -iv $IV -out sm4_ofb_ciphertext.bin\n" -" gmssl sm4_ofb -decrypt -key $KEY -iv $IV -in sm4_ofb_ciphertext.bin\n" +" KEY=`gmssl rand -outlen 16 -hex`\n" +" IV=`gmssl rand -outlen 16 -hex`\n" +" echo -n abc | gmssl sm4_ofb -encrypt -key $KEY -iv $IV -out sm4_ofb_ciphertext.bin\n" +" gmssl sm4_ofb -decrypt -key $KEY -iv $IV -in sm4_ofb_ciphertext.bin\n" "\n"; int sm4_ofb_main(int argc, char **argv) diff --git a/tools/sm4_xts.c b/tools/sm4_xts.c index 565afd93..b4d6625e 100755 --- a/tools/sm4_xts.c +++ b/tools/sm4_xts.c @@ -35,11 +35,11 @@ static const char *options = "\n" "Examples\n" "\n" -" KEY=`gmssl rand -outlen 32 -hex`\n" -" IV=`gmssl rand -outlen 16 -hex`\n" -" gmssl rand -outlen 512 -out sm4_xts_plaintext.bin\n" -" gmssl sm4_xts -encrypt -key $KEY -iv $IV -data_unit_size 512 -in sm4_xts_plaintext.bin -out sm4_xts_ciphertext.bin\n" -" gmssl sm4_xts -decrypt -key $KEY -iv $IV -data_unit_size 512 -in sm4_xts_ciphertext.bin -out sm4_xts_decrypted.bin\n" +" KEY=`gmssl rand -outlen 32 -hex`\n" +" IV=`gmssl rand -outlen 16 -hex`\n" +" gmssl rand -outlen 512 -out sm4_xts_plaintext.bin\n" +" gmssl sm4_xts -encrypt -key $KEY -iv $IV -data_unit_size 512 -in sm4_xts_plaintext.bin -out sm4_xts_ciphertext.bin\n" +" gmssl sm4_xts -decrypt -key $KEY -iv $IV -data_unit_size 512 -in sm4_xts_ciphertext.bin -out sm4_xts_decrypted.bin\n" "\n"; int sm4_xts_main(int argc, char **argv) diff --git a/tools/sm9decrypt.c b/tools/sm9decrypt.c index efe58c5c..69d54c87 100644 --- a/tools/sm9decrypt.c +++ b/tools/sm9decrypt.c @@ -30,11 +30,11 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem -pubout sm9enc_mpk.pem\n" -" $ gmssl sm9keygen -alg sm9encrypt -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9enc.pem -outpass 123456\n" +" gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem -pubout sm9enc_mpk.pem\n" +" gmssl sm9keygen -alg sm9encrypt -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9enc.pem -outpass 123456\n" "\n" -" $ echo 'Secret text' | gmssl sm9encrypt -pubmaster sm9enc_mpk.pem -id Alice -out sm9_ciphertext.der\n" -" $ gmssl sm9decrypt -key sm9enc.pem -pass 123456 -id Alice -in sm9_ciphertext.der\n" +" echo 'Secret text' | gmssl sm9encrypt -pubmaster sm9enc_mpk.pem -id Alice -out sm9_ciphertext.der\n" +" gmssl sm9decrypt -key sm9enc.pem -pass 123456 -id Alice -in sm9_ciphertext.der\n" "\n"; int sm9decrypt_main(int argc, char **argv) diff --git a/tools/sm9encrypt.c b/tools/sm9encrypt.c index 80460f3f..d0d9fea2 100644 --- a/tools/sm9encrypt.c +++ b/tools/sm9encrypt.c @@ -27,11 +27,11 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem -pubout sm9enc_mpk.pem\n" -" $ gmssl sm9keygen -alg sm9encrypt -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9enc.pem -outpass 123456\n" +" gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem -pubout sm9enc_mpk.pem\n" +" gmssl sm9keygen -alg sm9encrypt -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9enc.pem -outpass 123456\n" "\n" -" $ echo 'Secret text' | gmssl sm9encrypt -pubmaster sm9enc_mpk.pem -id Alice -out sm9_ciphertext.der\n" -" $ gmssl sm9decrypt -key sm9enc.pem -pass 123456 -id Alice -in sm9_ciphertext.der\n" +" echo 'Secret text' | gmssl sm9encrypt -pubmaster sm9enc_mpk.pem -id Alice -out sm9_ciphertext.der\n" +" gmssl sm9decrypt -key sm9enc.pem -pass 123456 -id Alice -in sm9_ciphertext.der\n" "\n"; int sm9encrypt_main(int argc, char **argv) diff --git a/tools/sm9keygen.c b/tools/sm9keygen.c index c9a652a5..792305f5 100644 --- a/tools/sm9keygen.c +++ b/tools/sm9keygen.c @@ -33,12 +33,12 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem\n" -" $ gmssl sm9keygen -alg sm9sign -in sm9sign_msk.pem -inpass P@ssw0rd -id Alice -out sm9sign.pem -outpass 123456\n" +" gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem\n" +" gmssl sm9keygen -alg sm9sign -in sm9sign_msk.pem -inpass P@ssw0rd -id Alice -out sm9sign.pem -outpass 123456\n" "\n" -" $ gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem\n" -" $ gmssl sm9keygen -alg sm9encrypt -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9enc.pem -outpass 123456\n" -" $ gmssl sm9keygen -alg sm9keyagreement -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9exch.pem -outpass 123456\n" +" gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem\n" +" gmssl sm9keygen -alg sm9encrypt -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9enc.pem -outpass 123456\n" +" gmssl sm9keygen -alg sm9keyagreement -in sm9enc_msk.pem -inpass P@ssw0rd -id Alice -out sm9exch.pem -outpass 123456\n" "\n"; int sm9keygen_main(int argc, char **argv) diff --git a/tools/sm9setup.c b/tools/sm9setup.c index b177fb4b..f449b24b 100644 --- a/tools/sm9setup.c +++ b/tools/sm9setup.c @@ -30,8 +30,8 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem -pubout sm9sign_mpk.pem\n" -" $ gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem -pubout sm9enc_mpk.pem\n" +" gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem -pubout sm9sign_mpk.pem\n" +" gmssl sm9setup -alg sm9encrypt -pass P@ssw0rd -out sm9enc_msk.pem -pubout sm9enc_mpk.pem\n" "\n"; int sm9setup_main(int argc, char **argv) diff --git a/tools/sm9sign.c b/tools/sm9sign.c index 7f935540..fbd08659 100644 --- a/tools/sm9sign.c +++ b/tools/sm9sign.c @@ -29,11 +29,11 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem -pubout sm9sign_mpk.pem\n" -" $ gmssl sm9keygen -alg sm9sign -in sm9sign_msk.pem -inpass P@ssw0rd -id Alice -out sm9sign.pem -outpass 123456\n" +" gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem -pubout sm9sign_mpk.pem\n" +" gmssl sm9keygen -alg sm9sign -in sm9sign_msk.pem -inpass P@ssw0rd -id Alice -out sm9sign.pem -outpass 123456\n" "\n" -" $ echo -n 'message to be signed' | gmssl sm9sign -key sm9sign.pem -pass 123456 -out sm9.sig\n" -" $ echo -n 'message to be signed' | gmssl sm9verify -pubmaster sm9sign_mpk.pem -id Alice -sig sm9.sig\n" +" echo -n 'message to be signed' | gmssl sm9sign -key sm9sign.pem -pass 123456 -out sm9.sig\n" +" echo -n 'message to be signed' | gmssl sm9verify -pubmaster sm9sign_mpk.pem -id Alice -sig sm9.sig\n" "\n"; int sm9sign_main(int argc, char **argv) diff --git a/tools/sm9verify.c b/tools/sm9verify.c index cafc38ea..087ed185 100644 --- a/tools/sm9verify.c +++ b/tools/sm9verify.c @@ -27,11 +27,11 @@ static const char *options = "\n" "Examples\n" "\n" -" $ gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem -pubout sm9sign_mpk.pem\n" -" $ gmssl sm9keygen -alg sm9sign -in sm9sign_msk.pem -inpass P@ssw0rd -id Alice -out sm9sign.pem -outpass 123456\n" +" gmssl sm9setup -alg sm9sign -pass P@ssw0rd -out sm9sign_msk.pem -pubout sm9sign_mpk.pem\n" +" gmssl sm9keygen -alg sm9sign -in sm9sign_msk.pem -inpass P@ssw0rd -id Alice -out sm9sign.pem -outpass 123456\n" "\n" -" $ echo -n 'message to be signed' | gmssl sm9sign -key sm9sign.pem -pass 123456 -out sm9.sig\n" -" $ echo -n 'message to be signed' | gmssl sm9verify -pubmaster sm9sign_mpk.pem -id Alice -sig sm9.sig\n" +" echo -n 'message to be signed' | gmssl sm9sign -key sm9sign.pem -pass 123456 -out sm9.sig\n" +" echo -n 'message to be signed' | gmssl sm9verify -pubmaster sm9sign_mpk.pem -id Alice -sig sm9.sig\n" "\n"; int sm9verify_main(int argc, char **argv) diff --git a/tools/tlcp_help.h b/tools/tlcp_help.h index 17ffed6f..26ab8f10 100644 --- a/tools/tlcp_help.h +++ b/tools/tlcp_help.h @@ -9,10 +9,10 @@ "\n" "Supported cipher suites:\n" -" TLS_ECC_SM4_CBC_SM3\n" -" TLS_ECC_SM4_GCM_SM3\n" -" TLS_ECDHE_SM4_CBC_SM3\n" -" TLS_ECDHE_SM4_GCM_SM3\n" +" TLS_ECC_SM4_CBC_SM3\n" +" TLS_ECC_SM4_GCM_SM3\n" +" TLS_ECDHE_SM4_CBC_SM3\n" +" TLS_ECDHE_SM4_GCM_SM3\n" "\n" "\n" "Examples\n" diff --git a/tools/tls12_help.h b/tools/tls12_help.h index dd660680..5d58a579 100644 --- a/tools/tls12_help.h +++ b/tools/tls12_help.h @@ -9,13 +9,13 @@ "\n" "Supported cipher suites:\n" -" TLS_ECDHE_SM4_CBC_SM3\n" -" TLS_ECDHE_SM4_GCM_SM3\n" +" TLS_ECDHE_SM4_CBC_SM3\n" +" TLS_ECDHE_SM4_GCM_SM3\n" #if defined(ENABLE_AES) && defined(ENABLE_SHA2) && defined(ENABLE_SECP256R1) -" TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256\n" -" TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256\n" +" TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256\n" +" TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256\n" #ifdef ENABLE_AES_CCM -" TLS_ECDHE_ECDSA_WITH_AES_128_CCM\n" +" TLS_ECDHE_ECDSA_WITH_AES_128_CCM\n" #endif #endif "\n" diff --git a/tools/tls13_help.h b/tools/tls13_help.h index fd46d6de..18f3c1b2 100644 --- a/tools/tls13_help.h +++ b/tools/tls13_help.h @@ -1,13 +1,13 @@ "\n" "Supported cipher suites:\n" -" TLS_SM4_GCM_SM3\n" +" TLS_SM4_GCM_SM3\n" #ifdef ENABLE_SM4_CCM -" TLS_SM4_CCM_SM3\n" +" TLS_SM4_CCM_SM3\n" #endif #if defined(ENABLE_AES) && defined(ENABLE_SHA2) -" TLS_AES_128_GCM_SHA256\n" +" TLS_AES_128_GCM_SHA256\n" #ifdef ENABLE_AES_CCM -" TLS_AES_128_CCM_SHA256\n" +" TLS_AES_128_CCM_SHA256\n" #endif #endif "\n"