Commit 5e9072ed authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-sock 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7981)
parent 87bbbfb1

test/sslapitest.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

test/ssltestlib.c

+2 −7
Original line number Diff line number Diff line
@@ -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