CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-27 11:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nsock: Fix compilation error with OPENSSL_NO_DTLS

Browse source 
Commit ba26cc78f2 ("Replace check for DTLS_client_method with
OPENSSL_NO_DTLS") made DTLS support depend on the openssl define
directly but leave some use of dtlsctx not guarded by ifdef.

Fix this by adding to the remaining use of dtlsctx ifdef guard and
return fatal print for running function with unsupported OpenSSL
feature.

Fixes: ba26cc78f2 ("Replace check for DTLS_client_method with OPENSSL_NO_DTLS")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-04-28 12:00:02 +02:00
parent bf2acde232
commit 707812db69
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nsock/src/nsock_connect.c
View file

@ -472,8 +472,12 @@ nsock_event_id nsock_connect_ssl(nsock_pool nsp, nsock_iod nsiod, nsock_ev_handl
if (proto == IPPROTO_UDP)
{
#ifndef OPENSSL_NO_DTLS
if (!ms->dtlsctx)
nsock_pool_dtls_init(ms, 0);
#else
fatal("%s called with no OpenSSL DTLS support", __func__);
#endif
}
else
{

9
nsock/src/nsock_core.c
View file

@ -364,7 +364,14 @@ void handle_connect_result(struct npool *ms, struct nevent *nse, enum nse_status
if (nse->type == NSE_TYPE_CONNECT_SSL &&
nse->status == NSE_STATUS_SUCCESS) {
#if HAVE_OPENSSL
sslctx = iod->lastproto == IPPROTO_UDP ? ms->dtlsctx : ms->sslctx;
if (iod->lastproto == IPPROTO_UDP)
#ifndef OPENSSL_NO_DTLS
sslctx = ms->dtlsctx;
#else
fatal("%s called with no OpenSSL DTLS support", __func__);
#endif
else
sslctx = ms->sslctx;
assert(sslctx != NULL);
/* Reuse iod->ssl if present. If set, this is the second try at connection
without the SSL_OP_NO_SSLv2 option set. */

2
nsock/src/nsock_pool.c
View file

@ -178,7 +178,9 @@ nsock_pool nsock_pool_new(void *userdata) {
#if HAVE_OPENSSL
nsp->sslctx = NULL;
#ifndef OPENSSL_NO_DTLS
nsp->dtlsctx = NULL;
#endif
#endif
nsp->px_chain = NULL;