From 7706b85e0cffa941028318d81b3a67dc724abbf9 Mon Sep 17 00:00:00 2001 From: Lukas Tribus Date: Mon, 26 Nov 2018 22:57:17 +0100 Subject: [PATCH] MINOR: ssl: free ctx when libssl doesn't support NPN The previous fix da95fd90 ("BUILD/MINOR: ssl: fix build with non-alpn/ non-npn libssl") does fix the build in old OpenSSL release, but I overlooked that the ctx is only freed when NPN is supported. Fix this by moving the #endif to the proper place (this was broken in c7566001 ("MINOR: server: Add "alpn" and "npn" keywords")). --- src/ssl_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 86d4f227a..a73fb2dd9 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -4846,9 +4846,9 @@ void ssl_sock_free_srv_ctx(struct server *srv) #ifdef OPENSSL_NPN_NEGOTIATED if (srv->ssl_ctx.npn_str) free(srv->ssl_ctx.npn_str); +#endif if (srv->ssl_ctx.ctx) SSL_CTX_free(srv->ssl_ctx.ctx); -#endif } /* Walks down the two trees in bind_conf and frees all the certs. The pointer may