aboutsummaryrefslogtreecommitdiffstats
path: root/common/rdr/TLSInStream.h
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2015-01-29 13:12:22 +0100
committerPierre Ossman <ossman@cendio.se>2015-01-29 13:12:22 +0100
commit88c24edd8f7a793561104be50b6ecf2c85b42956 (patch)
tree7fac0647661a4594400ab88971541f9a1c66edcf /common/rdr/TLSInStream.h
parent31fa98b3197e5ed49617bb6e1f9efbfda98ac638 (diff)
downloadtigervnc-88c24edd8f7a793561104be50b6ecf2c85b42956.tar.gz
tigervnc-88c24edd8f7a793561104be50b6ecf2c85b42956.zip
Raise GnuTLS requirements to 3.x
This allows us to simplify things by getting rid of some old compatibility code. People should really be using current versions of GnuTLS anyway to stay secure.
Diffstat (limited to 'common/rdr/TLSInStream.h')
-rw-r--r--common/rdr/TLSInStream.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/rdr/TLSInStream.h b/common/rdr/TLSInStream.h
index 65a783c8..b16d9f5a 100644
--- a/common/rdr/TLSInStream.h
+++ b/common/rdr/TLSInStream.h
@@ -33,7 +33,7 @@ namespace rdr {
class TLSInStream : public InStream {
public:
- TLSInStream(InStream* in, gnutls_session session);
+ TLSInStream(InStream* in, gnutls_session_t session);
virtual ~TLSInStream();
int pos();
@@ -41,9 +41,9 @@ namespace rdr {
private:
int overrun(int itemSize, int nItems, bool wait);
int readTLS(U8* buf, int len, bool wait);
- static ssize_t pull(gnutls_transport_ptr str, void* data, size_t size);
+ static ssize_t pull(gnutls_transport_ptr_t str, void* data, size_t size);
- gnutls_session session;
+ gnutls_session_t session;
InStream* in;
int bufSize;
int offset;