Skip to content

Commit

Permalink
Merge branches 'argparse', 'nothread' and 'config' of https://github.…
Browse files Browse the repository at this point in the history
  • Loading branch information
CendioOssman committed Jan 10, 2025
4 parents 12e9e9e + 651ae03 + c77699d + df67cd5 commit 87a2e83
Show file tree
Hide file tree
Showing 43 changed files with 1,314 additions and 1,152 deletions.
6 changes: 2 additions & 4 deletions common/rfb/CSecurityTLS.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,9 @@ using namespace rfb;
static const char* configdirfn(const char* fn);

StringParameter CSecurityTLS::X509CA("X509CA", "X509 CA certificate",
configdirfn("x509_ca.pem"),
ConfViewer);
configdirfn("x509_ca.pem"));
StringParameter CSecurityTLS::X509CRL("X509CRL", "X509 CRL file",
configdirfn("x509_crl.pem"),
ConfViewer);
configdirfn("x509_crl.pem"));

static LogWriter vlog("TLS");

Expand Down
Loading

0 comments on commit 87a2e83

Please sign in to comment.