Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurity_ssl / regressions / ssl-39-echo.c

diff --git a/OSX/libsecurity_ssl/regressions/ssl-39-echo.c b/OSX/libsecurity_ssl/regressions/ssl-39-echo.c
index 10fa94f65838c374f5a0fd91f9395267ea75f6ca..cce99baabdf7886d1c92f4d0b762809383a87318 100644 (file)
--- a/OSX/libsecurity_ssl/regressions/ssl-39-echo.c
+++ b/OSX/libsecurity_ssl/regressions/ssl-39-echo.c
@@ -625,7 +625,7 @@ static void *securetransport_ssl_thread(void *arg)
     unsigned char ibuf[4096], obuf[4096];
     size_t len;
     if (ssl->is_server) {
     unsigned char ibuf[4096], obuf[4096];
     size_t len;
     if (ssl->is_server) {

-        SecRandomCopyBytes(kSecRandomDefault, sizeof(obuf), obuf);
+        require_action(errSecSuccess==SecRandomCopyBytes(kSecRandomDefault, sizeof(obuf), obuf),out, ortn = -1);

         require_noerr_quiet(ortn = SSLWrite(ctx, obuf, sizeof(obuf), &len), out);
         require_action_quiet(len == sizeof(obuf), out, ortn = -1);
     }
         require_noerr_quiet(ortn = SSLWrite(ctx, obuf, sizeof(obuf), &len), out);
         require_action_quiet(len == sizeof(obuf), out, ortn = -1);
     }


@@ -723,7 +723,7 @@ tests(void)
             pthread_create(&client_thread, NULL, securetransport_ssl_thread, client);
             pthread_create(&server_thread, NULL, securetransport_ssl_thread, server);
 
             pthread_create(&client_thread, NULL, securetransport_ssl_thread, client);
             pthread_create(&server_thread, NULL, securetransport_ssl_thread, server);
 

-            int server_err, client_err;
+            intptr_t server_err, client_err;

             pthread_join(client_thread, (void*)&client_err);
             pthread_join(server_thread, (void*)&server_err);
 
             pthread_join(client_thread, (void*)&client_err);
             pthread_join(server_thread, (void*)&server_err);