about summary refs log tree commit diff
diff options
context:
space:
mode:
authorQuentin Rameau <quinq@fifth.space>2017-04-19 17:45:20 +0200
committerQuentin Rameau <quinq@fifth.space>2017-04-19 17:45:20 +0200
commitee854bb09564f869c68d9d63ff8133cf9cf5fa10 (patch)
tree141de7566dfb528e75283eecc84a2da1adb976a2
parentSet strict ssl by default and handle insecure content (diff)
downloadsurf-ee854bb09564f869c68d9d63ff8133cf9cf5fa10.tar.gz
surf-ee854bb09564f869c68d9d63ff8133cf9cf5fa10.tar.bz2
surf-ee854bb09564f869c68d9d63ff8133cf9cf5fa10.zip
Rename SSL instances to TLS
-rw-r--r--config.def.h2
-rw-r--r--surf.12
-rw-r--r--surf.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/config.def.h b/config.def.h
index fca81c3..32cda3c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -30,7 +30,7 @@ static Parameter defconfig[ParameterLast] = {
 	SETB(SiteQuirks,         1),
 	SETB(SpellChecking,      0),
 	SETV(SpellLanguages,     ((char *[]){ "en_US", NULL })),
-	SETB(StrictSSL,          1),
+	SETB(StrictTLS,          1),
 	SETB(Style,              1),
 	SETF(ZoomLevel,          1.0),
 };
diff --git a/surf.1 b/surf.1
index c1d339a..7309308 100644
--- a/surf.1
+++ b/surf.1
@@ -264,7 +264,7 @@ The second part of the indicators specifies modes of the web page itself.
 unencrypted
 .TP
 .B T
-encrypted (SSL)
+encrypted (TLS)
 .TP
 .B U
 attempted encryption but failed
diff --git a/surf.c b/surf.c
index 40c7fe4..d22de3e 100644
--- a/surf.c
+++ b/surf.c
@@ -80,7 +80,7 @@ typedef enum {
 	SiteQuirks,
 	SpellChecking,
 	SpellLanguages,
-	StrictSSL,
+	StrictTLS,
 	Style,
 	ZoomLevel,
 	ParameterLast,
@@ -710,7 +710,7 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 		return; /* do not update */
 	case SpellLanguages:
 		return; /* do nothing */
-	case StrictSSL:
+	case StrictTLS:
 		webkit_web_context_set_tls_errors_policy(
 		    webkit_web_view_get_context(c->view), a->b ?
 		    WEBKIT_TLS_ERRORS_POLICY_FAIL :
@@ -960,9 +960,9 @@ newview(Client *c, WebKitWebView *rv)
 		 * or one for each view */
 		webkit_web_context_set_process_model(context,
 		    WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
-		/* ssl */
+		/* TLS */
 		webkit_web_context_set_tls_errors_policy(context,
-		    curconfig[StrictSSL].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
+		    curconfig[StrictTLS].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
 		    WEBKIT_TLS_ERRORS_POLICY_IGNORE);
 		/* disk cache */
 		webkit_web_context_set_cache_model(context,