[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  5e9072ed99971fa5e47326c2f8ffa4bc9624a584 (commit)
      from  87bbbfb1e4fc2035e8f9ec1d6313a41c410a3218 (commit)


- Log -----------------------------------------------------------------
commit 5e9072ed99971fa5e47326c2f8ffa4bc9624a584
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jan 4 11:13:39 2019 +0000

    Fix no-sock
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7981)

-----------------------------------------------------------------------

Summary of changes:
 test/sslapitest.c | 6 ++++--
 test/ssltestlib.c | 9 ++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index d52380c..1868eb3 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -657,7 +657,8 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
     return testresult;
 }
 
-#if !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_KTLS)
+#if !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_KTLS) \
+    && !defined(OPENSSL_NO_SOCK)
 
 /* sock must be connected */
 static int ktls_chk_platform(int sock)
@@ -6053,7 +6054,8 @@ int setup_tests(void)
 #endif
     }
 
-#if !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_KTLS)
+#if !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_KTLS) \
+    && !defined(OPENSSL_NO_SOCK)
     ADD_TEST(test_ktls_client_server);
     ADD_TEST(test_ktls_no_client_server);
     ADD_TEST(test_ktls_client_no_server);
diff --git a/test/ssltestlib.c b/test/ssltestlib.c
index 50c7112..8187513 100644
--- a/test/ssltestlib.c
+++ b/test/ssltestlib.c
@@ -663,7 +663,7 @@ int create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm,
 
 #define MAXLOOPS    1000000
 
-#ifndef OPENSSL_NO_KTLS
+#if !defined(OPENSSL_NO_KTLS) && !defined(OPENSSL_NO_SOCK)
 static int set_nb(int fd)
 {
     int flags;
@@ -736,12 +736,6 @@ success:
             close(afd);
     return ret;
 }
-#else
-int create_test_sockets(int *cfd, int *sfd)
-{
-    return 0;
-}
-#endif
 
 int create_ssl_objects2(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
                           SSL **cssl, int sfd, int cfd)
@@ -775,6 +769,7 @@ int create_ssl_objects2(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
     BIO_free(c_to_s_bio);
     return 0;
 }
+#endif
 
 /*
  * NOTE: Transfers control of the BIOs - this function will free them on error