Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save lethean/939e42f73fe5c7b542beed81ef10eab1 to your computer and use it in GitHub Desktop.
Save lethean/939e42f73fe5c7b542beed81ef10eab1 to your computer and use it in GitHub Desktop.
TigerVNC vncviewer `-PasswordText` parameter added
diff --git a/vncviewer/UserDialog.cxx b/vncviewer/UserDialog.cxx
index b57588d..287f790 100644
--- a/vncviewer/UserDialog.cxx
+++ b/vncviewer/UserDialog.cxx
@@ -61,10 +61,18 @@ UserDialog::~UserDialog()
void UserDialog::getUserPasswd(char** user, char** password)
{
+ CharArray passwordTextStr(passwordText.getData());
CharArray passwordFileStr(passwordFile.getData());
assert(password);
+ if (!user && passwordTextStr.buf[0]) {
+ ObfuscatedPasswd obfuscated(passwordTextStr.takeBuf());
+ PlainPasswd passwd(obfuscated);
+ *password = passwd.takeBuf();
+ return;
+ }
+
if (!user && passwordFileStr.buf[0]) {
ObfuscatedPasswd obfPwd(256);
FILE* fp;
diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index ad82f27..0a85ac7 100644
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -63,6 +63,9 @@ StringParameter passwordFile("PasswordFile",
"Password file for VNC authentication", "");
AliasParameter passwd("passwd", "Alias for PasswordFile", &passwordFile);
+StringParameter passwordText("PasswordText",
+ "Clear Text Password file for VNC authentication", "");
+
BoolParameter autoSelect("AutoSelect",
"Auto select pixel format and encoding. "
"Default if PreferredEncoding and FullColor are not specified.",
diff --git a/vncviewer/parameters.h b/vncviewer/parameters.h
index 682b6d6..0160233 100644
--- a/vncviewer/parameters.h
+++ b/vncviewer/parameters.h
@@ -26,6 +26,7 @@ extern rfb::IntParameter pointerEventInterval;
extern rfb::BoolParameter dotWhenNoCursor;
extern rfb::StringParameter passwordFile;
+extern rfb::StringParameter passwordText;
extern rfb::BoolParameter autoSelect;
extern rfb::BoolParameter fullColour;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment