Fix windows compilation
authorBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 4 Apr 2014 14:08:44 +0000 (10:08 -0400)
committerBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 4 Apr 2014 14:08:44 +0000 (10:08 -0400)
libfreerdp/core/transport.c
libfreerdp/crypto/tls.c

index ceb19c9..a99d007 100644 (file)
@@ -379,11 +379,12 @@ BOOL transport_tsg_connect(rdpTransport* transport, const char* hostname, UINT16
        int tls_status;
        freerdp* instance;
        rdpContext* context;
+       rdpTsg* tsg;
 
        instance = (freerdp*) transport->settings->instance;
        context = instance->context;
 
-       rdpTsg* tsg = tsg_new(transport);
+       tsg = tsg_new(transport);
 
        tsg->transport = transport;
        transport->tsg = tsg;
index ea98e28..489b991 100644 (file)
@@ -219,13 +219,11 @@ int tls_connect(rdpTls* tls)
        {
                fprintf(stderr, "tls_connect: certificate not trusted, aborting.\n");
                tls_disconnect(tls);
-               tls_free_certificate(cert);
-               return verify_status;
        }
 
        tls_free_certificate(cert);
 
-       return (verify_status == 0) ? 0 : 1;
+       return verify_status;
 }
 
 BOOL tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_file)