Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2017-07-29 14:58:06 +0300
committerMikkel Krautz <mikkel@krautz.dk>2017-08-06 23:11:01 +0300
commit1178f64509cc66cd2f1c305a3d25168ed938fe12 (patch)
tree5fd56a784d8419155459451e03266cdd7a5e876a /scripts/murmur.ini
parent40981090674cf0fec0128c8eec6c28c348283a2c (diff)
scripts/murmur.ini: update default murmur.ini to reflect new FFDHE feature.
Diffstat (limited to 'scripts/murmur.ini')
-rw-r--r--scripts/murmur.ini13
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index 8f915d25f..6ff283d29 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -202,9 +202,16 @@ allowping=true
; The sslDHParams option allows you to specify a PEM-encoded file with
; Diffie-Hellman parameters, which will be used as the default Diffie-
; Hellman parameters for all virtual servers.
-; If a file is not specified, each Murmur virtual server will auto-generate
-; its own unique set of 2048-bit Diffie-Hellman parameters on first launch.
-;sslDHParams=
+;
+; Instead of pointing sslDHParams to a file, you can also use the option
+; to specify a named set of Diffie-Hellman parameters for Murmur to use.
+; Murmur comes bundled with the Diffie-Hellman parameters from RFC 7919.
+; These parameters are available by using the following names:
+;
+; @ffdhe2048, @ffdhe3072, @ffdhe4096, @ffdhe6144, @ffdhe8192
+;
+; By default, Murmur uses @ffdhe2048.
+;sslDHParams=@ffdhe2048
; The sslCiphers option chooses the cipher suites to make available for use
; in SSL/TLS. This option is server-wide, and cannot be set on a