diff options
| author | runge <runge> | 2008-11-22 18:36:33 +0000 |
|---|---|---|
| committer | runge <runge> | 2008-11-22 18:36:33 +0000 |
| commit | 6fbba525a924961083bf2e43bb841bd15671f526 (patch) | |
| tree | 3ec0cf4b285fb0140294a151b801c91bc78a612e /x11vnc/ssltools.h | |
| parent | 63b98dba790fa9835e970b8502d93258862a9373 (diff) | |
| download | libtdevnc-6fbba525a924961083bf2e43bb841bd15671f526.tar.gz libtdevnc-6fbba525a924961083bf2e43bb841bd15671f526.zip | |
x11vnc: x11vnc.desktop file. -reopen, -dhparams, -sslCRL,
-setdefer options. -rfbport PROMPT VeNCrypt and TLSVNC SSL/TLS
encryption support. Tweaks to choose_delay() algorithm.
-ssl ANON anonymouse Diffie-Hellman mode. Fix bugs in certs
management. Additions to tray=setpass naive user mode.
Diffstat (limited to 'x11vnc/ssltools.h')
| -rw-r--r-- | x11vnc/ssltools.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index 0531ce2..4d7f251 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -228,7 +228,14 @@ char genCA[] = "echo \"----------------------------------------------------------------------\"\n" "echo \"\"\n" "\n" -"\"$OPENSSL\" req -config \"$DIR/CA/ssl.cnf\" -new -x509 \\\n" +"req_args=$REQ_ARGS\n" +"if echo \"$req_args\" | grep 'days' > /dev/null; then\n" +" :\n" +"else\n" +" req_args=\"$req_args -days 730\"\n" +"fi\n" +"\n" +"\"$OPENSSL\" req -config \"$DIR/CA/ssl.cnf\" -new -x509 -days 730 $req_args \\\n" " -keyout \"$DIR/CA/private/cakey.pem\" \\\n" " -out \"$DIR/CA/cacert.pem\"\n" "\n" @@ -394,8 +401,12 @@ char genCert[] = " echo \"time you start the VNC viewer SSL tunnel using this key.\"\n" " fi\n" " echo \"\"\n" -" printf \"Protect key with a passphrase? [y]/n \"\n" -" read x\n" +" if [ \"X$GENCERT_NOPROMPT\" = \"X\" ]; then\n" +" printf \"Protect key with a passphrase? [y]/n \"\n" +" read x\n" +" else\n" +" x=n\n" +" fi\n" " estr=\" *unencrypted*\"\n" " if [ \"x$ENCRYPT_ONLY\" != \"x\" ]; then\n" " target=\"$ENCRYPT_ONLY\"\n" @@ -448,8 +459,10 @@ char genCert[] = " echo \" This file should be kept secret.\"\n" " echo \"----------------------------------------------------------------------\"\n" " echo \"\"\n" -" printf \"Press Enter to print the $dest.req cert request to the screen: \"\n" -" read x\n" +" if [ \"X$GENCERT_NOPROMPT\" = \"X\" ]; then\n" +" printf \"Press Enter to print the $dest.req cert request to the screen: \"\n" +" read x\n" +" fi\n" " echo \"\"\n" " cat \"$DIR/$dest.req\"\n" " exit 0\n" @@ -507,8 +520,10 @@ char genCert[] = " echo \"\"\n" " fi\n" "\n" -" printf \"Press Enter to print the $dest.crt certificate to the screen: \"\n" -" read x\n" +" if [ \"X$GENCERT_NOPROMPT\" = \"X\" ]; then\n" +" printf \"Press Enter to print the $dest.crt certificate to the screen: \"\n" +" read x\n" +" fi\n" " echo \"\"\n" " cat \"$DIR/$dest.crt\"\n" "}\n" |