Fix 27cec48 Add a flag/keybinding for strict TLS

Forgot to add changes in main(), usage() and newwindow() too.
This commit is contained in:
Quentin Rameau 2017-04-23 18:18:23 +02:00
parent 2940d2bd07
commit 5c52733984
1 changed files with 9 additions and 2 deletions

11
surf.c
View File

@ -246,7 +246,7 @@ char *argv0;
void void
usage(void) usage(void)
{ {
die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] " die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
"[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] " "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
} }
@ -817,7 +817,7 @@ newwindow(Client *c, const Arg *a, int noembed)
{ {
int i = 0; int i = 0;
char tmp[64]; char tmp[64];
const char *cmd[27], *uri; const char *cmd[28], *uri;
const Arg arg = { .v = cmd }; const Arg arg = { .v = cmd };
cmd[i++] = argv0; cmd[i++] = argv0;
@ -850,6 +850,7 @@ newwindow(Client *c, const Arg *a, int noembed)
cmd[i++] = scriptfile; cmd[i++] = scriptfile;
} }
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s"; cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
cmd[i++] = curconfig[StrictTLS].val.b ? "-T" : "-t";
if (fulluseragent && g_strcmp0(fulluseragent, "")) { if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u"; cmd[i++] = "-u";
cmd[i++] = fulluseragent; cmd[i++] = fulluseragent;
@ -1743,6 +1744,12 @@ main(int argc, char *argv[])
case 'S': case 'S':
defconfig CSETB(JavaScript, 1); defconfig CSETB(JavaScript, 1);
break; break;
case 't':
defconfig CSETB(StrictTLS, 0);
break;
case 'T':
defconfig CSETB(StrictTLS, 1);
break;
case 'u': case 'u':
fulluseragent = EARGF(usage()); fulluseragent = EARGF(usage());
break; break;