From: reyk <reyk@openbsd.org>
Date: Mon, 4 Aug 2014 11:09:25 +0000 (+0000)
Subject: httpd doesn't support SSL/TLS yet, remove the remaining bits.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=03cac5a418d47044a1a717c3ffb924fdc0e30bc4;p=openbsd

httpd doesn't support SSL/TLS yet, remove the remaining bits.
The secrect plan is to add it later using the ressl wrapper library.
---

diff --git a/usr.sbin/httpd/Makefile b/usr.sbin/httpd/Makefile
index e9de76c5026..bda39241aa8 100644
--- a/usr.sbin/httpd/Makefile
+++ b/usr.sbin/httpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2014/07/31 09:23:53 florian Exp $
+#	$OpenBSD: Makefile,v 1.23 2014/08/04 11:09:25 reyk Exp $
 
 PROG=		httpd
 SRCS=		parse.y
@@ -6,8 +6,8 @@ SRCS+=		config.c control.c httpd.c log.c proc.c
 SRCS+=		server.c server_http.c server_file.c server_fcgi.c
 MAN=		httpd.8 httpd.conf.5
 
-LDADD=		-levent -lssl -lcrypto -lutil
-DPADD=		${LIBEVENT} ${LIBSSL} ${LIBCRYPTO} ${LIBUTIL}
+LDADD=		-levent -lutil
+DPADD=		${LIBEVENT} ${LIBUTIL}
 #DEBUG=		-g -DDEBUG=3
 CFLAGS+=	-Wall -I${.CURDIR}
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes
diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c
index 42fcab6fe00..4f695f3d3b4 100644
--- a/usr.sbin/httpd/config.c
+++ b/usr.sbin/httpd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.12 2014/08/03 11:16:10 reyk Exp $	*/
+/*	$OpenBSD: config.c,v 1.13 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -36,14 +36,13 @@
 #include <event.h>
 #include <limits.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <netdb.h>
 #include <string.h>
 #include <ifaddrs.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 
 int	 config_getserver_config(struct httpd *, struct server *,
diff --git a/usr.sbin/httpd/control.c b/usr.sbin/httpd/control.c
index e68d3b4868b..e35f7b4aab9 100644
--- a/usr.sbin/httpd/control.c
+++ b/usr.sbin/httpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.2 2014/08/04 06:35:31 deraadt Exp $	*/
+/*	$OpenBSD: control.c,v 1.3 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -32,8 +32,6 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 
 #define	CONTROL_BACKLOG	5
diff --git a/usr.sbin/httpd/httpd.c b/usr.sbin/httpd/httpd.c
index e201b404e8e..c807dd4ed45 100644
--- a/usr.sbin/httpd/httpd.c
+++ b/usr.sbin/httpd/httpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: httpd.c,v 1.12 2014/08/02 09:54:13 reyk Exp $	*/
+/*	$OpenBSD: httpd.c,v 1.13 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -42,8 +42,6 @@
 #include <sha1.h>
 #include <md5.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 
 __dead void	 usage(void);
diff --git a/usr.sbin/httpd/log.c b/usr.sbin/httpd/log.c
index 059cac63b81..c500d2e413c 100644
--- a/usr.sbin/httpd/log.c
+++ b/usr.sbin/httpd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.1 2014/07/12 23:34:54 reyk Exp $	*/
+/*	$OpenBSD: log.c,v 1.2 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -37,8 +37,6 @@
 #include <netdb.h>
 #include <ctype.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 
 int	 debug;
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index add2ea7e14e..236e7f776cb 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.19 2014/08/03 20:43:03 reyk Exp $	*/
+/*	$OpenBSD: parse.y,v 1.20 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -53,8 +53,6 @@
 #include <ifaddrs.h>
 #include <syslog.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 #include "http.h"
 
diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c
index 714052d1868..8e522f0c4bd 100644
--- a/usr.sbin/httpd/proc.c
+++ b/usr.sbin/httpd/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.2 2014/08/04 06:35:10 deraadt Exp $	*/
+/*	$OpenBSD: proc.c,v 1.3 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -38,8 +38,6 @@
 #include <pwd.h>
 #include <event.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 
 void	 proc_open(struct privsep *, struct privsep_proc *,
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c
index d52c5dbcfa6..ac4c85ce5a1 100644
--- a/usr.sbin/httpd/server.c
+++ b/usr.sbin/httpd/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.24 2014/08/03 20:43:03 reyk Exp $	*/
+/*	$OpenBSD: server.c,v 1.25 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -43,9 +43,6 @@
 #include <event.h>
 #include <fnmatch.h>
 
-#include <openssl/dh.h>
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 
 int		 server_dispatch_parent(int, struct privsep_proc *,
diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c
index 53638ae187d..87e1eb43777 100644
--- a/usr.sbin/httpd/server_fcgi.c
+++ b/usr.sbin/httpd/server_fcgi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_fcgi.c,v 1.18 2014/08/03 22:06:51 florian Exp $	*/
+/*	$OpenBSD: server_fcgi.c,v 1.19 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2014 Florian Obser <florian@openbsd.org>
@@ -42,8 +42,6 @@
 #include <err.h>
 #include <event.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 #include "http.h"
 
diff --git a/usr.sbin/httpd/server_file.c b/usr.sbin/httpd/server_file.c
index 705bb9f07ac..b93b9292f7e 100644
--- a/usr.sbin/httpd/server_file.c
+++ b/usr.sbin/httpd/server_file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_file.c,v 1.27 2014/08/03 22:47:25 reyk Exp $	*/
+/*	$OpenBSD: server_file.c,v 1.28 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -43,8 +43,6 @@
 #include <err.h>
 #include <event.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 #include "http.h"
 
diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c
index bf1a3c8dff0..87516e6d117 100644
--- a/usr.sbin/httpd/server_http.c
+++ b/usr.sbin/httpd/server_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server_http.c,v 1.35 2014/08/04 06:35:10 deraadt Exp $	*/
+/*	$OpenBSD: server_http.c,v 1.36 2014/08/04 11:09:25 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -44,8 +44,6 @@
 #include <event.h>
 #include <fnmatch.h>
 
-#include <openssl/ssl.h>
-
 #include "httpd.h"
 #include "http.h"