From 36007567232f05b2dc96ad31bc6f808660dd2567 Mon Sep 17 00:00:00 2001
From: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
Date: Thu, 31 Mar 2022 12:44:19 +0200
Subject: [PATCH] fix linter warnings

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
---
 src/conn.c        |  6 +++---
 tests/test_sasl.c | 17 -----------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/conn.c b/src/conn.c
index e6549a3..0a88a1f 100644
--- a/src/conn.c
+++ b/src/conn.c
@@ -1206,9 +1206,9 @@ int xmpp_conn_set_flags(xmpp_conn_t *conn, long flags)
                       "for disconnected connection");
         return XMPP_EINVOP;
     }
-    if (flags & XMPP_CONN_FLAG_DISABLE_TLS &&
-        flags & (XMPP_CONN_FLAG_MANDATORY_TLS | XMPP_CONN_FLAG_LEGACY_SSL |
-                 XMPP_CONN_FLAG_TRUST_TLS)) {
+    if ((flags & XMPP_CONN_FLAG_DISABLE_TLS) &&
+        (flags & (XMPP_CONN_FLAG_MANDATORY_TLS | XMPP_CONN_FLAG_LEGACY_SSL |
+                  XMPP_CONN_FLAG_TRUST_TLS))) {
         strophe_error(conn->ctx, "conn", "Flags 0x%04lx conflict", flags);
         return XMPP_EINVOP;
     }
diff --git a/tests/test_sasl.c b/tests/test_sasl.c
index b7cb484..6fc131a 100644
--- a/tests/test_sasl.c
+++ b/tests/test_sasl.c
@@ -29,23 +29,6 @@ static const char response_md5[] =
     "MDAwMSxxb3A9YXV0aCxkaWdlc3QtdXJpPSJ4bXBwL3NvbWVyZWFsbSIscmVz"
     "cG9uc2U9NGVhNmU4N2JjMDkzMzUwNzQzZGIyOGQ3MDIwOGNhZmIsY2hhcnNl"
     "dD11dGYtOA==";
-static const char response_md5_rfc[] =
-    "dXNlcm5hbWU9InNvbWVub2RlIixyZWFsbT0ic29tZXJlYWxtIixub25jZT0i"
-    "T0E2TUc5dEVRR20yaGgiLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLG5jPTAw"
-    "MDAwMDAxLHFvcD1hdXRoLGRpZ2VzdC11cmk9InhtcHAvZXhhbXBsZS5jb20i"
-    "LHJlc3BvbnNlPWQzODhkYWQ5MGQ0YmJkNzYwYTE1MjMyMWYyMTQzYWY3LGNo"
-    "YXJzZXQ9dXRmLTgK";
-
-static const char challenge_md5_2[] =
-    "cmVhbG09ImVsd29vZC5pbm5vc29mdC5jb20iLG5vbmNlPSJPQTZNRzl0"
-    "RVFHbTJoaCIscW9wPSJhdXRoIixhbGdvcml0aG09bWQ1LXNlc3MsY2hh"
-    "cnNldD11dGYtOA==";
-static const char response_md5_2[] =
-    "Y2hhcnNldD11dGYtOCx1c2VybmFtZT0iY2hyaXMiLHJlYWxtPSJlbHdvb2"
-    "QuaW5ub3NvZnQuY29tIixub25jZT0iT0E2TUc5dEVRR20yaGgiLG5jPTAw"
-    "MDAwMDAxLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLGRpZ2VzdC11cmk9Im"
-    "ltYXAvZWx3b29kLmlubm9zb2Z0LmNvbSIscmVzcG9uc2U9ZDM4OGRhZDkw"
-    "ZDRiYmQ3NjBhMTUyMzIxZjIxNDNhZjcscW9wPWF1dGg=";
 
 int test_plain(xmpp_ctx_t *ctx)
 {