From 84815006a0a00ab00f0371c43685f09f6b5df8d8 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 25 Apr 2014 21:40:27 +0200 Subject: [PATCH] BUILD: ssl: avoid a warning about conn not used with OpenSSL < 1.0.1 Building with a version of openssl without heartbeat gives this since latest 29f037d ("MEDIUM: ssl: explicitly log failed handshakes after a heartbeat") : src/ssl_sock.c: In function 'ssl_sock_msgcbk': src/ssl_sock.c:188: warning: unused variable 'conn' Simply declare conn inside the ifdef. No backport is needed. --- src/ssl_sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 9381f11d0..9bf447387 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -185,12 +185,11 @@ int ssl_sock_bind_verifycbk(int ok, X509_STORE_CTX *x_store) /* Callback is called for ssl protocol analyse */ void ssl_sock_msgcbk(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg) { - struct connection *conn = (struct connection *)SSL_get_app_data(ssl); - #ifdef TLS1_RT_HEARTBEAT /* test heartbeat received (write_p is set to 0 for a received record) */ if ((content_type == TLS1_RT_HEARTBEAT) && (write_p == 0)) { + struct connection *conn = (struct connection *)SSL_get_app_data(ssl); const unsigned char *p = buf; unsigned int payload;