diff options
| author | Idan Freiberg <speidy@gmail.com> | 2014-07-15 18:29:40 +0300 |
|---|---|---|
| committer | Idan Freiberg <speidy@gmail.com> | 2014-07-15 18:29:40 +0300 |
| commit | f0b6c6b1d178419ae82ad1c8ea2d74c97cc2f27b (patch) | |
| tree | 4507c5940fa37c55c717dca7244faea0ed1507a5 /libxrdp/xrdp_sec.c | |
| parent | 5fcf6beffa3367b8b313bf4414ffd6b3419c76d1 (diff) | |
| download | xrdp-proprietary-f0b6c6b1d178419ae82ad1c8ea2d74c97cc2f27b.tar.gz xrdp-proprietary-f0b6c6b1d178419ae82ad1c8ea2d74c97cc2f27b.zip | |
libxrdp: started adding TLS support
Diffstat (limited to 'libxrdp/xrdp_sec.c')
| -rw-r--r-- | libxrdp/xrdp_sec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c index d726f3e8..c908c081 100644 --- a/libxrdp/xrdp_sec.c +++ b/libxrdp/xrdp_sec.c @@ -276,6 +276,8 @@ xrdp_sec_create(struct xrdp_rdp *owner, struct trans *trans, int crypt_level, &(self->server_mcs_data)); self->fastpath_layer = xrdp_fastpath_create(self, trans); self->chan_layer = xrdp_channel_create(self, self->mcs_layer); + //TODO: add cert to config + self->tls = xrdp_tls_create(trans, "/opt/xrdpdev/etc/xrdp/pkey.pem", "/opt/xrdpdev/etc/xrdp/cert.pem"); DEBUG((" out xrdp_sec_create")); return self; } @@ -298,6 +300,7 @@ xrdp_sec_delete(struct xrdp_sec *self) ssl_des3_info_delete(self->decrypt_fips_info); ssl_des3_info_delete(self->encrypt_fips_info); ssl_hmac_info_delete(self->sign_fips_info); + xrdp_tls_delete(self->tls); g_free(self->client_mcs_data.data); g_free(self->server_mcs_data.data); /* Crypto information must always be cleared */ @@ -2115,6 +2118,7 @@ xrdp_sec_disconnect(struct xrdp_sec *self) int rv; DEBUG((" in xrdp_sec_disconnect")); + rv = xrdp_mcs_disconnect(self->mcs_layer); DEBUG((" out xrdp_sec_disconnect")); return rv; |