Move print_buf into mbedtls_test_print_buf helper function in sample programs
Reduce code duplication and fix missing-prototype error for print_buf
Signed-off-by: Michael Schuster <michael@schuster.ms>
diff --git a/programs/cipher/cipher_aead_demo.c b/programs/cipher/cipher_aead_demo.c
index 853ec20..60a5ea2 100644
--- a/programs/cipher/cipher_aead_demo.c
+++ b/programs/cipher/cipher_aead_demo.c
@@ -35,6 +35,8 @@
#include "mbedtls/cipher.h"
+#include <test/helpers.h>
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -78,16 +80,6 @@
* 32-byte is enough to all the key size supported by this program. */
const unsigned char key_bytes[32] = { 0x2a };
-/* Print the contents of a buffer in hex */
-void print_buf(const char *title, unsigned char *buf, size_t len)
-{
- printf("%s:", title);
- for (size_t i = 0; i < len; i++) {
- printf(" %02x", buf[i]);
- }
- printf("\n");
-}
-
/* Run an Mbed TLS function and bail out if it fails.
* A string description of the error code can be recovered with:
* programs/util/strerror <value> */
@@ -198,7 +190,7 @@
p += tag_len;
olen = p - out;
- print_buf("out", out, olen);
+ mbedtls_test_print_buf("out", out, olen);
exit:
return ret;
diff --git a/programs/hash/md_hmac_demo.c b/programs/hash/md_hmac_demo.c
index 581816a..a0127ed 100644
--- a/programs/hash/md_hmac_demo.c
+++ b/programs/hash/md_hmac_demo.c
@@ -32,6 +32,8 @@
#include "mbedtls/platform_util.h" // for mbedtls_platform_zeroize
+#include <test/helpers.h>
+
#include <stdlib.h>
#include <stdio.h>
@@ -56,16 +58,6 @@
* This example program uses SHA-256, so a 32-byte key makes sense. */
const unsigned char key_bytes[32] = { 0 };
-/* Print the contents of a buffer in hex */
-void print_buf(const char *title, unsigned char *buf, size_t len)
-{
- printf("%s:", title);
- for (size_t i = 0; i < len; i++) {
- printf(" %02x", buf[i]);
- }
- printf("\n");
-}
-
/* Run an Mbed TLS function and bail out if it fails.
* A string description of the error code can be recovered with:
* programs/util/strerror <value> */
@@ -107,14 +99,14 @@
CHK(mbedtls_md_hmac_update(&ctx, msg1_part1, sizeof(msg1_part1)));
CHK(mbedtls_md_hmac_update(&ctx, msg1_part2, sizeof(msg1_part2)));
CHK(mbedtls_md_hmac_finish(&ctx, out));
- print_buf("msg1", out, mbedtls_md_get_size(info));
+ mbedtls_test_print_buf("msg1", out, mbedtls_md_get_size(info));
/* compute HMAC(key, msg2_part1 | msg2_part2) */
CHK(mbedtls_md_hmac_reset(&ctx)); // prepare for new operation
CHK(mbedtls_md_hmac_update(&ctx, msg2_part1, sizeof(msg2_part1)));
CHK(mbedtls_md_hmac_update(&ctx, msg2_part2, sizeof(msg2_part2)));
CHK(mbedtls_md_hmac_finish(&ctx, out));
- print_buf("msg2", out, mbedtls_md_get_size(info));
+ mbedtls_test_print_buf("msg2", out, mbedtls_md_get_size(info));
exit:
mbedtls_md_free(&ctx);
diff --git a/programs/psa/aead_demo.c b/programs/psa/aead_demo.c
index 619166d..b300e36 100644
--- a/programs/psa/aead_demo.c
+++ b/programs/psa/aead_demo.c
@@ -36,6 +36,8 @@
#include "psa/crypto.h"
+#include <test/helpers.h>
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -81,16 +83,6 @@
* 32-byte is enough to all the key size supported by this program. */
const unsigned char key_bytes[32] = { 0x2a };
-/* Print the contents of a buffer in hex */
-void print_buf(const char *title, uint8_t *buf, size_t len)
-{
- printf("%s:", title);
- for (size_t i = 0; i < len; i++) {
- printf(" %02x", buf[i]);
- }
- printf("\n");
-}
-
/* Run a PSA function and bail out if it fails.
* The symbolic name of the error code can be recovered using:
* programs/psa/psa_constant_name status <value> */
@@ -216,7 +208,7 @@
p += olen_tag;
olen = p - out;
- print_buf("out", out, olen);
+ mbedtls_test_print_buf("out", out, olen);
exit:
psa_aead_abort(&op); // required on errors, harmless on success
diff --git a/programs/psa/hmac_demo.c b/programs/psa/hmac_demo.c
index 2055054..6ed8298 100644
--- a/programs/psa/hmac_demo.c
+++ b/programs/psa/hmac_demo.c
@@ -32,6 +32,8 @@
#include "mbedtls/platform_util.h" // for mbedtls_platform_zeroize
+#include <test/helpers.h>
+
#include <stdlib.h>
#include <stdio.h>
@@ -58,16 +60,6 @@
* This example program uses SHA-256, so a 32-byte key makes sense. */
const unsigned char key_bytes[32] = { 0 };
-/* Print the contents of a buffer in hex */
-void print_buf(const char *title, uint8_t *buf, size_t len)
-{
- printf("%s:", title);
- for (size_t i = 0; i < len; i++) {
- printf(" %02x", buf[i]);
- }
- printf("\n");
-}
-
/* Run a PSA function and bail out if it fails.
* The symbolic name of the error code can be recovered using:
* programs/psa/psa_constant_name status <value> */
@@ -122,14 +114,14 @@
PSA_CHECK(psa_mac_update(&op, msg1_part1, sizeof(msg1_part1)));
PSA_CHECK(psa_mac_update(&op, msg1_part2, sizeof(msg1_part2)));
PSA_CHECK(psa_mac_sign_finish(&op, out, sizeof(out), &out_len));
- print_buf("msg1", out, out_len);
+ mbedtls_test_print_buf("msg1", out, out_len);
/* compute HMAC(key, msg2_part1 | msg2_part2) */
PSA_CHECK(psa_mac_sign_setup(&op, key, alg));
PSA_CHECK(psa_mac_update(&op, msg2_part1, sizeof(msg2_part1)));
PSA_CHECK(psa_mac_update(&op, msg2_part2, sizeof(msg2_part2)));
PSA_CHECK(psa_mac_sign_finish(&op, out, sizeof(out), &out_len));
- print_buf("msg2", out, out_len);
+ mbedtls_test_print_buf("msg2", out, out_len);
exit:
psa_mac_abort(&op); // needed on error, harmless on success