[Development] Move VeNCrypt security subtypes into Security.h.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4096 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/SSecurityVeNCrypt.h b/common/rfb/SSecurityVeNCrypt.h
index fb24bdb420c32838b0de442ffe966c618e261d6d..cbbcb7fe487e1cab55df305690f5b003003aa850 100644 (file)
--- a/common/rfb/SSecurityVeNCrypt.h
+++ b/common/rfb/SSecurityVeNCrypt.h
@@ -38,15 +38,6 @@
 \r
 namespace rfb {\r
 \r
-  /* VeNCrypt subtypes */\r
-  const int secTypePlain       = 256;\r
-  const int secTypeTLSNone     = 257;\r
-  const int secTypeTLSVnc      = 258;\r
-  const int secTypeTLSPlain    = 259;\r
-  const int secTypeX509None    = 260;\r
-  const int secTypeX509Vnc     = 261;\r
-  const int secTypeX509Plain   = 262;\r
-\r
   class SSecurityVeNCrypt : public SSecurity {\r
   public:\r
     SSecurityVeNCrypt(void);\r

diff --git a/common/rfb/Security.h b/common/rfb/Security.h
index f4c9681ca2a715660f6b8287d618c0025563aecd..190193536996a0cbdbe43af663e25d3f1d024bfc 100644 (file)
--- a/common/rfb/Security.h
+++ b/common/rfb/Security.h
@@ -45,6 +45,15 @@ namespace rfb {
   const rdr::U8 secTypeTLS     = 18;
   const rdr::U8 secTypeVeNCrypt= 19;
 
+  /* VeNCrypt subtypes */
+  const int secTypePlain       = 256;
+  const int secTypeTLSNone     = 257;
+  const int secTypeTLSVnc      = 258;
+  const int secTypeTLSPlain    = 259;
+  const int secTypeX509None    = 260;
+  const int secTypeX509Vnc     = 261;
+  const int secTypeX509Plain   = 262;
+
   // result types
 
   const rdr::U32 secResultOK = 0;