Commented out SSLHonorCipherOrder in example configs; ok jsing@

2 files changed, 9 insertions, 1 deletions

diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf
index b5d38547d65..2a9715c582b 100644
--- a/usr.sbin/httpd/conf/httpd.conf
+++ b/usr.sbin/httpd/conf/httpd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: httpd.conf,v 1.26 2009/06/03 18:28:21 robert Exp $
+#	$OpenBSD: httpd.conf,v 1.27 2013/07/12 16:30:41 otto Exp $
 #
 # Based upon the NCSA server configuration files originally by Rob McCool.
 #
@@ -1035,6 +1035,10 @@ SSLEngine on
 #   See the mod_ssl documentation for a complete list.
 #SSLCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP
 
+#   SSL Honor Cipher Order:
+#   If on, use server's order of preference for ciphers.
+#SSLHonorCipherOrder on
+
 #   Server Certificate:
 #   Point SSLCertificateFile at a PEM encoded certificate.  If
 #   the certificate is encrypted, then you will be prompted for a
diff --git a/usr.sbin/httpd/conf/httpd.conf-dist b/usr.sbin/httpd/conf/httpd.conf-dist
index cf409f5b73f..e71f6169c74 100644
--- a/usr.sbin/httpd/conf/httpd.conf-dist
+++ b/usr.sbin/httpd/conf/httpd.conf-dist
@@ -1045,6 +1045,10 @@ SSLEngine on
 #   See the mod_ssl documentation for a complete list.
 SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
 
+#   SSL Honor Cipher Order:
+#   If on, use server's order of preference for ciphers.
+#SSLHonorCipherOrder on
+
 #   Server Certificate:
 #   Point SSLCertificateFile at a PEM encoded certificate.  If
 #   the certificate is encrypted, then you will be prompted for a