blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

irc: fix compilation with GnuTLS < 3.1.0 (issue #115)

Browse Source 
Due to this ssl_password will be partially unused with GnuTLS < 3.1.0.
In that case an encrypted SSL client cert import will simply fail.
This commit is contained in:
Simmo Saan 2019-12-10 23:00:13 +02:00 committed by Sébastien Helleu
parent 9c227de6bf
commit 139a7053e4
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/irc/irc-server.c
View File

@ -4710,11 +4710,24 @@ irc_server_gnutls_callback (const void *pointer, void *data,
/* key */ /* key */
gnutls_x509_privkey_init (&server->tls_cert_key); gnutls_x509_privkey_init (&server->tls_cert_key);
/*
* gnutls_x509_privkey_import2 has no "Since: ..." in GnuTLS manual but
* GnuTLS NEWS file lists it being added in 3.1.0:
* https://gitlab.com/gnutls/gnutls/blob/2b715b9564681acb3008a5574dcf25464de8b038/NEWS#L2552
*/
#if LIBGNUTLS_VERSION_NUMBER >= 0x030100 /* 3.1.0 */
ret = gnutls_x509_privkey_import2 (server->tls_cert_key, ret = gnutls_x509_privkey_import2 (server->tls_cert_key,
&filedatum, &filedatum,
GNUTLS_X509_FMT_PEM, GNUTLS_X509_FMT_PEM,
ssl_password, ssl_password,
0); 0);
#else
ret = gnutls_x509_privkey_import (server->tls_cert_key,
&filedatum,
GNUTLS_X509_FMT_PEM);
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x0301000 */
if (ret < 0) if (ret < 0)
{ {
ret = gnutls_x509_privkey_import_pkcs8 ( ret = gnutls_x509_privkey_import_pkcs8 (