From 5282603ad551420349ffd330a5fed6154796cb7b Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Thu, 1 May 2025 16:28:15 +0200 Subject: Make code compile for both mbedtls 2 and 3 --- receiver.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'receiver.cpp') diff --git a/receiver.cpp b/receiver.cpp index 01f7505..0e9b305 100644 --- a/receiver.cpp +++ b/receiver.cpp @@ -17,6 +17,10 @@ #include "mbedtls/ctr_drbg.h" #include "mbedtls/gcm.h" +#if MBEDTLS_VERSION_MAJOR >= 3 +#define MBEDTLS_DRBG_BOILERPLATE , mbedtls_ctr_drbg_random, &ctr_drbg +#endif + #include #include #include @@ -297,10 +301,10 @@ int main(int argc, char **argv) { mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, pp, sizeof(pp)); if (privkey_file) { - if ((ret = mbedtls_pk_parse_keyfile(&pk, privkey_file, NULL, mbedtls_ctr_drbg_random, &ctr_drbg) ) != 0 ) + if ((ret = mbedtls_pk_parse_keyfile(&pk, privkey_file, NULL MBEDTLS_DRBG_BOILERPLATE ) ) != 0 ) errx(-1, "Fatal: mbedtls_pk_parse_keyfile returned -0x%04x\n", -ret ); } else { - if ((ret = mbedtls_pk_parse_key(&pk, privkey, sizeof(privkey), NULL, 0, mbedtls_ctr_drbg_random, &ctr_drbg) ) != 0 ) + if ((ret = mbedtls_pk_parse_key(&pk, privkey, sizeof(privkey), NULL, 0 MBEDTLS_DRBG_BOILERPLATE ) ) != 0 ) errx(-1, "Fatal: mbedtls_pk_parse_key returned -0x%04x\n", -ret ); } -- cgit v1.2.3