← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freerdp/trusty-proposed

« back to all changes in this revision

Viewing changes to libfreerdp-core/tls.c

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2012-11-16 23:08:42 UTC
  • mfrom: (9.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20121116230842-mnisn295dk1b0nzi
Tags: 1.0.1-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control, debian/rules: Drop avcodec/ffmpeg support
  - debian/patches/remote-control.diff: Fix crash in Remote Control
  - debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch:
    Fix freerdp extension handling problem.
  - debian/patches/backport-from-stdin.patch: Add --from-stdin
  - debian/patches/allow-null-domain.patch: Allow null domains from stdin
* debian/patches/cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879:
  - Dropped, included in Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libfreerdp-core/tls.c
73
73
{
74
74
        int connection_status;
75
75
 
76
 
        tls->ctx = SSL_CTX_new(TLSv1_server_method());
 
76
        tls->ctx = SSL_CTX_new(SSLv23_server_method());
77
77
 
78
78
        if (tls->ctx == NULL)
79
79
        {
81
81
                return false;
82
82
        }
83
83
 
 
84
        /*
 
85
         * We only want SSLv3 and TLSv1, so disable SSLv2.
 
86
         * SSLv3 is used by, eg. Microsoft RDC for Mac OS X.
 
87
         */
 
88
        SSL_CTX_set_options(tls->ctx, SSL_OP_NO_SSLv2);
 
89
 
84
90
        if (SSL_CTX_use_RSAPrivateKey_file(tls->ctx, privatekey_file, SSL_FILETYPE_PEM) <= 0)
85
91
        {
86
92
                printf("SSL_CTX_use_RSAPrivateKey_file failed\n");