summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd/httpd.h
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-08-06 16:09:03 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-08-06 16:09:03 +0000
commit4dc3cb30ddb8dcde45201b0f2228bf8caa450582 (patch)
tree15558c28c893752a8e206337636452de414c0431 /usr.sbin/httpd/httpd.h
parentd28c27aa6338648cee63b096c8da46393e60c136 (diff)
Configure the default SSL ciphers as HIGH:!aNULL.
ok deraadt@ reyk@
Diffstat (limited to 'usr.sbin/httpd/httpd.h')
-rw-r--r--usr.sbin/httpd/httpd.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h
index 41909705c03..c129860fb97 100644
--- a/usr.sbin/httpd/httpd.h
+++ b/usr.sbin/httpd/httpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: httpd.h,v 1.49 2014/08/06 15:08:04 florian Exp $ */
+/* $OpenBSD: httpd.h,v 1.50 2014/08/06 16:09:02 jsing Exp $ */
/*
* Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -38,8 +38,9 @@
#define HTTPD_LOGROOT "/logs"
#define HTTPD_ACCESS_LOG "access.log"
#define HTTPD_ERROR_LOG "error.log"
-#define HTTPD_SSL_KEY "/etc/ssl/private/server.key"
#define HTTPD_SSL_CERT "/etc/ssl/server.crt"
+#define HTTPD_SSL_KEY "/etc/ssl/private/server.key"
+#define HTTPD_SSL_CIPHERS "HIGH:!aNULL"
#define FD_RESERVE 5
#define SERVER_MAX_CLIENTS 1024
@@ -373,6 +374,7 @@ struct server_config {
char *ssl_cert;
off_t ssl_cert_len;
char *ssl_cert_file;
+ char ssl_ciphers[NAME_MAX];
char *ssl_key;
off_t ssl_key_len;
char *ssl_key_file;