diff options
| author | Matt Caswell <matt@openssl.org> | 2019-01-04 12:13:39 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-06 11:06:43 +0100 |
| commit | 5e9072ed99971fa5e47326c2f8ffa4bc9624a584 (patch) | |
| tree | 427e57f5dc7b99f748c662ecda6589f5babb6edb /test/ssltestlib.c | |
| parent | Fix no-cmac (diff) | |
| download | openssl-5e9072ed99971fa5e47326c2f8ffa4bc9624a584.tar.xz openssl-5e9072ed99971fa5e47326c2f8ffa4bc9624a584.zip | |
Fix no-sock
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7981)
Diffstat (limited to '')
| -rw-r--r-- | test/ssltestlib.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/ssltestlib.c b/test/ssltestlib.c index 50c7112687..8187513f8f 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 |