mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-27 06:35:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6998 from aditya-deshpande-arm/fix-example-programs-usage

Browse Source 
Fix incorrect dispatch to USAGE in example programs, which causes uninitialized memory to be used
This commit is contained in:
Dave Rodgman 2023-02-06 09:53:50 +00:00 committed by GitHub
commit 94c9c96c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.d/fix-example-programs-no-args.txt Normal file
View File

@ -0,0 +1,4 @@
Bugfix
* Fix behavior of certain sample programs which could, when run with no
arguments, access uninitialized memory in some cases. Fixes #6700 (which
was found by TrustInSoft Analyzer during REDOCS'22) and #1120.

2
programs/hash/generic_sum.c
View File

@ -169,7 +169,7 @@ int main(int argc, char *argv[])
mbedtls_md_init(&md_ctx);
if (argc == 1) {
if (argc < 2) {
const int *list;
mbedtls_printf("print mode: generic_sum <mbedtls_md> <file> <file> ...\n");

2
programs/pkey/dh_genprime.c
View File

@ -71,7 +71,7 @@ int main(int argc, char **argv)
mbedtls_ctr_drbg_init(&ctr_drbg);
mbedtls_entropy_init(&entropy);
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;

2
programs/pkey/gen_key.c
View File

@ -200,7 +200,7 @@ int main(int argc, char *argv[])
mbedtls_ctr_drbg_init(&ctr_drbg);
memset(buf, 0, sizeof(buf));
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
#if defined(MBEDTLS_ECP_C)

2
programs/pkey/key_app.c
View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[])
mbedtls_mpi_init(&D); mbedtls_mpi_init(&E); mbedtls_mpi_init(&DP);
mbedtls_mpi_init(&DQ); mbedtls_mpi_init(&QP);
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto cleanup;

2
programs/pkey/key_app_writer.c
View File

@ -220,7 +220,7 @@ int main(int argc, char *argv[])
mbedtls_mpi_init(&D); mbedtls_mpi_init(&E); mbedtls_mpi_init(&DP);
mbedtls_mpi_init(&DQ); mbedtls_mpi_init(&QP);
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;

2
programs/ssl/ssl_client2.c
View File

@ -867,7 +867,7 @@ int main(int argc, char *argv[])
mbedtls_test_enable_insecure_external_rng();
#endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
if (argc == 0) {
if (argc < 2) {
usage:
if (ret == 0) {
ret = 1;

2
programs/ssl/ssl_mail_client.c
View File

@ -370,7 +370,7 @@ int main(int argc, char *argv[])
mbedtls_pk_init(&pkey);
mbedtls_ctr_drbg_init(&ctr_drbg);
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);

2
programs/ssl/ssl_server2.c
View File

@ -1633,7 +1633,7 @@ int main(int argc, char *argv[])
signal(SIGINT, term_handler);
#endif
if (argc == 0) {
if (argc < 2) {
usage:
if (ret == 0) {
ret = 1;

2
programs/test/query_compile_time_config.c
View File

@ -40,7 +40,7 @@ int main(int argc, char *argv[])
{
int i;
if (argc == 1 || strcmp(argv[1], "-h") == 0) {
if (argc < 2 || strcmp(argv[1], "-h") == 0) {
mbedtls_printf(USAGE, argv[0]);
return MBEDTLS_EXIT_FAILURE;
}

2
programs/util/pem2der.c
View File

@ -189,7 +189,7 @@ int main(int argc, char *argv[])
memset(buf, 0, sizeof(buf));
memset(der_buffer, 0, sizeof(der_buffer));
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;

2
programs/x509/cert_app.c
View File

@ -161,7 +161,7 @@ int main(int argc, char *argv[])
memset(&cacrl, 0, sizeof(mbedtls_x509_crl));
#endif
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;

2
programs/x509/cert_req.c
View File

@ -159,7 +159,7 @@ int main(int argc, char *argv[])
mbedtls_ctr_drbg_init(&ctr_drbg);
memset(buf, 0, sizeof(buf));
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;

2
programs/x509/cert_write.c
View File

@ -329,7 +329,7 @@ int main(int argc, char *argv[])
memset(buf, 0, sizeof(buf));
memset(serial, 0, sizeof(serial));
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;

2
programs/x509/crl_app.c
View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
*/
mbedtls_x509_crl_init(&crl);
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;

2
programs/x509/req_app.c
View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
*/
mbedtls_x509_csr_init(&csr);
if (argc == 0) {
if (argc < 2) {
usage:
mbedtls_printf(USAGE);
goto exit;