56685a7fb5
* python/: Python bindings and test scripts
* iks.c: iks_string() returns nul terminated strings for cdata nodes
* sax.c: Fix handling of ending ]] sequences in CDATA sections
bug report and patch by oscarvdbosch
* md5.c: Fix padding for multiples of 64 bytes
* tls-gnutls.c: support timeout value in tls_recv
* iksemel.h: new ikstls structure and definitions
* tls-gnutls.c: new file, GNUTLS implemantation moved here
* stream.c: TLS code is abstracted with new TLS interface
* io-posix.c: send/recv now handles EAGAIN/EINTR.
* iksroster.c: Plain text auth option patch from issue tracker.
* tst-sax.c: Fix a va_arg bug with 64bit platforms.
* sax.c: Fix attribute array out-of-bounds condition.
* iksperf.c: Fix a warning, and use size_t instead of int.
* md5.c: use iks_malloc/free like everywhere else.
(reported by Vinay Deshpande)
* sax.c: utf8 validation bug is fixed. Some valid utf8
sequences were not allowed before. Security check is moved
after sequence end point, so position of IKS_BADXML errors
are changed.
* Patch by Timothy Lee:
sax.c: Whitespace between "attr, =, value" is valid now.
tst-sax.c: I also added a simple test for that.
- adjusted secure_gnutls_options.patch
- use autoreconf (BuildRequires: autoconf, automake, libtool)
- build python lib
- added BuildRequires: makeinfo
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/iksemel?expand=0&rev=4
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
Index: src/tls-gnutls.c
|
|
===================================================================
|
|
--- a/src/tls-gnutls.c
|
|
+++ b/src/tls-gnutls.c
|
|
@@ -48,11 +48,7 @@ tls_pull (struct ikstls_data *data, char
|
|
static int
|
|
tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock)
|
|
{
|
|
- const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
|
|
- const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
|
|
- const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
|
|
- const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
|
|
- const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
|
|
+ const char *priority_string = "SECURE256:+SECURE192:-VERS-TLS-ALL:+VERS-TLS1.2";
|
|
struct ikstls_data *data;
|
|
int ret;
|
|
|
|
@@ -81,11 +77,7 @@ tls_handshake (struct ikstls_data **data
|
|
return IKS_NOMEM;
|
|
}
|
|
|
|
- gnutls_protocol_set_priority (data->sess, protocol_priority);
|
|
- gnutls_cipher_set_priority(data->sess, cipher_priority);
|
|
- gnutls_compression_set_priority(data->sess, comp_priority);
|
|
- gnutls_kx_set_priority(data->sess, kx_priority);
|
|
- gnutls_mac_set_priority(data->sess, mac_priority);
|
|
+ gnutls_priority_set_direct(data->sess, priority_string, NULL);
|
|
gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
|
|
|
|
gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
|