Use {C,S}Security instead of {C,S}SecurityStack objects in VeNCrypt routines.
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4095 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/CSecurityVeNCrypt.cxx b/common/rfb/CSecurityVeNCrypt.cxx
index 12eed8f..521f706 100644
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -36,7 +36,7 @@
using namespace rdr;
using namespace std;
-CSecurityVeNCrypt::CSecurityVeNCrypt(void) : csecurityStack(NULL)
+CSecurityVeNCrypt::CSecurityVeNCrypt(void) : csecurity(NULL)
{
haveRecvdMajorVersion = false;
haveRecvdMinorVersion = false;
@@ -169,7 +169,7 @@
case secTypeX509None:
case secTypeX509Vnc:
case secTypeX509Plain:
- csecurityStack = CSecurityVeNCrypt::getCSecurityStack(chosenType);
+ csecurity = CSecurityVeNCrypt::getCSecurityStack(chosenType);
break;
case secTypeInvalid:
@@ -193,7 +193,7 @@
throw AuthFailureException("The server reported 0 VeNCrypt sub-types");
}
- return csecurityStack->processMsg(cc);
+ return csecurity->processMsg(cc);
}
CSecurityStack* CSecurityVeNCrypt::getCSecurityStack(int secType)