The branch master has been updated via 4be35545aea9f76e3704fe88bb8f3fc135ceb4c8 (commit) via c195c882335874505f58debf3f6bf750377c62af (commit) from c39f43534d4f359bdfee617f70f89b114c9f2cca (commit)
- Log ----------------------------------------------------------------- commit 4be35545aea9f76e3704fe88bb8f3fc135ceb4c8 Author: Matt Caswell <m...@openssl.org> Date: Tue Dec 1 15:34:24 2020 +0000 Fix no-dtls Ensure we correctly detect if DTLS has been disabled in the client auth test_ssl_new tests. Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13587) commit c195c882335874505f58debf3f6bf750377c62af Author: Matt Caswell <m...@openssl.org> Date: Tue Dec 1 15:19:56 2020 +0000 Fix a compile error with the no-sock option BIO_do_connect() can work even in no-sock builds (non socket based BIOs have the right ctrls). Therefore we move the macro outside of the OPENSSL_NO_SOCK guards Fixes #12207 Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13587) ----------------------------------------------------------------------- Summary of changes: include/openssl/bio.h.in | 7 +++---- test/ssl-tests/04-client_auth.cnf.in | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in index d7380d47e9..d52392def8 100644 --- a/include/openssl/bio.h.in +++ b/include/openssl/bio.h.in @@ -443,12 +443,11 @@ struct bio_dgram_sctp_prinfo { # define BIO_BIND_REUSEADDR_IF_UNUSED BIO_SOCK_REUSEADDR # define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL) # define BIO_get_bind_mode(b) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL) - -/* BIO_s_accept() and BIO_s_connect() */ -# define BIO_do_connect(b) BIO_do_handshake(b) -# define BIO_do_accept(b) BIO_do_handshake(b) # endif /* OPENSSL_NO_SOCK */ +# define BIO_do_connect(b) BIO_do_handshake(b) +# define BIO_do_accept(b) BIO_do_handshake(b) + # define BIO_do_handshake(b) BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL) /* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and BIO_s_connect() */ diff --git a/test/ssl-tests/04-client_auth.cnf.in b/test/ssl-tests/04-client_auth.cnf.in index 5c748cb515..ad0ae7ae18 100644 --- a/test/ssl-tests/04-client_auth.cnf.in +++ b/test/ssl-tests/04-client_auth.cnf.in @@ -15,13 +15,14 @@ our $fips_mode; my @protocols; my @is_disabled = (0); -push @is_disabled, anydisabled("ssl3", "tls1", "tls1_1", "tls1_2", "dtls1", "dtls1_2"); # We test version-flexible negotiation (undef) and each protocol version. if ($fips_mode) { @protocols = (undef, "TLSv1.2", "DTLSv1.2"); + push @is_disabled, anydisabled("tls1_2", "dtls1_2"); } else { @protocols = (undef, "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2", "DTLSv1", "DTLSv1.2"); + push @is_disabled, anydisabled("ssl3", "tls1", "tls1_1", "tls1_2", "dtls1", "dtls1_2"); } our @tests = ();