From: Adam Tkac <atkac@redhat.com>
Date: Tue, 20 Jul 2010 15:09:33 +0000 (+0000)
Subject: [Development] Move VeNCrypt security subtypes into Security.h.
X-Git-Tag: v1.0.90~217
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00b395a4101fba5c35708fc8071d82962cb1866d;p=tigervnc.git

[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 fb24bdb4..cbbcb7fe 100644
--- a/common/rfb/SSecurityVeNCrypt.h
+++ b/common/rfb/SSecurityVeNCrypt.h
@@ -38,15 +38,6 @@
 
 namespace rfb {
 
-  /* 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;
-
   class SSecurityVeNCrypt : public SSecurity {
   public:
     SSecurityVeNCrypt(void);
diff --git a/common/rfb/Security.h b/common/rfb/Security.h
index f4c9681c..19019353 100644
--- 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;