dcfced512c
- rebase to 1.2.13 resolves: rhbz#1425638 - added patch for GnuTLS crypto-policy adherence resolves: rhbz#1179317 - added autoconf, automake and libtool because package has patches now
30 lines
932 B
Diff
30 lines
932 B
Diff
diff --git a/src/tcp.c b/src/tcp.c
|
|
index 3c6acbb..4220ec4 100644
|
|
--- a/src/tcp.c
|
|
+++ b/src/tcp.c
|
|
@@ -548,23 +548,8 @@ static relpRetVal
|
|
relpTcpTLSSetPrio(relpTcp_t *pThis)
|
|
{
|
|
int r;
|
|
- char pristringBuf[4096];
|
|
- char *pristring;
|
|
ENTER_RELPFUNC;
|
|
- /* Compute priority string (in simple cases where the user does not care...) */
|
|
- if(pThis->pristring == NULL) {
|
|
- if(pThis->bEnableTLSZip) {
|
|
- strncpy(pristringBuf, "NORMAL:+ANON-DH:+COMP-ALL", sizeof(pristringBuf));
|
|
- } else {
|
|
- strncpy(pristringBuf, "NORMAL:+ANON-DH:+COMP-NULL", sizeof(pristringBuf));
|
|
- }
|
|
- pristringBuf[sizeof(pristringBuf)-1] = '\0';
|
|
- pristring = pristringBuf;
|
|
- } else {
|
|
- pristring = pThis->pristring;
|
|
- }
|
|
-
|
|
- r = gnutls_priority_set_direct(pThis->session, pristring, NULL);
|
|
+ r = gnutls_set_default_priority(pThis->session);
|
|
if(r == GNUTLS_E_INVALID_REQUEST) {
|
|
ABORT_FINALIZE(RELP_RET_INVLD_TLS_PRIO);
|
|
} else if(r != GNUTLS_E_SUCCESS) {
|