diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-11-13 16:41:43 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-11-13 17:00:14 +0100 |
| commit | 330dcc63b215152837caabda553c475a538fbc78 (patch) | |
| tree | facd433e80a2f206f7c035a2de475aae5cc42dbd | |
| parent | 3c67cfb9cc024aab51d2dad11469f8c3ff5491a5 (diff) | |
| download | gnutls-330dcc63b215152837caabda553c475a538fbc78.tar.gz | |
gnutls-cli-debug: terminate sessions which cannot be re-used
| -rw-r--r-- | src/cli-debug.c | 4 | ||||
| -rw-r--r-- | src/tests.c | 6 | ||||
| -rw-r--r-- | src/tests.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/cli-debug.c b/src/cli-debug.c index 3dcb90225d..2b0f88e2e3 100644 --- a/src/cli-debug.c +++ b/src/cli-debug.c @@ -285,7 +285,7 @@ int main(int argc, char **argv) break; } - socket_open(&hd, hostname, portname, app_proto, SOCKET_FLAG_STARTTLS, NULL, NULL); + socket_open(&hd, hostname, portname, app_proto, SOCKET_FLAG_STARTTLS|SOCKET_FLAG_RAW, NULL, NULL); hd.verbose = verbose; do { @@ -296,7 +296,7 @@ int main(int argc, char **argv) ret = tls_tests[i].func(hd.session); - if (ret != TEST_IGNORE) { + if (ret != TEST_IGNORE && ret != TEST_IGNORE2) { printf("%58s...", tls_tests[i].test_name); fflush(stdout); } diff --git a/src/tests.c b/src/tests.c index b235f0c383..2d40b8c6be 100644 --- a/src/tests.c +++ b/src/tests.c @@ -296,7 +296,7 @@ test_code_t test_rfc7507(gnutls_session_t session) ret = do_handshake(session); if (ret < 0) - return TEST_IGNORE; + return TEST_IGNORE2; if (handshake_output < 0) return TEST_SUCCEED; @@ -1354,12 +1354,12 @@ test_code_t test_chain_order(gnutls_session_t session) return ret; if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) - return TEST_IGNORE; + return TEST_IGNORE2; cert_list = gnutls_certificate_get_peers(session, &cert_list_size); if (cert_list_size == 0) { ext_text = "No certificates found!"; - return TEST_IGNORE; + return TEST_IGNORE2; } if (cert_list_size == 1) diff --git a/src/tests.h b/src/tests.h index 3a974aeea0..7f938b86de 100644 --- a/src/tests.h +++ b/src/tests.h @@ -19,7 +19,7 @@ */ typedef enum { - TEST_SUCCEED, TEST_FAILED, TEST_UNSURE, TEST_IGNORE + TEST_SUCCEED, TEST_FAILED, TEST_UNSURE, TEST_IGNORE/*keep socket*/, TEST_IGNORE2/*destroy socket*/ } test_code_t; test_code_t test_chain_order(gnutls_session_t session); |