diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2017-11-30 21:14:25 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2017-11-30 21:18:29 -0500 |
| commit | 9a9f9f0ec170253f43cbf78a33a6b18f148e6259 (patch) | |
| tree | b47d113d92e98e943f220a9847d80de98d662e18 /java/com/tigervnc/rfb/SecurityClient.java | |
| parent | e7aea19a1444f4099959058dc72056fe13fd67fb (diff) | |
| download | tigervnc-9a9f9f0ec170253f43cbf78a33a6b18f148e6259.tar.gz tigervnc-9a9f9f0ec170253f43cbf78a33a6b18f148e6259.zip | |
Move UserPasswordGetter out of CConn
Diffstat (limited to 'java/com/tigervnc/rfb/SecurityClient.java')
| -rw-r--r-- | java/com/tigervnc/rfb/SecurityClient.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/java/com/tigervnc/rfb/SecurityClient.java b/java/com/tigervnc/rfb/SecurityClient.java index ff2433c2..d3557337 100644 --- a/java/com/tigervnc/rfb/SecurityClient.java +++ b/java/com/tigervnc/rfb/SecurityClient.java @@ -1,6 +1,6 @@ /* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. * Copyright (C) 2010 TigerVNC Team - * Copyright (C) 2011-2012 Brian P. Hinz + * Copyright (C) 2011-2017 Brian P. Hinz * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,16 +20,14 @@ package com.tigervnc.rfb; -import com.tigervnc.vncviewer.CConn; - public class SecurityClient extends Security { public SecurityClient() { super(secTypes); } public CSecurity GetCSecurity(int secType) { - assert (CConn.upg != null); /* (upg == null) means bug in the viewer */ - assert (msg != null); + assert (CSecurity.upg != null); /* (upg == null) means bug in the viewer */ + assert (CSecurityTLS.msg != null); if (!IsSupported(secType)) throw new Exception("Security type not supported"); @@ -75,9 +73,6 @@ public class SecurityClient extends Security { CSecurityTLS.setDefaults(); } - //UserPasswdGetter upg = null; - String msg = null; - public static StringParameter secTypes = new StringParameter("SecurityTypes", "Specify which security scheme to use (None, VncAuth, Plain, Ident, TLSNone, TLSVnc, TLSPlain, TLSIdent, X509None, X509Vnc, X509Plain, X509Ident)", |