OpenSSL: Avoid never-used analyzer warning

Use #ifdef blocks more cleanly to avoid unnecessary never-used
assignment of a variable.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index e60682869bdf9ed2b123585e3c925bbcf8ef56eb..d4c6b8b63adb7c93c583fbbbcd86cfb6aec1766a 100644 (file)
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -785,12 +785,13 @@ void * tls_init(const struct tls_config *conf)
                PKCS12_PBE_add();
 #endif  /* PKCS12_FUNCS */
        } else {
-               context = tls_global;
 #ifdef OPENSSL_SUPPORTS_CTX_APP_DATA
                /* Newer OpenSSL can store app-data per-SSL */
                context = tls_context_new(conf);
                if (context == NULL)
                        return NULL;
+#else /* OPENSSL_SUPPORTS_CTX_APP_DATA */
+               context = tls_global;
 #endif /* OPENSSL_SUPPORTS_CTX_APP_DATA */
        }
        tls_openssl_ref_count++;
@@ -988,9 +989,10 @@ struct tls_connection * tls_connection_init(void *ssl_ctx)
        SSL_CTX *ssl = ssl_ctx;
        struct tls_connection *conn;
        long options;
-       struct tls_context *context = tls_global;
 #ifdef OPENSSL_SUPPORTS_CTX_APP_DATA
-       context = SSL_CTX_get_app_data(ssl);
+       struct tls_context *context = SSL_CTX_get_app_data(ssl);
+#else /* OPENSSL_SUPPORTS_CTX_APP_DATA */
+       struct tls_context *context = tls_global;
 #endif /* OPENSSL_SUPPORTS_CTX_APP_DATA */
 
        conn = os_zalloc(sizeof(*conn));