wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no-sock

Browse source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7981)
This commit is contained in:
Matt Caswell 2019-01-04 11:13:39 +00:00
parent 87bbbfb1e4
commit 5e9072ed99
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/sslapitest.c
View file

@ -657,7 +657,8 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
return testresult; 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 */ /* sock must be connected */
static int ktls_chk_platform(int sock) static int ktls_chk_platform(int sock)
@ -6053,7 +6054,8 @@ int setup_tests(void)
#endif #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_client_server);
ADD_TEST(test_ktls_no_client_server); ADD_TEST(test_ktls_no_client_server);
ADD_TEST(test_ktls_client_no_server); ADD_TEST(test_ktls_client_no_server);

9
test/ssltestlib.c
View file

@ -663,7 +663,7 @@ int create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm,
#define MAXLOOPS 1000000 #define MAXLOOPS 1000000
#ifndef OPENSSL_NO_KTLS #if !defined(OPENSSL_NO_KTLS) && !defined(OPENSSL_NO_SOCK)
static int set_nb(int fd) static int set_nb(int fd)
{ {
int flags; int flags;
@ -736,12 +736,6 @@ success:
close(afd); close(afd);
return ret; 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, int create_ssl_objects2(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
SSL **cssl, int sfd, int cfd) 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); BIO_free(c_to_s_bio);
return 0; return 0;
} }
#endif
/* /*
* NOTE: Transfers control of the BIOs - this function will free them on error * NOTE: Transfers control of the BIOs - this function will free them on error