Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_ssl / regressions / ssl-45-tls12.c

diff --git a/OSX/libsecurity_ssl/regressions/ssl-45-tls12.c b/OSX/libsecurity_ssl/regressions/ssl-45-tls12.c
index 67e2ea4ac017c811f0db1397f4a896d2b7d7b7ac..9708d7c753f71b5f951157ebd667dbd846264b82 100644 (file)
--- a/OSX/libsecurity_ssl/regressions/ssl-45-tls12.c
+++ b/OSX/libsecurity_ssl/regressions/ssl-45-tls12.c
@@ -97,31 +97,17 @@ static int SocketConnect(const char *hostName, int port)
     int                 err;
     struct hostent      *ent;
 
     int                 err;
     struct hostent      *ent;
 

-    if (hostName[0] >= '0' && hostName[0] <= '9')
-    {
+    if (hostName[0] >= '0' && hostName[0] <= '9') {

         host.s_addr = inet_addr(hostName);
         host.s_addr = inet_addr(hostName);

-    }
-    else {
-               unsigned dex;
-#define GETHOST_RETRIES 5
-               /* seeing a lot of soft failures here that I really don't want to track down */
-               for(dex=0; dex<GETHOST_RETRIES; dex++) {
-                       if(dex != 0) {
-                               printf("\n...retrying gethostbyname(%s)", hostName);
-                       }
-                       ent = gethostbyname(hostName);
-                       if(ent != NULL) {
-                               break;
-                       }
-               }
+    } else {
+        ent = gethostbyname(hostName);

         if(ent == NULL) {
                        printf("\n***gethostbyname(%s) returned: %s\n", hostName, hstrerror(h_errno));
         if(ent == NULL) {
                        printf("\n***gethostbyname(%s) returned: %s\n", hostName, hstrerror(h_errno));

-            return -1;
+            return -2;

         }
         memcpy(&host, ent->h_addr, sizeof(struct in_addr));
     }
 
         }
         memcpy(&host, ent->h_addr, sizeof(struct in_addr));
     }
 

-

     sock = socket(AF_INET, SOCK_STREAM, 0);
     addr.sin_addr = host;
     addr.sin_port = htons((u_short)port);
     sock = socket(AF_INET, SOCK_STREAM, 0);
     addr.sin_addr = host;
     addr.sin_port = htons((u_short)port);


@@ -132,7 +118,7 @@ static int SocketConnect(const char *hostName, int port)
     if(err!=0)
     {
         perror("connect failed");
     if(err!=0)
     {
         perror("connect failed");

-        return err;
+        return -1;

     }
 
     return sock;
     }
 
     return sock;


@@ -268,12 +254,17 @@ out:
 
 
 
 
 
 

+#define CONNECT_TRIES 3
+

 static ssl_test_handle *
 ssl_test_handle_create(struct s_server *server)
 {
 static ssl_test_handle *
 ssl_test_handle_create(struct s_server *server)
 {

-    int comm;
+    int comm = -1;
+
+    for(int try = 0; comm<0 && try<CONNECT_TRIES; try++) {
+        comm=SocketConnect(server->host, server->port);
+    }

 
 

-    comm=SocketConnect(server->host, server->port);

     if(comm<0) {
         fail("connect failed with err=%d - %s:%d", comm, server->host, server->port);
         return NULL;
     if(comm<0) {
         fail("connect failed with err=%d - %s:%d", comm, server->host, server->port);
         return NULL;


@@ -307,7 +298,7 @@ struct s_server servers[] = {
     {"www.amazon.com",443, kTLSProtocol12 },
     //{"www.mikestoolbox.org",443, kTLSProtocol12 },
     /* servers with issues */
     {"www.amazon.com",443, kTLSProtocol12 },
     //{"www.mikestoolbox.org",443, kTLSProtocol12 },
     /* servers with issues */

-    {"vpp.visa.co.uk", 443, kTLSProtocol12 }, // Doesnt like SSL 3.0 in initial record layer version
+    // This server went offline as of May 2016 -- {"vpp.visa.co.uk", 443, kTLSProtocol12 }, // Doesnt like SSL 3.0 in initial record layer version

     {"imap.softbank.jp",993, kTLSProtocol12 },   // softbank imap server, there are multiple servers behind this, one of them is not able to handle downgrading to TLS 1.2 properly (126.240.66.17).
     {"mobile.charter.net",993, kTLSProtocol12 }, // Support 1.2 but fail to negotiate properly
     {"mybill.vodafone.com.au", 443, kTLSProtocol1 }, /* 2056 bit server key */
     {"imap.softbank.jp",993, kTLSProtocol12 },   // softbank imap server, there are multiple servers behind this, one of them is not able to handle downgrading to TLS 1.2 properly (126.240.66.17).
     {"mobile.charter.net",993, kTLSProtocol12 }, // Support 1.2 but fail to negotiate properly
     {"mybill.vodafone.com.au", 443, kTLSProtocol1 }, /* 2056 bit server key */