Merge 7033501267 into 5e82e4f305

Merge pull request #2755 from signalwire/eslleak
[esl] 1227669 Resource leak
2025-01-31 16:48:31 +00:00 · 2025-01-31 18:36:53 +03:00 · 2025-01-31 18:09:18 +03:00 · 2022-05-14 14:10:54 +02:00
2 changed files with 6 additions and 3 deletions
--- a/libs/esl/src/esl.c
+++ b/libs/esl/src/esl.c
@ -990,6 +990,8 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
 	}

 	memcpy(&handle->sockaddr, result->ai_addr, result->ai_addrlen);	
+	freeaddrinfo(result);
+
 	switch(handle->sockaddr.ss_family) {
 		case AF_INET:
 			sockaddr_in = (struct sockaddr_in*)&(handle->sockaddr);
@ -1005,7 +1007,6 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
 			strncpy(handle->err, "Host resolves to unsupported address family", sizeof(handle->err));
 			goto fail;
 	}
-	freeaddrinfo(result);
 	
 	handle->sock = socket(handle->sockaddr.ss_family, SOCK_STREAM, IPPROTO_TCP);
 	
--- a/libs/srtp/crypto/hash/hmac_ossl.c
+++ b/libs/srtp/crypto/hash/hmac_ossl.c
@ -80,7 +80,8 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a,

 /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
   using HMAC_CTX_new.  But this function doesn't exist in OpenSSL 1.0.x. */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
    {
        /* allocate memory for auth and HMAC_CTX structures */
        uint8_t *pointer;
@ -126,7 +127,8 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a)

    hmac_ctx = (HMAC_CTX *)a->state;

-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
    HMAC_CTX_cleanup(hmac_ctx);

    /* zeroize entire state*/
Author	SHA1	Message	Date
Fabrice Fontaine	b662a4ec38	Merge `7033501267` into `5e82e4f305`	2025-01-31 16:48:31 +00:00
Andrey Volk	5e82e4f305	Merge pull request #2755 from signalwire/eslleak [esl] 1227669 Resource leak	2025-01-31 18:36:53 +03:00
Andrey Volk	d895fdff60	[esl] 1227669 Resource leak	2025-01-31 18:09:18 +03:00
Fabrice Fontaine	7033501267	libs/srtp/crypto/hash/hmac_ossl.c: fix build with libressl >= 3.5.0 Fix the following build failure with libressl >= 3.5.0: crypto/hash/hmac_ossl.c: In function 'srtp_hmac_alloc': crypto/hash/hmac_ossl.c:88:55: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} 88 \| pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + \| ^~~~~~~~ crypto/hash/hmac_ossl.c:97:9: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] 97 \| HMAC_CTX_init(new_hmac_ctx); \| ^~~~~~~~~~~~~ \| HMAC_CTX_new crypto/hash/hmac_ossl.c: In function 'srtp_hmac_dealloc': crypto/hash/hmac_ossl.c:130:5: warning: implicit declaration of function 'HMAC_CTX_cleanup' [-Wimplicit-function-declaration] 130 \| HMAC_CTX_cleanup(hmac_ctx); \| ^~~~~~~~~~~~~~~~ crypto/hash/hmac_ossl.c:133:40: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} 133 \| octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); \| ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e696ead9ffffa5bb80928d75607bfbb9b263d3c6 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>	2022-05-14 14:10:54 +02:00