Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_ssl / regressions / ssl-48-split.c

diff --git a/OSX/libsecurity_ssl/regressions/ssl-48-split.c b/OSX/libsecurity_ssl/regressions/ssl-48-split.c
index 44930a786fbd6e1a7cbef3a967eb9c9628729ae2..8a47cd46a78060d570fd17178b733e83900a2449 100644 (file)
--- a/OSX/libsecurity_ssl/regressions/ssl-48-split.c
+++ b/OSX/libsecurity_ssl/regressions/ssl-48-split.c
@@ -173,7 +173,7 @@ static void *securetransport_ssl_thread(void *arg)
 
     if (ssl->is_server) {
         size_t len;
 
     if (ssl->is_server) {
         size_t len;

-        SecRandomCopyBytes(kSecRandomDefault, ssl->write_size, obuf);
+        require_action(errSecSuccess==SecRandomCopyBytes(kSecRandomDefault, ssl->write_size, obuf), out, ortn = -1);

         require_noerr(ortn = SSLWrite(ctx, obuf, ssl->write_size, &len), out);
         require_action(len == ssl->write_size, out, ortn = -1);
         require_noerr(ortn = SSLWrite(ctx, obuf, ssl->write_size, &len), out);
         require_noerr(ortn = SSLWrite(ctx, obuf, ssl->write_size, &len), out);
         require_action(len == ssl->write_size, out, ortn = -1);
         require_noerr(ortn = SSLWrite(ctx, obuf, ssl->write_size, &len), out);


@@ -322,12 +322,12 @@ 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);
 

-        ok(!server_err, "Server error = %d", server_err);
-        ok(!client_err, "Client error = %d", client_err);
+        ok(!server_err, "Server error = %ld", server_err);
+        ok(!client_err, "Client error = %ld", client_err);

 
         /* one byte split is expected only for AES when using TLS 1.0 or lower, and when not disabled */
         bool expected_split = (i==0) && (s!=2) && (versions[j]<=kTLSProtocol1);
 
         /* one byte split is expected only for AES when using TLS 1.0 or lower, and when not disabled */
         bool expected_split = (i==0) && (s!=2) && (versions[j]<=kTLSProtocol1);