summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-03-03 15:34:51 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-03-03 15:34:51 +0000
commit4b8dd2d4c4098cfde70a70326ae5035eb53214b3 (patch)
tree76f7133e87819e174b535de51c5266b8d7f3e96b
parenta75a28f34b20739a8cb39c382fd246c01126ef22 (diff)
downloadgnutls-4b8dd2d4c4098cfde70a70326ae5035eb53214b3.tar.gz
some fixes in tests
-rw-r--r--src/tests.c10
-rw-r--r--src/tls_test.c8
2 files changed, 10 insertions, 8 deletions
diff --git a/src/tests.c b/src/tests.c
index 8b3b5036a2..e05dbcc80b 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -445,7 +445,7 @@ int ret;
gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
ret = do_handshake( session);
- if (ret < 0) return FAILED;
+ if (ret == FAILED) return FAILED;
if (gnutls_protocol_get_version(session)==GNUTLS_TLS1) return SUCCEED;
return UNSURE;
@@ -463,7 +463,7 @@ int ret;
gnutls_record_set_max_size( session, 512);
ret = do_handshake( session);
- if (ret<0) return FAILED;
+ if (ret == FAILED) return ret;
ret = gnutls_record_get_max_size(session);
if (ret==512) return SUCCEED;
@@ -557,7 +557,7 @@ int tmp_session_id_size;
tmp_session_id_size = session_id_size;
ret = do_handshake( session);
- if (ret < 0) return FAILED;
+ if (ret == FAILED) return ret;
/* check if we actually resumed the previous session */
@@ -584,7 +584,7 @@ int ret;
gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
ret = do_handshake( session);
- if (ret < 0) return FAILED;
+ if (ret == FAILED) return ret;
printf("\n");
print_cert_info( session);
@@ -640,7 +640,7 @@ int ret;
gnutls_certificate_client_set_select_function( session, cert_callback);
ret = do_handshake( session);
- if (ret < 0) return FAILED;
+ if (ret ==FAILED) return ret;
return SUCCEED;
}
diff --git a/src/tls_test.c b/src/tls_test.c
index 4e6c00eb9c..f13c3dda22 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -81,13 +81,15 @@ static const TLS_TEST tls_tests[] = {
{ "for SSL 3.0 support", test_ssl3, "yes", "no", "dunno" },
{ "for version rollback bug in RSA PMS", test_rsa_pms, "no", "yes", "dunno" },
{ "for version rollback bug in Client Hello", test_version_rollback, "no", "yes", "dunno" },
- { "whether we need to disable TLS 1.0", test_tls1_2, "no", "yes", "dunno" },
- { "for certificate information", test_certificate, "", "", "" },
- { "for trusted CAs", test_server_cas, "", "", "" },
+
/* this test will disable TLS 1.0 if the server is
* buggy */
+ { "whether we need to disable TLS 1.0", test_tls1_2, "no", "yes", "dunno" },
+
{ "whether the server can accept Hello Extensions", test_hello_extension, "yes", "no", "dunno"},
{ "whether the server can accept cipher suites not in SSL 3.0 spec", test_unknown_ciphersuites, "yes", "no", "dunno"},
+ { "for certificate information", test_certificate, "", "", "" },
+ { "for trusted CAs", test_server_cas, "", "", "" },
{ "whether the server understands TLS closure alerts", test_bye, "yes", "no", "partially"},
{ "whether the server supports session resumption", test_session_resume2, "yes", "no", "dunno"},
{ "for export-grade ciphersuite support", test_export, "yes", "no", "dunno" },