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

programs_dh_client/server: Updated to query digest size using mbedtls_md_info_from_type().

Browse Source 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
This commit is contained in:
Minos Galanakis 2024-01-15 17:03:58 +00:00
parent 6e92df12c2
commit 7c8448842d
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/pkey/dh_client.c
View File

@ -29,7 +29,6 @@
#define SERVER_NAME "localhost" #define SERVER_NAME "localhost"
#define SERVER_PORT "11999" #define SERVER_PORT "11999"
#define MBEDTLS_MD_CAN_SHA256_MAX_SIZE 32
#if !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_DHM_C) || \ #if !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_DHM_C) || \
!defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NET_C) || \ !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NET_C) || \
@ -60,12 +59,12 @@ int main(void)
int ret = 1; int ret = 1;
int exit_code = MBEDTLS_EXIT_FAILURE; int exit_code = MBEDTLS_EXIT_FAILURE;
size_t n, buflen; size_t n, buflen, mdlen;
mbedtls_net_context server_fd; mbedtls_net_context server_fd;
unsigned char *p, *end; unsigned char *p, *end;
unsigned char buf[2048]; unsigned char buf[2048];
unsigned char hash[MBEDTLS_MD_CAN_SHA256_MAX_SIZE]; unsigned char hash[MBEDTLS_MD_MAX_SIZE];
mbedtls_mpi N, E; mbedtls_mpi N, E;
const char *pers = "dh_client"; const char *pers = "dh_client";
@ -187,13 +186,19 @@ int main(void)
goto exit; goto exit;
} }
mdlen = mbedtls_md_get_size(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256));
if (mdlen == 0) {
mbedtls_printf(" failed\n ! Invalid digest type\n\n");
goto exit;
}
if ((ret = mbedtls_sha256(buf, (int) (p - 2 - buf), hash, 0)) != 0) { if ((ret = mbedtls_sha256(buf, (int) (p - 2 - buf), hash, 0)) != 0) {
mbedtls_printf(" failed\n ! mbedtls_sha1 returned %d\n\n", ret); mbedtls_printf(" failed\n ! mbedtls_sha1 returned %d\n\n", ret);
goto exit; goto exit;
} }
if ((ret = mbedtls_rsa_pkcs1_verify(&rsa, MBEDTLS_MD_SHA256, if ((ret = mbedtls_rsa_pkcs1_verify(&rsa, MBEDTLS_MD_SHA256,
MBEDTLS_MD_CAN_SHA256_MAX_SIZE, hash, p)) != 0) { mdlen, hash, p)) != 0) {
mbedtls_printf(" failed\n ! mbedtls_rsa_pkcs1_verify returned %d\n\n", ret); mbedtls_printf(" failed\n ! mbedtls_rsa_pkcs1_verify returned %d\n\n", ret);
goto exit; goto exit;
} }

14
programs/pkey/dh_server.c
View File

@ -29,7 +29,6 @@
#define SERVER_PORT "11999" #define SERVER_PORT "11999"
#define PLAINTEXT "==Hello there!==" #define PLAINTEXT "==Hello there!=="
#define MBEDTLS_MD_CAN_SHA256_MAX_SIZE 32
#if !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_DHM_C) || \ #if !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_DHM_C) || \
!defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NET_C) || \ !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NET_C) || \
@ -52,11 +51,11 @@ int main(void)
int ret = 1; int ret = 1;
int exit_code = MBEDTLS_EXIT_FAILURE; int exit_code = MBEDTLS_EXIT_FAILURE;
size_t n, buflen; size_t n, buflen, mdlen;
mbedtls_net_context listen_fd, client_fd; mbedtls_net_context listen_fd, client_fd;
unsigned char buf[2048]; unsigned char buf[2048];
unsigned char hash[MBEDTLS_MD_CAN_SHA256_MAX_SIZE]; unsigned char hash[MBEDTLS_MD_MAX_SIZE];
unsigned char buf2[2]; unsigned char buf2[2];
const char *pers = "dh_server"; const char *pers = "dh_server";
@ -185,6 +184,13 @@ int main(void)
/* /*
* 5. Sign the parameters and send them * 5. Sign the parameters and send them
*/ */
mdlen = mbedtls_md_get_size(mbedtls_md_info_from_type(MBEDTLS_MD_SHA256));
if (mdlen == 0) {
mbedtls_printf(" failed\n ! Invalid digest type\n\n");
goto exit;
}
if ((ret = mbedtls_sha256(buf, n, hash, 0)) != 0) { if ((ret = mbedtls_sha256(buf, n, hash, 0)) != 0) {
mbedtls_printf(" failed\n ! mbedtls_sha1 returned %d\n\n", ret); mbedtls_printf(" failed\n ! mbedtls_sha1 returned %d\n\n", ret);
goto exit; goto exit;
@ -195,7 +201,7 @@ int main(void)
buf[n + 1] = (unsigned char) (rsa_key_len); buf[n + 1] = (unsigned char) (rsa_key_len);
if ((ret = mbedtls_rsa_pkcs1_sign(&rsa, mbedtls_ctr_drbg_random, &ctr_drbg, if ((ret = mbedtls_rsa_pkcs1_sign(&rsa, mbedtls_ctr_drbg_random, &ctr_drbg,
MBEDTLS_MD_SHA256, MBEDTLS_MD_CAN_SHA256_MAX_SIZE, MBEDTLS_MD_SHA256, mdlen,
hash, buf + n + 2)) != 0) { hash, buf + n + 2)) != 0) {
mbedtls_printf(" failed\n ! mbedtls_rsa_pkcs1_sign returned %d\n\n", ret); mbedtls_printf(" failed\n ! mbedtls_rsa_pkcs1_sign returned %d\n\n", ret);
goto exit; goto exit;