Revision: 4921
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4921&view=rev
Author: ossman_
Date: 2012-07-03 14:43:38 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Refactor the TLS code so that the push/pull functions are aware of their
containing stream object. This is in preparation for supporting GnuTLS 3.x.
Modified Paths:
--------------
trunk/common/rdr/TLSInStream.cxx
trunk/common/rdr/TLSInStream.h
trunk/common/rdr/TLSOutStream.cxx
trunk/common/rdr/TLSOutStream.h
trunk/common/rfb/CSecurityTLS.cxx
trunk/common/rfb/SSecurityTLS.cxx
Modified: trunk/common/rdr/TLSInStream.cxx
===================================================================
--- trunk/common/rdr/TLSInStream.cxx 2012-06-02 18:45:26 UTC (rev 4920)
+++ trunk/common/rdr/TLSInStream.cxx 2012-07-03 14:43:38 UTC (rev 4921)
@@ -36,10 +36,10 @@
enum { DEFAULT_BUF_SIZE = 16384 };
-ssize_t rdr::gnutls_InStream_pull(gnutls_transport_ptr str, void* data,
- size_t size)
+ssize_t TLSInStream::pull(gnutls_transport_ptr str, void* data, size_t size)
{
- InStream* in= (InStream*) str;
+ TLSInStream* self= (TLSInStream*) str;
+ InStream *in = self->in;
try {
if (!in->check(1, 1, false)) {
@@ -63,11 +63,19 @@
TLSInStream::TLSInStream(InStream* _in, gnutls_session _session)
: session(_session), in(_in), bufSize(DEFAULT_BUF_SIZE), offset(0)
{
+ gnutls_transport_ptr recv, send;
+
ptr = end = start = new U8[bufSize];
+
+ gnutls_transport_set_pull_function(session, pull);
+ gnutls_transport_get_ptr2(session, &recv, &send);
+ gnutls_transport_set_ptr2(session, this, send);
}
TLSInStream::~TLSInStream()
{
+ gnutls_transport_set_pull_function(session, NULL);
+
delete[] start;
}
Modified: trunk/common/rdr/TLSInStream.h
===================================================================
--- trunk/common/rdr/TLSInStream.h 2012-06-02 18:45:26 UTC (rev 4920)
+++ trunk/common/rdr/TLSInStream.h 2012-07-03 14:43:38 UTC (rev 4921)
@@ -41,6 +41,7 @@
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);
gnutls_session session;
InStream* in;
@@ -48,9 +49,6 @@
int offset;
U8* start;
};
-
- ssize_t gnutls_InStream_pull(gnutls_transport_ptr,void*, size_t);
-
};
#endif
Modified: trunk/common/rdr/TLSOutStream.cxx
===================================================================
--- trunk/common/rdr/TLSOutStream.cxx 2012-06-02 18:45:26 UTC (rev 4920)
+++ trunk/common/rdr/TLSOutStream.cxx 2012-07-03 14:43:38 UTC (rev 4921)
@@ -36,10 +36,11 @@
enum { DEFAULT_BUF_SIZE = 16384 };
-ssize_t rdr::gnutls_OutStream_push(gnutls_transport_ptr str, const void* data,
+ssize_t TLSOutStream::push(gnutls_transport_ptr str, const void* data,
size_t size)
{
- OutStream* out = (OutStream*) str;
+ TLSOutStream* self= (TLSOutStream*) str;
+ OutStream *out = self->out;
try {
out->writeBytes(data, size);
@@ -55,8 +56,14 @@
TLSOutStream::TLSOutStream(OutStream* _out, gnutls_session _session)
: session(_session), out(_out), bufSize(DEFAULT_BUF_SIZE), offset(0)
{
+ gnutls_transport_ptr recv, send;
+
ptr = start = new U8[bufSize];
end = start + bufSize;
+
+ gnutls_transport_set_push_function(session, push);
+ gnutls_transport_get_ptr2(session, &recv, &send);
+ gnutls_transport_set_ptr2(session, recv, this);
}
TLSOutStream::~TLSOutStream()
@@ -67,6 +74,8 @@
} catch (Exception&) {
}
#endif
+ gnutls_transport_set_push_function(session, NULL);
+
delete [] start;
}
Modified: trunk/common/rdr/TLSOutStream.h
===================================================================
--- trunk/common/rdr/TLSOutStream.h 2012-06-02 18:45:26 UTC (rev 4920)
+++ trunk/common/rdr/TLSOutStream.h 2012-07-03 14:43:38 UTC (rev 4921)
@@ -43,6 +43,7 @@
private:
int writeTLS(const U8* data, int length);
+ static ssize_t push(gnutls_transport_ptr str, const void* data, size_t
size);
gnutls_session session;
OutStream* out;
@@ -50,8 +51,6 @@
U8* start;
int offset;
};
-
- ssize_t gnutls_OutStream_push(gnutls_transport_ptr, const void*, size_t);
};
#endif
Modified: trunk/common/rfb/CSecurityTLS.cxx
===================================================================
--- trunk/common/rfb/CSecurityTLS.cxx 2012-06-02 18:45:26 UTC (rev 4920)
+++ trunk/common/rfb/CSecurityTLS.cxx 2012-07-03 14:43:38 UTC (rev 4921)
@@ -188,20 +188,20 @@
throw AuthFailureException("gnutls_set_default_priority failed");
setParam();
-
- gnutls_transport_set_pull_function(session, rdr::gnutls_InStream_pull);
- gnutls_transport_set_push_function(session, rdr::gnutls_OutStream_push);
- gnutls_transport_set_ptr2(session,
- (gnutls_transport_ptr) is,
- (gnutls_transport_ptr) os);
}
+ rdr::TLSInStream *tlsis = new rdr::TLSInStream(is, session);
+ rdr::TLSOutStream *tlsos = new rdr::TLSOutStream(os, session);
+
int err;
err = gnutls_handshake(session);
- if (err != GNUTLS_E_SUCCESS && !gnutls_error_is_fatal(err))
- return false;
-
if (err != GNUTLS_E_SUCCESS) {
+ delete tlsis;
+ delete tlsos;
+
+ if (!gnutls_error_is_fatal(err))
+ return false;
+
vlog.error("TLS Handshake failed: %s\n", gnutls_strerror (err));
shutdown(false);
throw AuthFailureException("TLS Handshake failed");
@@ -209,8 +209,7 @@
checkSession();
- cc->setStreams(fis = new rdr::TLSInStream(is, session),
- fos = new rdr::TLSOutStream(os, session));
+ cc->setStreams(fis = tlsis, fos = tlsos);
return true;
}
Modified: trunk/common/rfb/SSecurityTLS.cxx
===================================================================
--- trunk/common/rfb/SSecurityTLS.cxx 2012-06-02 18:45:26 UTC (rev 4920)
+++ trunk/common/rfb/SSecurityTLS.cxx 2012-07-03 14:43:38 UTC (rev 4921)
@@ -148,17 +148,19 @@
throw;
}
- gnutls_transport_set_pull_function(session,rdr::gnutls_InStream_pull);
- gnutls_transport_set_push_function(session,rdr::gnutls_OutStream_push);
- gnutls_transport_set_ptr2(session,
- (gnutls_transport_ptr)is,
- (gnutls_transport_ptr)os);
os->writeU8(1);
os->flush();
}
+ rdr::TLSInStream *tlsis = new rdr::TLSInStream(is, session);
+ rdr::TLSOutStream *tlsos = new rdr::TLSOutStream(os, session);
+
int err;
- if ((err = gnutls_handshake(session)) != GNUTLS_E_SUCCESS) {
+ err = gnutls_handshake(session);
+ if (err != GNUTLS_E_SUCCESS) {
+ delete tlsis;
+ delete tlsos;
+
if (!gnutls_error_is_fatal(err)) {
vlog.debug("Deferring completion of TLS handshake: %s",
gnutls_strerror(err));
return false;
@@ -170,8 +172,7 @@
vlog.debug("Handshake completed");
- sc->setStreams(fis=new rdr::TLSInStream(is,session),
- fos=new rdr::TLSOutStream(os,session));
+ sc->setStreams(fis = tlsis, fos = tlsos);
return true;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
