From 133a4bbe527dc8067238e426a43fc90e44972e7d Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Fri, 20 May 2022 02:01:53 +0200 Subject: Make mbedtls version dispatch more readable --- vchat-tls.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/vchat-tls.c b/vchat-tls.c index c4b014a..dbfd927 100755 --- a/vchat-tls.c +++ b/vchat-tls.c @@ -481,12 +481,11 @@ int vc_tls_connect( int serverfd, vc_x509store_t *vc_store ) char *password = NULL; char password_buf[1024]; while (1) { -#if MBEDTLS_SSL_MAJOR_VERSION_3 < 3 - ret = mbedtls_pk_parse_keyfile(&s->_key, vc_store->keyfile, password); -#else - // ret = fprintf(stderr, "ERROR: %d\n", mbedtls_pk_parse_keyfile(&s->_key, vc_store->keyfile, password, mbedtls_ctr_drbg_random, &s->_ctr_drbg)); - ret = mbedtls_pk_parse_keyfile(&s->_key, vc_store->keyfile, password, mbedtls_ctr_drbg_random, &s->_ctr_drbg); + ret = mbedtls_pk_parse_keyfile(&s->_key, vc_store->keyfile, password +#if MBEDTLS_SSL_MAJOR_VERSION_3 >= 3 + , mbedtls_ctr_drbg_random, &s->_ctr_drbg #endif + ); if (!ret) break; if (ret != MBEDTLS_ERR_PK_PASSWORD_REQUIRED && ret != MBEDTLS_ERR_PK_PASSWORD_MISMATCH) { -- cgit v1.2.3