noinst_LTLIBRARIES = librfb.la
VENCRYPT_HDRS = CSecurityTLS.h CSecurityTLSBase.h CSecurityX509.h \
- SSecurityTLS.h SSecurityTLSBase.h SSecurityX509.h
+ SSecurityTLSBase.h
VENCRYPT_SRCS = CSecurityTLS.cxx CSecurityTLSBase.cxx CSecurityX509.cxx \
- SSecurityTLS.cxx SSecurityTLSBase.cxx SSecurityX509.cxx
+ SSecurityTLSBase.cxx
HDRS = Blacklist.h CapsContainer.h CapsList.h CConnection.h \
CMsgHandler.h CMsgReader.h CMsgReaderV3.h CMsgWriter.h \
+++ /dev/null
-/*
- * Copyright (C) 2004 Red Hat Inc.
- * Copyright (C) 2005 Martin Koegler
- * Copyright (C) 2010 TigerVNC Team
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef HAVE_GNUTLS
-#error "This source should not be compiled without HAVE_GNUTLS defined"
-#endif
-
-#include <rfb/SSecurityTLS.h>
-#include <rfb/Exception.h>
-
-#define DH_BITS 1024
-
-#undef TLS_DEBUG
-
-using namespace rfb;
-
-SSecurityTLS::SSecurityTLS() : dh_params(0), anon_cred(0)
-{
-}
-
-SSecurityTLS::~SSecurityTLS()
-{
- shutdown();
- if (dh_params)
- gnutls_dh_params_deinit(dh_params);
- if (anon_cred)
- gnutls_anon_free_server_credentials(anon_cred);
-}
-
-void SSecurityTLS::freeResources()
-{
- if (dh_params)
- gnutls_dh_params_deinit(dh_params);
- dh_params = 0;
- if (anon_cred)
- gnutls_anon_free_server_credentials(anon_cred);
- anon_cred = 0;
-}
-
-void SSecurityTLS::setParams(gnutls_session session)
-{
- static const int kx_priority[] = {GNUTLS_KX_ANON_DH, 0};
- gnutls_kx_set_priority(session, kx_priority);
-
- if (gnutls_anon_allocate_server_credentials(&anon_cred) != GNUTLS_E_SUCCESS)
- throw AuthFailureException("gnutls_anon_allocate_server_credentials failed");
-
- if (gnutls_dh_params_init(&dh_params) != GNUTLS_E_SUCCESS)
- throw AuthFailureException("gnutls_dh_params_init failed");
-
- if (gnutls_dh_params_generate2(dh_params, DH_BITS) != GNUTLS_E_SUCCESS)
- throw AuthFailureException("gnutls_dh_params_generate2 failed");
-
- gnutls_anon_set_server_dh_params(anon_cred, dh_params);
-
- if (gnutls_credentials_set(session, GNUTLS_CRD_ANON, anon_cred)
- != GNUTLS_E_SUCCESS)
- throw AuthFailureException("gnutls_credentials_set failed");
-
-}
-
+++ /dev/null
-/* \r
- * Copyright (C) 2004 Red Hat Inc.\r
- * Copyright (C) 2005 Martin Koegler\r
- * Copyright (C) 2010 TigerVNC Team\r
- * \r
- * This is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- * \r
- * This software is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this software; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\r
- * USA.\r
- */\r
-\r
-#ifndef __S_SECURITY_TLS_H__\r
-#define __S_SECURITY_TLS_H__\r
-\r
-#ifdef HAVE_CONFIG_H\r
-#include <config.h>\r
-#endif\r
-\r
-#ifndef HAVE_GNUTLS\r
-#error "This header should not be included without HAVE_GNUTLS defined"\r
-#endif\r
-\r
-#include <rfb/SSecurityTLSBase.h>\r
-#include <rfb/SSecurityVeNCrypt.h>\r
-\r
-namespace rfb {\r
-\r
- class SSecurityTLS : public SSecurityTLSBase {\r
- public:\r
- SSecurityTLS();\r
- virtual ~SSecurityTLS();\r
- virtual int getType() const {return secTypeTLSNone;}\r
- protected:\r
- virtual void freeResources();\r
- virtual void setParams(gnutls_session session);\r
-\r
- private:\r
- static void initGlobal();\r
-\r
- gnutls_dh_params dh_params;\r
- gnutls_anon_server_credentials anon_cred;\r
- };\r
-\r
-}\r
-\r
-#endif /* __S_SECURITY_TLS_H__ */\r
#include <rdr/TLSInStream.h>
#include <rdr/TLSOutStream.h>
+#define DH_BITS 1024 /* XXX This should be configurable! */
#define TLS_DEBUG
using namespace rfb;
+StringParameter SSecurityTLSBase::X509_CertFile
+("x509cert", "specifies path to the x509 certificate in PEM format", "", ConfServer);
+
+StringParameter SSecurityTLSBase::X509_KeyFile
+("x509key", "specifies path to the key of the x509 certificate in PEM format", "", ConfServer);
+
static LogWriter vlog("TLS");
#ifdef TLS_DEBUG
}
}
-SSecurityTLSBase::SSecurityTLSBase() : session(0)
+SSecurityTLSBase::SSecurityTLSBase(bool _anon) : session(0), dh_params(0),
+ anon_cred(0), cert_cred(0),
+ anon(_anon), fis(0), fos(0)
{
- fis=0;
- fos=0;
+ certfile = X509_CertFile.getData();
+ keyfile = X509_KeyFile.getData();
}
void SSecurityTLSBase::shutdown()
{
- if(session)
- ;//gnutls_bye(session, GNUTLS_SHUT_RDWR);
-}
+ if (session) {
+ if (gnutls_bye(session, GNUTLS_SHUT_RDWR) != GNUTLS_E_SUCCESS) {
+ /* FIXME: Treat as non-fatal error */
+ vlog.error("TLS session wasn't terminated gracefully");
+ }
+ }
+ if (dh_params) {
+ gnutls_dh_params_deinit(dh_params);
+ dh_params = 0;
+ }
+
+ if (anon_cred) {
+ gnutls_anon_free_server_credentials(anon_cred);
+ anon_cred = 0;
+ }
+
+ if (cert_cred) {
+ gnutls_certificate_free_credentials(cert_cred);
+ cert_cred = 0;
+ }
-SSecurityTLSBase::~SSecurityTLSBase()
-{
if (session) {
- //gnutls_bye(session, GNUTLS_SHUT_RDWR);
gnutls_deinit(session);
+ session = 0;
+
+ gnutls_global_deinit();
}
- if(fis)
+}
+
+
+SSecurityTLSBase::~SSecurityTLSBase()
+{
+ shutdown();
+
+ if (fis)
delete fis;
- if(fos)
+ if (fos)
delete fos;
- /* FIXME: should be doing gnutls_global_deinit() at some point */
+
+ delete[] keyfile;
+ delete[] certfile;
}
bool SSecurityTLSBase::processMsg(SConnection *sc)
return false;
}
vlog.error("TLS Handshake failed: %s", gnutls_strerror (err));
- gnutls_bye(session, GNUTLS_SHUT_RDWR);
- freeResources();
- gnutls_deinit(session);
- session = 0;
+ shutdown();
throw AuthFailureException("TLS Handshake failed");
}
return true;
}
+void SSecurityTLSBase::setParams(gnutls_session session)
+{
+ static const int kx_anon_priority[] = { GNUTLS_KX_ANON_DH, 0 };
+ static const int kx_priority[] = { GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA,
+ GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0 };
+
+ gnutls_kx_set_priority(session, anon ? kx_anon_priority : kx_priority);
+
+ if (gnutls_dh_params_init(&dh_params) != GNUTLS_E_SUCCESS)
+ throw AuthFailureException("gnutls_dh_params_init failed");
+
+ if (gnutls_dh_params_generate2(dh_params, DH_BITS) != GNUTLS_E_SUCCESS)
+ throw AuthFailureException("gnutls_dh_params_generate2 failed");
+
+ if (anon) {
+ if (gnutls_anon_allocate_server_credentials(&anon_cred) != GNUTLS_E_SUCCESS)
+ throw AuthFailureException("gnutls_anon_allocate_server_credentials failed");
+
+ gnutls_anon_set_server_dh_params(anon_cred, dh_params);
+
+ if (gnutls_credentials_set(session, GNUTLS_CRD_ANON, anon_cred)
+ != GNUTLS_E_SUCCESS)
+ throw AuthFailureException("gnutls_credentials_set failed");
+
+ vlog.debug("Anonymous session has been set");
+
+ } else {
+ if (gnutls_certificate_allocate_credentials(&cert_cred) != GNUTLS_E_SUCCESS)
+ throw AuthFailureException("gnutls_certificate_allocate_credentials failed");
+
+ gnutls_certificate_set_dh_params(cert_cred, dh_params);
+
+ if (gnutls_certificate_set_x509_key_file(cert_cred, certfile, keyfile,
+ GNUTLS_X509_FMT_PEM) != GNUTLS_E_SUCCESS)
+ throw AuthFailureException("load of key failed");
+
+ if (gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, cert_cred)
+ != GNUTLS_E_SUCCESS)
+ throw AuthFailureException("gnutls_credentials_set failed");
+
+ vlog.debug("X509 session has been set");
+
+ }
+
+}
#endif
#include <rfb/SSecurity.h>
+#include <rfb/SSecurityVeNCrypt.h>
#include <rdr/InStream.h>
#include <rdr/OutStream.h>
#include <gnutls/gnutls.h>
class SSecurityTLSBase : public SSecurity {
public:
- SSecurityTLSBase();
+ SSecurityTLSBase(bool _anon);
virtual ~SSecurityTLSBase();
virtual bool processMsg(SConnection* sc);
virtual const char* getUserName() const {return 0;}
+ virtual int getType() const { return anon ? secTypeTLSNone : secTypeX509None;}
+
+ static StringParameter X509_CertFile;
+ static StringParameter X509_KeyFile;
protected:
void shutdown();
- virtual void freeResources()=0;
- virtual void setParams(gnutls_session session)=0;
+ void setParams(gnutls_session session);
private:
static void initGlobal();
gnutls_session session;
+ gnutls_dh_params dh_params;
+ gnutls_anon_server_credentials anon_cred;
+ gnutls_certificate_credentials cert_cred;
+ char *keyfile, *certfile;
+
+ int type;
+ bool anon;
+
rdr::InStream* fis;
rdr::OutStream* fos;
};
+++ /dev/null
-/*
- * Copyright (C) 2005 Martin Koegler
- * Copyright (C) 2010 TigerVNC Team
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef HAVE_GNUTLS
-#error "This source should not be compiled without HAVE_GNUTLS defined"
-#endif
-
-#include <rfb/SSecurityX509.h>
-#include <rfb/Exception.h>
-
-#define DH_BITS 1024
-
-using namespace rfb;
-
-StringParameter SSecurityX509::X509_CertFile
-("x509cert", "specifies path to the x509 certificate in PEM format", "", ConfServer);
-
-StringParameter SSecurityX509::X509_KeyFile
-("x509key", "specifies path to the key of the x509 certificate in PEM format", "", ConfServer);
-
-SSecurityX509::SSecurityX509() : dh_params(0), cert_cred(0)
-{
- certfile = X509_CertFile.getData();
- keyfile = X509_KeyFile.getData();
-}
-
-SSecurityX509::~SSecurityX509()
-{
- shutdown();
- if (dh_params)
- gnutls_dh_params_deinit(dh_params);
- if (cert_cred)
- gnutls_certificate_free_credentials(cert_cred);
- delete[] keyfile;
- delete[] certfile;
-}
-
-void SSecurityX509::freeResources()
-{
- if (dh_params)
- gnutls_dh_params_deinit(dh_params);
- dh_params=0;
- if (cert_cred)
- gnutls_certificate_free_credentials(cert_cred);
- cert_cred=0;
-}
-
-void SSecurityX509::setParams(gnutls_session session)
-{
- static const int kx_priority[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0};
- gnutls_kx_set_priority(session, kx_priority);
-
- if (gnutls_certificate_allocate_credentials(&cert_cred) < 0)
- goto error;
- if (gnutls_dh_params_init(&dh_params) < 0)
- goto error;
- if (gnutls_dh_params_generate2(dh_params, DH_BITS) < 0)
- goto error;
- gnutls_certificate_set_dh_params(cert_cred, dh_params);
- if (gnutls_certificate_set_x509_key_file(cert_cred, certfile, keyfile,GNUTLS_X509_FMT_PEM) < 0)
- throw AuthFailureException("load of key failed");
- if (gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, cert_cred) < 0)
- goto error;
- return;
-
- error:
- throw AuthFailureException("setParams failed");
-}
-
+++ /dev/null
-/* \r
- * Copyright (C) 2006 OCCAM Financial Technology\r
- * Copyright (C) 2010 TigerVNC Team\r
- * \r
- * This is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- * \r
- * This software is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
- * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this software; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\r
- * USA.\r
- */\r
-\r
-#ifndef __S_SECURITY_X509_H__\r
-#define __S_SECURITY_X509_H__\r
-\r
-#ifdef HAVE_CONFIG_H\r
-#include <config.h>\r
-#endif\r
-\r
-#ifndef HAVE_GNUTLS\r
-#error "This header should not be compiled without HAVE_GNUTLS defined"\r
-#endif\r
-\r
-#include <rfb/SSecurityTLSBase.h>\r
-#include <rfb/SSecurityVeNCrypt.h>\r
-\r
-namespace rfb {\r
-\r
- class SSecurityX509 : public SSecurityTLSBase {\r
- public:\r
- SSecurityX509();\r
- virtual ~SSecurityX509();\r
- virtual int getType() const { return secTypeX509None; }\r
-\r
- static StringParameter X509_CertFile;\r
- static StringParameter X509_KeyFile;\r
-\r
- protected:\r
- virtual void freeResources();\r
- virtual void setParams(gnutls_session session);\r
-\r
- private:\r
- static void initGlobal();\r
-\r
- gnutls_dh_params dh_params;\r
- gnutls_certificate_credentials cert_cred;\r
- char* keyfile;\r
- char* certfile;\r
- };\r
-\r
-}\r
-\r
-#endif /* __S_SECURITY_TLS_H__ */\r
#ifdef HAVE_GNUTLS
#include <rfb/CSecurityTLS.h>
#include <rfb/CSecurityX509.h>
-#include <rfb/SSecurityTLS.h>
-#include <rfb/SSecurityX509.h>
+#include <rfb/SSecurityTLSBase.h>
#endif
#include <rfb/util.h>
case secTypeVeNCrypt: return new SSecurityVeNCrypt(this);
#ifdef HAVE_GNUTLS
case secTypeTLSNone:
- return new SSecurityStack(secTypeTLSNone, new SSecurityTLS());
+ return new SSecurityStack(secTypeTLSNone, new SSecurityTLSBase(true));
case secTypeTLSVnc:
- return new SSecurityStack(secTypeTLSVnc, new SSecurityTLS(), new SSecurityVncAuth());
+ return new SSecurityStack(secTypeTLSVnc, new SSecurityTLSBase(true), new SSecurityVncAuth());
case secTypeX509None:
- return new SSecurityStack(secTypeX509None, new SSecurityX509());
+ return new SSecurityStack(secTypeX509None, new SSecurityTLSBase(false));
case secTypeX509Vnc:
- return new SSecurityStack(secTypeX509None, new SSecurityX509(), new SSecurityVncAuth());
+ return new SSecurityStack(secTypeX509None, new SSecurityTLSBase(false), new SSecurityVncAuth());
#endif
}
projects / tigervnc.git / commitdiff