couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [06/11] couch commit: updated refs/heads/master to 7ab7995
Date Wed, 21 May 2014 16:53:21 GMT
Support for user configurable SSL ciphers


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/340313d9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/340313d9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/340313d9

Branch: refs/heads/master
Commit: 340313d9c42aa5d70fde6007fd5bc0ea41b137f5
Parents: 67389ff
Author: Terin Stock <terinjokes@gmail.com>
Authored: Sun Apr 20 11:40:25 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed May 21 15:17:13 2014 +0100

----------------------------------------------------------------------
 src/couch_httpd.erl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/340313d9/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index 0fc127a..f03f2d6 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -38,11 +38,17 @@ start_link(http) ->
     start_link(?MODULE, [{port, Port}]);
 start_link(https) ->
     Port = config:get("ssl", "port", "6984"),
+    {ok, Ciphers} = couch_util:parse_term(config:get("ssl", "ciphers", "nil")),
+    {ok, Versions} = couch_util:parse_term(config:get("ssl", "tls_versions", "nil")),
+    {ok, SecureRenegotiate} = couch_util:parse_term(config:get("ssl", "secure_renegotiate",
"nil")),
     ServerOpts0 =
         [{cacertfile, config:get("ssl", "cacert_file", nil)},
          {keyfile, config:get("ssl", "key_file", nil)},
          {certfile, onfig:get("ssl", "cert_file", nil)},
-         {password, config:get("ssl", "password", nil)}],
+         {password, config:get("ssl", "password", nil)},
+         {secure_renegotiate, SecureRenegotiate},
+         {versions, Versions},
+         {ciphers, Ciphers}],
 
     case (couch_util:get_value(keyfile, ServerOpts0) == nil orelse
         couch_util:get_value(certfile, ServerOpts0) == nil) of


Mime
View raw message