From: Gert Doering Date: Sat, 10 Oct 2020 10:14:35 +0200 Message-Id: <20201010081435.2154-1-gert@...1296...> In-Reply-To: <009203331.11779-1-gert@...1296...> References: <009203331.11779-1-gert@...1296...> MIME-Version: 1.0 Subject: [Openvpn-devel] [PATCH v2] Fix compilation on pre-EKM mbedTLS libraries. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net commit f0734e49956217 simplified key_state_export_keying_material(), changing the function prototype. For older mbedTLS versions, there is an "always fail" dummy function which was overlooked in that change. Fix prototype. v2: also adjust function return (NULL -> false) Signed-off-by: Gert Doering --- src/openvpn/ssl_mbedtls.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index bb5633b7..11fbeae4 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -252,14 +252,13 @@ key_state_export_keying_material(struct tls_session *session, } } #else -unsigned char* +bool key_state_export_keying_material(struct tls_session *session, const char* label, size_t label_size, - size_t ekm_size, - struct gc_arena *gc) + void *ekm, size_t ekm_size) { /* Dummy function to avoid ifdefs in the common code */ - return NULL; + return false; } #endif /* HAVE_EXPORT_KEYING_MATERIAL */ -- 2.22.0