Like previously done in relayd, change the keyword "ssl" to "tls" to

reflect reality.

OK benno@

1 files changed, 30 insertions, 30 deletions

diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index f02334f1392..849d35088d0 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.43 2014/12/04 02:44:42 tedu Exp $	*/
+/*	$OpenBSD: parse.y,v 1.44 2014/12/12 14:45:59 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -129,12 +129,12 @@ typedef struct {
 %token	ACCESS AUTO BACKLOG BODY BUFFER CERTIFICATE CHROOT CIPHERS COMMON
 %token	COMBINED CONNECTION DIRECTORY ERR FCGI INDEX IP KEY LISTEN LOCATION
 %token	LOG LOGDIR MAXIMUM NO NODELAY ON PORT PREFORK REQUEST REQUESTS ROOT
-%token	SACK SERVER SOCKET SSL STYLE SYSLOG TCP TIMEOUT TYPES
+%token	SACK SERVER SOCKET STYLE SYSLOG TCP TIMEOUT TLS TYPES 
 %token	ERROR INCLUDE
 %token	<v.string>	STRING
 %token  <v.number>	NUMBER
 %type	<v.port>	port
-%type	<v.number>	optssl
+%type	<v.number>	opttls
 %type	<v.tv>		timeout
 %type	<v.string>	numberstring
 
@@ -173,8 +173,8 @@ varset		: STRING '=' STRING	{
 		}
 		;
 
-optssl		: /*empty*/	{ $$ = 0; }
-		| SSL		{ $$ = 1; }
+opttls		: /*empty*/	{ $$ = 0; }
+		| TLS		{ $$ = 1; }
 		;
 
 main		: PREFORK NUMBER	{
@@ -230,14 +230,14 @@ server		: SERVER STRING		{
 			s->srv_conf.maxrequestbody = SERVER_MAXREQUESTBODY;
 			s->srv_conf.flags |= SRVFLAG_LOG;
 			s->srv_conf.logformat = LOG_FORMAT_COMMON;
-			if ((s->srv_conf.ssl_cert_file =
-			    strdup(HTTPD_SSL_CERT)) == NULL)
+			if ((s->srv_conf.tls_cert_file =
+			    strdup(HTTPD_TLS_CERT)) == NULL)
 				fatal("out of memory");
-			if ((s->srv_conf.ssl_key_file =
-			    strdup(HTTPD_SSL_KEY)) == NULL)
+			if ((s->srv_conf.tls_key_file =
+			    strdup(HTTPD_TLS_KEY)) == NULL)
 				fatal("out of memory");
-			strlcpy(s->srv_conf.ssl_ciphers, HTTPD_SSL_CIPHERS,
-			    sizeof(s->srv_conf.ssl_ciphers));
+			strlcpy(s->srv_conf.tls_ciphers, HTTPD_TLS_CIPHERS,
+			    sizeof(s->srv_conf.tls_ciphers));
 
 			if (last_server_id == INT_MAX) {
 				yyerror("too many servers defined");
@@ -278,7 +278,7 @@ server		: SERVER STRING		{
 				YYERROR;
 			}
 
-			if (server_ssl_load_keypair(srv) == -1) {
+			if (server_tls_load_keypair(srv) == -1) {
 				yyerror("failed to load public/private keys "
 				    "for server %s", srv->srv_conf.name);
 				serverconfig_free(srv_conf);
@@ -300,7 +300,7 @@ serveropts_l	: serveropts_l serveroptsl nl
 		| serveroptsl optnl
 		;
 
-serveroptsl	: LISTEN ON STRING optssl port {
+serveroptsl	: LISTEN ON STRING opttls port {
 			struct addresslist	 al;
 			struct address		*h;
 			struct server		*s;
@@ -338,7 +338,7 @@ serveroptsl	: LISTEN ON STRING optssl port {
 			host_free(&al);
 
 			if ($4) {
-				s->srv_conf.flags |= SRVFLAG_SSL;
+				s->srv_conf.flags |= SRVFLAG_TLS;
 			}
 		}
 		| TCP			{
@@ -353,12 +353,12 @@ serveroptsl	: LISTEN ON STRING optssl port {
 				YYERROR;
 			}
 		} connection
-		| SSL			{
+		| TLS			{
 			if (parentsrv != NULL) {
-				yyerror("ssl configuration inside location");
+				yyerror("tls configuration inside location");
 				YYERROR;
 			}
-		} ssl
+		} tls
 		| ROOT STRING		{
 			if (strlcpy(srv->srv_conf.root, $2,
 			    sizeof(srv->srv_conf.root)) >=
@@ -518,30 +518,30 @@ conflags	: TIMEOUT timeout		{
 		}
 		;
 
-ssl		: '{' sslopts_l '}'
-		| sslopts
+tls		: '{' tlsopts_l '}'
+		| tlsopts
 		;
 
-sslopts_l	: sslopts comma sslopts_l
-		| sslopts
+tlsopts_l	: tlsopts comma tlsopts_l
+		| tlsopts
 		;
 
-sslopts		: CERTIFICATE STRING		{
-			free(srv_conf->ssl_cert_file);
-			if ((srv_conf->ssl_cert_file = strdup($2)) == NULL)
+tlsopts		: CERTIFICATE STRING		{
+			free(srv_conf->tls_cert_file);
+			if ((srv_conf->tls_cert_file = strdup($2)) == NULL)
 				fatal("out of memory");
 			free($2);
 		}
 		| KEY STRING			{
-			free(srv_conf->ssl_key_file);
-			if ((srv_conf->ssl_key_file = strdup($2)) == NULL)
+			free(srv_conf->tls_key_file);
+			if ((srv_conf->tls_key_file = strdup($2)) == NULL)
 				fatal("out of memory");
 			free($2);
 		}
 		| CIPHERS STRING		{
-			if (strlcpy(srv_conf->ssl_ciphers, $2,
-			    sizeof(srv_conf->ssl_ciphers)) >=
-			    sizeof(srv_conf->ssl_ciphers)) {
+			if (strlcpy(srv_conf->tls_ciphers, $2,
+			    sizeof(srv_conf->tls_ciphers)) >=
+			    sizeof(srv_conf->tls_ciphers)) {
 				yyerror("ciphers too long");
 				free($2);
 				YYERROR;
@@ -886,11 +886,11 @@ lookup(char *s)
 		{ "sack",		SACK },
 		{ "server",		SERVER },
 		{ "socket",		SOCKET },
-		{ "ssl",		SSL },
 		{ "style",		STYLE },
 		{ "syslog",		SYSLOG },
 		{ "tcp",		TCP },
 		{ "timeout",		TIMEOUT },
+		{ "tls",		TLS },
 		{ "types",		TYPES }
 	};
 	const struct keywords	*p;