1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 12:41:29 +00:00

Don't run openssl-requiring tests if openssl isn't present.

This commit is contained in:
dmiller
2018-10-17 19:58:33 +00:00
parent a7495ac6c7
commit e93c2b4328
2 changed files with 68 additions and 62 deletions

View File

@@ -465,12 +465,14 @@ end
test_suite = unittest.TestSuite:new() 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 local object = DigestMD5:new('Digest realm="test", domain="/HTTP/Digest",\z
nonce="c8563a5b367e66b3693fbb07a53a30ba"', nonce="c8563a5b367e66b3693fbb07a53a30ba"',
_, _, _, _) _, _, _, _)
test_suite:add_test(unittest.keys_equal( test_suite:add_test(unittest.keys_equal(
object.challnvs, object.challnvs,
{ {
nonce='c8563a5b367e66b3693fbb07a53a30ba', nonce='c8563a5b367e66b3693fbb07a53a30ba',
@@ -479,11 +481,11 @@ test_suite:add_test(unittest.keys_equal(
} }
)) ))
object = DigestMD5:new('Digest nonce="9e4ab724d272474ab13b64d75300a47b", \z object = DigestMD5:new('Digest nonce="9e4ab724d272474ab13b64d75300a47b", \z
opaque="de40b82666bd5fe631a64f3b2d5a019e", \z opaque="de40b82666bd5fe631a64f3b2d5a019e", \z
realm="me@kennethreitz.com", qop=auth', realm="me@kennethreitz.com", qop=auth',
_, _, _, _) _, _, _, _)
test_suite:add_test(unittest.keys_equal( test_suite:add_test(unittest.keys_equal(
object.challnvs, object.challnvs,
{ {
nonce='9e4ab724d272474ab13b64d75300a47b', nonce='9e4ab724d272474ab13b64d75300a47b',
@@ -493,9 +495,9 @@ test_suite:add_test(unittest.keys_equal(
} }
)) ))
object = DigestMD5:new('realm=test, domain="/HTTP/Digest",\tnonce=c8563a5b367e66b3693fbb07a53a30ba', object = DigestMD5:new('realm=test, domain="/HTTP/Digest",\tnonce=c8563a5b367e66b3693fbb07a53a30ba',
_, _, _, _) _, _, _, _)
test_suite:add_test(unittest.keys_equal( test_suite:add_test(unittest.keys_equal(
object.challnvs, object.challnvs,
{ {
nonce='c8563a5b367e66b3693fbb07a53a30ba', nonce='c8563a5b367e66b3693fbb07a53a30ba',
@@ -503,5 +505,6 @@ test_suite:add_test(unittest.keys_equal(
domain='/HTTP/Digest', domain='/HTTP/Digest',
} }
)) ))
end
return _ENV; return _ENV;

View File

@@ -792,7 +792,9 @@ if not unittest.testing() then
end end
test_suite = unittest.TestSuite:new() test_suite = unittest.TestSuite:new()
local test_vectors = { -- Crypto tests require OpenSSL
if HAVE_SSL then
local test_vectors = {
-- from John the Ripper's vnc_fmt_plug.c -- from John the Ripper's vnc_fmt_plug.c
-- pass, challenge, response -- pass, challenge, response
{ {
@@ -815,11 +817,12 @@ local test_vectors = {
"\x84\x07\x6f\x04\x05\x50\xee\xa9\x34\x19\x67\x63\x3b\x5f\x38\x55", "\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" "\x80\x75\x75\x68\x95\x82\x37\x9f\x7d\x80\x7f\x73\x6d\xe9\xe4\x34"
}, },
} }
for _, v in ipairs(test_vectors) do for _, v in ipairs(test_vectors) do
test_suite:add_test(unittest.equal( test_suite:add_test(unittest.equal(
VNC:encryptVNCDES(v[1], v[2]), v[3]), v[1]) VNC:encryptVNCDES(v[1], v[2]), v[3]), v[1])
end
end end
return _ENV return _ENV