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 12eed8f42ea50cb0271b6b623112d363cf261451..521f7060f0ea1ac75fce9696340e8d92a7748d09 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -36,7 +36,7 @@ using namespace rfb;
 using namespace rdr;\r
 using namespace std;\r
 \r
-CSecurityVeNCrypt::CSecurityVeNCrypt(void) : csecurityStack(NULL)\r
+CSecurityVeNCrypt::CSecurityVeNCrypt(void) : csecurity(NULL)\r
 {\r
   haveRecvdMajorVersion = false;\r
   haveRecvdMinorVersion = false;\r
@@ -169,7 +169,7 @@ bool CSecurityVeNCrypt::processMsg(CConnection* cc)
        case secTypeX509None:\r
        case secTypeX509Vnc:\r
        case secTypeX509Plain:\r
-         csecurityStack = CSecurityVeNCrypt::getCSecurityStack(chosenType);\r
+         csecurity = CSecurityVeNCrypt::getCSecurityStack(chosenType);\r
          break;\r
 \r
        case secTypeInvalid:\r
@@ -193,7 +193,7 @@ bool CSecurityVeNCrypt::processMsg(CConnection* cc)
     throw AuthFailureException("The server reported 0 VeNCrypt sub-types");\r
   }\r
 \r
-  return csecurityStack->processMsg(cc);\r
+  return csecurity->processMsg(cc);\r
 }\r
 \r
 CSecurityStack* CSecurityVeNCrypt::getCSecurityStack(int secType)\r

diff --git a/common/rfb/CSecurityVeNCrypt.h b/common/rfb/CSecurityVeNCrypt.h
index b466ba7c974325178bc8f77511378b86e91f0e0d..7280546a5ba2675c9c5a61afe37cee43cbd9ec87 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.h
+++ b/common/rfb/CSecurityVeNCrypt.h
@@ -45,7 +45,7 @@ namespace rfb {
   protected:\r
     static CSecurityStack* getCSecurityStack(int secType);\r
 \r
-    CSecurityStack *csecurityStack;\r
+    CSecurity *csecurity;\r
     bool haveRecvdMajorVersion;\r
     bool haveRecvdMinorVersion;\r
     bool haveSentVersion;\r

diff --git a/common/rfb/SSecurityVeNCrypt.cxx b/common/rfb/SSecurityVeNCrypt.cxx
index 860e440b59b94748830b56d3603f850cedc27c88..b8f9b5773d7b88f7ce7126728a4c94a150b1ebb0 100644 (file)
--- a/common/rfb/SSecurityVeNCrypt.cxx
+++ b/common/rfb/SSecurityVeNCrypt.cxx
@@ -62,7 +62,7 @@ StringParameter SSecurityVeNCrypt::secTypesStr
 \r
 SSecurityVeNCrypt::SSecurityVeNCrypt(void)\r
 {\r
-  ssecurityStack = NULL;\r
+  ssecurity = NULL;\r
   haveSentVersion = false;\r
   haveRecvdMajorVersion = false;\r
   haveRecvdMinorVersion = false;\r
@@ -186,7 +186,7 @@ bool SSecurityVeNCrypt::processMsg(SConnection* sc)
     case secTypeX509None:\r
     case secTypeX509Vnc:\r
     case secTypeX509Plain:\r
-      ssecurityStack = SSecurityVeNCrypt::getSSecurityStack(chosenType);\r
+      ssecurity = SSecurityVeNCrypt::getSSecurityStack(chosenType);\r
        break;  \r
     case secTypeInvalid:\r
     case secTypeVeNCrypt: /* This would cause looping */\r
@@ -197,7 +197,7 @@ bool SSecurityVeNCrypt::processMsg(SConnection* sc)
   }\r
 \r
   /* continue processing the messages */\r
-  return ssecurityStack->processMsg(sc);\r
+  return ssecurity->processMsg(sc);\r
 }\r
 \r
 SSecurityStack* SSecurityVeNCrypt::getSSecurityStack(int secType)\r

diff --git a/common/rfb/SSecurityVeNCrypt.h b/common/rfb/SSecurityVeNCrypt.h
index bedb6e22b0b2579d184d4cb498ebd62b9e4a6a2e..fb24bdb420c32838b0de442ffe966c618e261d6d 100644 (file)
--- a/common/rfb/SSecurityVeNCrypt.h
+++ b/common/rfb/SSecurityVeNCrypt.h
@@ -65,7 +65,7 @@ namespace rfb {
   protected:\r
     static SSecurityStack* getSSecurityStack(int secType);\r
 \r
-    SSecurityStack *ssecurityStack;\r
+    SSecurity *ssecurity;\r
     bool haveSentVersion, haveRecvdMajorVersion, haveRecvdMinorVersion;\r
     bool haveSentTypes, haveChosenType;\r
     rdr::U8 majorVersion, minorVersion, numTypes;\r