tests/resume-with-previous-*: turn functions w/o retval void

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/tests/resume-with-previous-stek.c b/tests/resume-with-previous-stek.c
index cf6d649aa5ddd5542da071779d9fdbdb3f8c2222..dbadad810a16db58c421df0e334c5f62e12671a2 100644 (file)
--- a/tests/resume-with-previous-stek.c
+++ b/tests/resume-with-previous-stek.c
@@ -55,8 +55,8 @@ static void stek_rotation_callback(const gnutls_datum_t *prev_key,
        success("STEK was rotated!\n");
 }
 
-static int client_handshake(gnutls_session_t session,
-                           gnutls_datum_t *session_data, int resume)
+static void client_handshake(gnutls_session_t session,
+                            gnutls_datum_t *session_data, int resume)
 {
        int ret;
 
@@ -92,8 +92,6 @@ static int client_handshake(gnutls_session_t session,
        do {
                ret = gnutls_bye(session, GNUTLS_SHUT_RDWR);
        } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-
-       return 0;
 }
 
 static void client(int fd, int *resume, unsigned rounds, const char *prio)
@@ -116,8 +114,7 @@ static void client(int fd, int *resume, unsigned rounds, const char *prio)
                gnutls_handshake_set_timeout(session, get_timeout());
 
                /* Perform TLS handshake and obtain session ticket */
-               if (client_handshake(session, &session_data, resume[i]) < 0)
-                       return;
+               client_handshake(session, &session_data, resume[i]);
 
                if (clientx509cred) {
                        gnutls_certificate_free_credentials(clientx509cred);

diff --git a/tests/resume-with-stek-expiration.c b/tests/resume-with-stek-expiration.c
index 73adb359ee3bf568a4f96c41b7b522ea5f768d14..7aba2af01109653a82f9b388b348aaf6f5deeb64 100644 (file)
--- a/tests/resume-with-stek-expiration.c
+++ b/tests/resume-with-stek-expiration.c
@@ -66,8 +66,8 @@ typedef void (*gnutls_stek_rotation_callback_t)(const gnutls_datum_t *prev_key,
 void _gnutls_set_session_ticket_key_rotation_callback(
        gnutls_session_t session, gnutls_stek_rotation_callback_t cb);
 
-static int handshake(gnutls_session_t session, gnutls_datum_t *session_data,
-                    int resumption_should_succeed)
+static void handshake(gnutls_session_t session, gnutls_datum_t *session_data,
+                     int resumption_should_succeed)
 {
        int ret;
 
@@ -103,13 +103,11 @@ static int handshake(gnutls_session_t session, gnutls_datum_t *session_data,
        do {
                ret = gnutls_bye(session, GNUTLS_SHUT_RDWR);
        } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-
-       return 0;
 }
 
-static int resume_and_close(gnutls_session_t session,
-                           gnutls_datum_t *session_data,
-                           int resumption_should_succeed)
+static void resume_and_close(gnutls_session_t session,
+                            gnutls_datum_t *session_data,
+                            int resumption_should_succeed)
 {
        int ret;
 
@@ -145,8 +143,6 @@ static int resume_and_close(gnutls_session_t session,
        do {
                ret = gnutls_bye(session, GNUTLS_SHUT_RDWR);
        } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-
-       return 0;
 }
 
 static void client(int fd, int *resumption_should_succeed,
@@ -168,8 +164,7 @@ static void client(int fd, int *resumption_should_succeed,
        gnutls_transport_set_int(session, fd);
        gnutls_handshake_set_timeout(session, get_timeout());
 
-       if (handshake(session, &session_data, resumption_should_succeed[0]) < 0)
-               return;
+       handshake(session, &session_data, resumption_should_succeed[0]);
 
        if (clientx509cred)
                gnutls_certificate_free_credentials(clientx509cred);
@@ -189,9 +184,8 @@ static void client(int fd, int *resumption_should_succeed,
 
                gnutls_transport_set_int(session, fd);
 
-               if (resume_and_close(session, &session_data,
-                                    resumption_should_succeed[i]) < 0)
-                       return;
+               resume_and_close(session, &session_data,
+                                resumption_should_succeed[i]);
 
                if (clientx509cred)
                        gnutls_certificate_free_credentials(clientx509cred);