← Back to branch summary

~ubuntu-branches/ubuntu/precise/vino/precise-proposed-201205170738

« back to all changes in this revision

Viewing changes to server/libvncserver/auth.c

  • Committer: Bazaar Package Importer
  • Author(s): Jeremy Bicha
  • Date: 2011-06-28 05:44:56 UTC
  • mfrom: (1.1.48 upstream)
  • Revision ID: james.westby@ubuntu.com-20110628054456-mppzwjz3fp7jkwfy
Tags: 3.1.2-0ubuntu1
* New upstream release
  - Renamed to "Desktop Sharing"
* debian/patches/02_server_sm-disable.patch
  - Refreshed
* debian/patches/04_no_am_gnu_gettext.patch
  - Dropped, applied upstream
* debian/watch
  - Corrected format

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/libvncserver/auth.c
64
64
static rfbBool
65
65
rfbAuthTLSHandshake(rfbClientPtr cl)
66
66
{
67
 
    static const int kx_priority[] = { GNUTLS_KX_ANON_DH, 0 };
 
67
    /* TODO: Perform non-anonymous key exchange to prevent man-in-the-middle
 
68
     * attacks. */
 
69
    static const char kx_priority[] = "NORMAL:+ANON-DH";
68
70
    int              err;
69
71
    
70
72
    gnutls_init(&cl->tlsSession, GNUTLS_SERVER);
71
73
 
72
74
    gnutls_set_default_priority(cl->tlsSession);
73
 
    gnutls_kx_set_priority(cl->tlsSession, kx_priority);
 
75
    gnutls_priority_set_direct(cl->tlsSession, kx_priority, NULL);
74
76
 
75
77
    gnutls_credentials_set(cl->tlsSession,
76
78
                           GNUTLS_CRD_ANON,