Mercurial > hg > xemacs-beta
changeset 5815:d59bfb050ca8
Fix TLS-related build failures. See xemacs-patches message with ID
<CAHCOHQ=YBtU8kx9UEGZa09-hz-40XJyHJ95t=tidSgbSVEU7nQ@mail.gmail.com>.
| author | Jerry James <james@xemacs.org> |
|---|---|
| date | Wed, 08 Oct 2014 12:58:20 -0600 |
| parents | a216b3c2b09e |
| children | 5de7b6d1e752 |
| files | src/ChangeLog src/tls.c src/tls.h |
| diffstat | 3 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Oct 07 21:16:10 2014 -0600 +++ b/src/ChangeLog Wed Oct 08 12:58:20 2014 -0600 @@ -1,3 +1,11 @@ +2014-10-08 Jerry James <james@xemacs.org> + + * tls.c (init_tls): Remove blatant Fedoraism from the OpenSSL version. + * tls.h (tls_open): + (make_tls_input_stream): + (make_tls_output_stream): + (tls_get_fd): Fix build failures in the !WITH_TLS case. + 2014-10-07 Jerry James <james@xemacs.org> * Makefile.in.in: Add tls.o to the link.
--- a/src/tls.c Tue Oct 07 21:16:10 2014 -0600 +++ b/src/tls.c Wed Oct 08 12:58:20 2014 -0600 @@ -1116,7 +1116,7 @@ SSL_MODE_AUTO_RETRY | SSL_MODE_RELEASE_BUFFERS); /* Let the system select the ciphers */ - if (SSL_CTX_set_cipher_list (ssl_ctx, "PROFILE=SYSTEM") != 1) + if (SSL_CTX_set_cipher_list (ssl_ctx, "DEFAULT") != 1) signal_error (Qtls_error, "SSL_CTX_set_cipher_list failed", openssl_error_string ());
--- a/src/tls.h Tue Oct 07 21:16:10 2014 -0600 +++ b/src/tls.h Wed Oct 08 12:58:20 2014 -0600 @@ -80,14 +80,17 @@ #else /* WITH_TLS */ typedef int tls_state_t; #define TLS_SETUP_SOCK 1 -#define tls_open(x,y) \ - signal_error (Qtls_error, "TLS support unavailable", Qnil), NULL +#define tls_open(x,y) ({ \ + signal_error (Qtls_error, "TLS support unavailable", Qnil); \ + NULL; }) #define tls_negotiate(x,y,z) NULL -#define make_tls_input_stream(x) \ - signal_error (Qtls_error, "TLS support unavailable", Qnil), NULL -#define make_tls_output_stream(x) \ - signal_error (Qtls_error, "TLS support unavailable", Qnil), NULL -#define tls_get_fd(x, y) -1 +#define make_tls_input_stream(x) ({ \ + signal_error (Qtls_error, "TLS support unavailable", Qnil); \ + NULL; }) +#define make_tls_output_stream(x) ({ \ + signal_error (Qtls_error, "TLS support unavailable", Qnil); \ + NULL; }) +#define tls_get_fd(x) -1 #define tls_read(w,x,y,z) -1 #define tls_write(w,x,y,z) -1 #define tls_close(x) -1