From e93c2b4328d67d08a3808b3248c2840afeb0da2b Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 17 Oct 2018 19:58:33 +0000
Subject: [PATCH] Don't run openssl-requiring tests if openssl isn't present.

---
 nselib/sasl.lua | 73 +++++++++++++++++++++++++------------------------
 nselib/vnc.lua  | 57 ++++++++++++++++++++------------------
 2 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/nselib/sasl.lua b/nselib/sasl.lua
index 7cd0e5aba..910e1f3f0 100644
--- a/nselib/sasl.lua
+++ b/nselib/sasl.lua
@@ -465,43 +465,46 @@ end
 
 test_suite = unittest.TestSuite:new()
 
-local _ = "ignored"
+-- Crypto tests require OpenSSL
+if HAVE_SSL then
+  local _ = "ignored"
 
-local object = DigestMD5:new('Digest realm="test", domain="/HTTP/Digest",\z
-  nonce="c8563a5b367e66b3693fbb07a53a30ba"',
-  _, _, _, _)
-test_suite:add_test(unittest.keys_equal(
-    object.challnvs,
-    {
-      nonce='c8563a5b367e66b3693fbb07a53a30ba',
-      realm='test',
-      domain='/HTTP/Digest',
-    }
-  ))
+  local object = DigestMD5:new('Digest realm="test", domain="/HTTP/Digest",\z
+    nonce="c8563a5b367e66b3693fbb07a53a30ba"',
+    _, _, _, _)
+  test_suite:add_test(unittest.keys_equal(
+      object.challnvs,
+      {
+        nonce='c8563a5b367e66b3693fbb07a53a30ba',
+        realm='test',
+        domain='/HTTP/Digest',
+      }
+    ))
 
-object = DigestMD5:new('Digest nonce="9e4ab724d272474ab13b64d75300a47b", \z
-  opaque="de40b82666bd5fe631a64f3b2d5a019e", \z
-  realm="me@kennethreitz.com", qop=auth',
-  _, _, _, _)
-test_suite:add_test(unittest.keys_equal(
-    object.challnvs,
-    {
-      nonce='9e4ab724d272474ab13b64d75300a47b',
-      opaque='de40b82666bd5fe631a64f3b2d5a019e',
-      realm='me@kennethreitz.com',
-      qop='auth',
-    }
-  ))
+  object = DigestMD5:new('Digest nonce="9e4ab724d272474ab13b64d75300a47b", \z
+    opaque="de40b82666bd5fe631a64f3b2d5a019e", \z
+    realm="me@kennethreitz.com", qop=auth',
+    _, _, _, _)
+  test_suite:add_test(unittest.keys_equal(
+      object.challnvs,
+      {
+        nonce='9e4ab724d272474ab13b64d75300a47b',
+        opaque='de40b82666bd5fe631a64f3b2d5a019e',
+        realm='me@kennethreitz.com',
+        qop='auth',
+      }
+    ))
 
-object = DigestMD5:new('realm=test, domain="/HTTP/Digest",\tnonce=c8563a5b367e66b3693fbb07a53a30ba',
-  _, _, _, _)
-test_suite:add_test(unittest.keys_equal(
-    object.challnvs,
-    {
-      nonce='c8563a5b367e66b3693fbb07a53a30ba',
-      realm='test',
-      domain='/HTTP/Digest',
-    }
-  ))
+  object = DigestMD5:new('realm=test, domain="/HTTP/Digest",\tnonce=c8563a5b367e66b3693fbb07a53a30ba',
+    _, _, _, _)
+  test_suite:add_test(unittest.keys_equal(
+      object.challnvs,
+      {
+        nonce='c8563a5b367e66b3693fbb07a53a30ba',
+        realm='test',
+        domain='/HTTP/Digest',
+      }
+    ))
+end
 
 return _ENV;
diff --git a/nselib/vnc.lua b/nselib/vnc.lua
index 7b35bf563..d7d9fbbeb 100644
--- a/nselib/vnc.lua
+++ b/nselib/vnc.lua
@@ -792,34 +792,37 @@ if not unittest.testing() then
 end
 
 test_suite = unittest.TestSuite:new()
-local test_vectors = {
-  -- from John the Ripper's vnc_fmt_plug.c
-  -- pass, challenge, response
-  {
-    "1234567890",
-    "\x2f\x75\x32\xb3\xef\xd1\x7e\xea\x5d\xd3\xa0\x94\x9f\xfd\xf1\xd8",
-    "\x0e\xb4\x2d\x4d\x9a\xc1\xef\x1b\x6e\xf6\x64\x7b\x95\x94\xa6\x21"
-  },
-  {
-    "123",
-    "\x79\x63\xf9\xbb\x7b\xa6\xa4\x2a\x08\x57\x63\x80\x81\x56\xf5\x70",
-    "\x47\x5b\x10\xd0\x56\x48\xe4\x11\x0d\x77\xf0\x39\x16\x10\x6f\x98"
-  },
-  {
-    "Password",
-    "\x08\x05\xb7\x90\xb5\x8e\x96\x7f\x2a\x35\x0a\x0c\x99\xde\x38\x81",
-    "\xae\xcb\x26\xfa\xea\xaa\x62\xd7\x96\x36\xa5\x93\x4b\xac\x10\x78"
-  },
-  {
-    "pass\xc2\xA3",
-    "\x84\x07\x6f\x04\x05\x50\xee\xa9\x34\x19\x67\x63\x3b\x5f\x38\x55",
-    "\x80\x75\x75\x68\x95\x82\x37\x9f\x7d\x80\x7f\x73\x6d\xe9\xe4\x34"
-  },
-}
+-- Crypto tests require OpenSSL
+if HAVE_SSL then
+  local test_vectors = {
+    -- from John the Ripper's vnc_fmt_plug.c
+    -- pass, challenge, response
+    {
+      "1234567890",
+      "\x2f\x75\x32\xb3\xef\xd1\x7e\xea\x5d\xd3\xa0\x94\x9f\xfd\xf1\xd8",
+      "\x0e\xb4\x2d\x4d\x9a\xc1\xef\x1b\x6e\xf6\x64\x7b\x95\x94\xa6\x21"
+    },
+    {
+      "123",
+      "\x79\x63\xf9\xbb\x7b\xa6\xa4\x2a\x08\x57\x63\x80\x81\x56\xf5\x70",
+      "\x47\x5b\x10\xd0\x56\x48\xe4\x11\x0d\x77\xf0\x39\x16\x10\x6f\x98"
+    },
+    {
+      "Password",
+      "\x08\x05\xb7\x90\xb5\x8e\x96\x7f\x2a\x35\x0a\x0c\x99\xde\x38\x81",
+      "\xae\xcb\x26\xfa\xea\xaa\x62\xd7\x96\x36\xa5\x93\x4b\xac\x10\x78"
+    },
+    {
+      "pass\xc2\xA3",
+      "\x84\x07\x6f\x04\x05\x50\xee\xa9\x34\x19\x67\x63\x3b\x5f\x38\x55",
+      "\x80\x75\x75\x68\x95\x82\x37\x9f\x7d\x80\x7f\x73\x6d\xe9\xe4\x34"
+    },
+  }
 
-for _, v in ipairs(test_vectors) do
-  test_suite:add_test(unittest.equal(
-    VNC:encryptVNCDES(v[1], v[2]), v[3]), v[1])
+  for _, v in ipairs(test_vectors) do
+    test_suite:add_test(unittest.equal(
+      VNC:encryptVNCDES(v[1], v[2]), v[3]), v[1])
+  end
 end
 
 return _ENV