diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2010-02-18 22:02:55 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2010-02-18 22:02:55 +0100 |
| commit | d2ec8d133db7da8910538c13c500e65959d041ae (patch) | |
| tree | ed5d7c76368c64b51a7ce1e7b7fb2bf0c6b327f1 /src/core | |
| parent | 832a4c1466ec5d0cff30a3ad5205de4c64178237 (diff) | |
| download | weechat-d2ec8d133db7da8910538c13c500e65959d041ae.zip | |
Add mechanism DH-BLOWFISH for SASL authentication with IRC server
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Makefile.am | 2 | ||||
| -rw-r--r-- | src/core/wee-network.c | 9 | ||||
| -rw-r--r-- | src/core/wee-upgrade-file.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index ebbfcac64..66460b762 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS) +INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GCRYPT_CFLAGS) $(GNUTLS_CFLAGS) noinst_LIBRARIES = lib_weechat_core.a diff --git a/src/core/wee-network.c b/src/core/wee-network.c index 6971c49dd..13d38c233 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -37,6 +37,10 @@ #include <gnutls/gnutls.h> #endif +#ifdef HAVE_GCRYPT +#include <gcrypt.h> +#endif + #include "weechat.h" #include "wee-network.h" #include "wee-hook.h" @@ -81,6 +85,11 @@ network_init () &hook_connect_gnutls_set_certificates); network_init_ok = 1; #endif +#ifdef HAVE_GCRYPT + gcry_check_version (GCRYPT_VERSION); + gcry_control (GCRYCTL_DISABLE_SECMEM, 0); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); +#endif } /* diff --git a/src/core/wee-upgrade-file.c b/src/core/wee-upgrade-file.c index 0affb9457..cd453a352 100644 --- a/src/core/wee-upgrade-file.c +++ b/src/core/wee-upgrade-file.c @@ -668,7 +668,7 @@ upgrade_file_read_object (struct t_upgrade_file *upgrade_file) rc = 0; } - end: +end: if (infolist) infolist_free (infolist); if (name) |