Explorar el Código

Fix priority string when using newer GnuTLS

The call of gnutls_set_default_priority_append() expects a normal priority
string, which means it must not start with ':'.
tags/v1.11.90
Jan Grulich hace 2 años
padre
commit
7f1e1e370e
Se han modificado 2 ficheros con 6 adiciones y 2 borrados
  1. 3
    1
      common/rfb/CSecurityTLS.cxx
  2. 3
    1
      common/rfb/SSecurityTLS.cxx

+ 3
- 1
common/rfb/CSecurityTLS.cxx Ver fichero

@@ -238,7 +238,9 @@ void CSecurityTLS::setParam()
const char *err;

#if GNUTLS_VERSION_NUMBER >= 0x030603
ret = gnutls_set_default_priority_append(session, kx_anon_priority, &err, 0);
// gnutls_set_default_priority_appends() expects a normal priority string that
// doesn't start with ":".
ret = gnutls_set_default_priority_append(session, kx_anon_priority + 1, &err, 0);
if (ret != GNUTLS_E_SUCCESS) {
if (ret == GNUTLS_E_INVALID_REQUEST)
vlog.error("GnuTLS priority syntax error at: %s", err);

+ 3
- 1
common/rfb/SSecurityTLS.cxx Ver fichero

@@ -229,7 +229,9 @@ void SSecurityTLS::setParams(gnutls_session_t session)
const char *err;

#if GNUTLS_VERSION_NUMBER >= 0x030603
ret = gnutls_set_default_priority_append(session, kx_anon_priority, &err, 0);
// gnutls_set_default_priority_appends() expects a normal priority string that
// doesn't start with ":".
ret = gnutls_set_default_priority_append(session, kx_anon_priority + 1, &err, 0);
if (ret != GNUTLS_E_SUCCESS) {
if (ret == GNUTLS_E_INVALID_REQUEST)
vlog.error("GnuTLS priority syntax error at: %s", err);

Cargando…
Cancelar
Guardar