PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 14:11:29 +00:00
Code Issues Projects Releases Wiki Activity

Only run SSL nsock tests if configured with OpenSSL

Browse Source
This commit is contained in:
dmiller
2015-02-11 04:55:36 +00:00
parent 2bf814b499
commit 7e30cb9c4a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nsock/tests/run_tests.sh
View File

@@ -76,7 +76,7 @@ cleanup_all() {
main() { main() {
setup_echo_udp $PORT_UDP setup_echo_udp $PORT_UDP
setup_echo_tcp $PORT_TCP setup_echo_tcp $PORT_TCP
setup_echo_tcpssl $PORT_TCPSSL $EXEC_MAIN --ssl && setup_echo_tcpssl $PORT_TCPSSL
$TRACER $EXEC_MAIN $TRACER $EXEC_MAIN

14
nsock/tests/tests_main.c
View File

@@ -5,6 +5,7 @@
#include "test-common.h" #include "test-common.h"
#include "string.h"
#ifndef WIN32 #ifndef WIN32
@@ -36,7 +37,9 @@ extern const struct test_case TestGHHeaps;
extern const struct test_case TestHeapOrdering; extern const struct test_case TestHeapOrdering;
extern const struct test_case TestCancelTCP; extern const struct test_case TestCancelTCP;
extern const struct test_case TestCancelUDP; extern const struct test_case TestCancelUDP;
#ifdef HAVE_OPENSSL
extern const struct test_case TestCancelSSL; extern const struct test_case TestCancelSSL;
#endif
static const struct test_case *TestCases[] = { static const struct test_case *TestCases[] = {
@@ -58,7 +61,9 @@ static const struct test_case *TestCases[] = {
/* ---- cancel.c */ /* ---- cancel.c */
&TestCancelTCP, &TestCancelTCP,
&TestCancelUDP, &TestCancelUDP,
#ifdef HAVE_OPENSSL
&TestCancelSSL, &TestCancelSSL,
#endif
NULL NULL
}; };
@@ -94,6 +99,15 @@ static int win_init(void) {
int main(int ac, char **av) { int main(int ac, char **av) {
int rc, i; int rc, i;
/* simple "do we have ssl" check for run_tests.sh */
if (ac == 2 && !strncmp(av[1], "--ssl", 5)) {
#ifdef HAVE_SSL
return 0;
#else
return 1;
#endif
}
#ifdef WIN32 #ifdef WIN32
win_init(); win_init();
#endif #endif