Revision 7e7e2ebc ui/vnc-auth-sasl.c
| b/ui/vnc-auth-sasl.c | ||
|---|---|---|
| 538 | 538 |
|
| 539 | 539 |
#ifdef CONFIG_VNC_TLS |
| 540 | 540 |
/* Inform SASL that we've got an external SSF layer from TLS/x509 */ |
| 541 |
if (vs->vd->auth == VNC_AUTH_VENCRYPT &&
|
|
| 542 |
vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL) {
|
|
| 541 |
if (vs->auth == VNC_AUTH_VENCRYPT && |
|
| 542 |
vs->subauth == VNC_AUTH_VENCRYPT_X509SASL) {
|
|
| 543 | 543 |
gnutls_cipher_algorithm_t cipher; |
| 544 | 544 |
sasl_ssf_t ssf; |
| 545 | 545 |
|
| ... | ... | |
| 570 | 570 |
#ifdef CONFIG_VNC_TLS |
| 571 | 571 |
/* Disable SSF, if using TLS+x509+SASL only. TLS without x509 |
| 572 | 572 |
is not sufficiently strong */ |
| 573 |
|| (vs->vd->auth == VNC_AUTH_VENCRYPT &&
|
|
| 574 |
vs->vd->subauth == VNC_AUTH_VENCRYPT_X509SASL)
|
|
| 573 |
|| (vs->auth == VNC_AUTH_VENCRYPT && |
|
| 574 |
vs->subauth == VNC_AUTH_VENCRYPT_X509SASL) |
|
| 575 | 575 |
#endif /* CONFIG_VNC_TLS */ |
| 576 | 576 |
) {
|
| 577 | 577 |
/* If we've got TLS or UNIX domain sock, we don't care about SSF */ |
Also available in: Unified diff