Mercurial > hg
changeset 134:e19ad58c3cad
[/trunk] Changeset 147 by mikael
* Enable the connwrap module to compile when using gnutls-openssl.
author | mikael |
---|---|
date | Thu, 28 Apr 2005 17:39:57 +0000 |
parents | a27b22e3b3a1 |
children | ef898db62b79 |
files | mcabber/connwrap/connwrap.c |
diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/connwrap/connwrap.c Thu Apr 28 14:47:56 2005 +0000 +++ b/mcabber/connwrap/connwrap.c Thu Apr 28 17:39:57 2005 +0000 @@ -18,11 +18,11 @@ #include <openssl/ssl.h> #include <openssl/err.h> -#elif HAVE_GNUTLS - -#include <gnutls/openssl.h> -#define HAVE_OPENSSL - +#else +# ifdef HAVE_GNUTLS +# include <gnutls/openssl.h> +# define HAVE_OPENSSL +# endif #endif static int in_http_connect = 0; @@ -62,7 +62,8 @@ OpenSSL_add_all_algorithms(); #endif - ctx = SSL_CTX_new(SSLv23_method()); + //ctx = SSL_CTX_new(SSLv23_method()); + ctx = SSL_CTX_new(SSLv23_client_method()); } p->ssl = SSL_new(ctx);