changeset c5405ee71751 in /home/hg/repos/gajim
author: Fedor Brunner <fedor.brunner(a)azet.sk>
branches: gtk3
details:http://hg.gajim.org/gajim?cmd=changeset;node=c5405ee71751
description: "4096-bit MODP Group" from RFC3526, Section 5.
The prime is: 2^4096 - 2^4032 - 1 + 2^64 * { [2^3966 pi] + 240904 }
RFC3526 specifies a generator of 2.
The generation of the group is described in RFC 2412.
Fixes: #7644
diffstat:
data/other/dh4096.pem | 33 ++++++++++++++++++---------------
src/common/jingle_xtls.py | 4 ----
2 files changed, 18 insertions(+), 19 deletions(-)
diffs (54 lines):
diff -r e4e598d633d3 -r c5405ee71751 data/other/dh4096.pem
--- a/data/other/dh4096.pem Mon Feb 17 14:37:29 2014 +0100
+++ b/data/other/dh4096.pem Mon Feb 17 14:54:20 2014 +0100
@@ -1,18 +1,21 @@
-----BEGIN DH PARAMETERS-----
-MIICCAKCAgEA+hRyUsFN4VpJ1O8JLcCo/VWr19k3BCgJ4uk+d+KhehjdRqNDNyOQ
-l/MOyQNQfWXPeGKmOmIig6Ev/nm6Nf9Z2B1h3R4hExf+zTiHnvVPeRBhjdQi81rt
-Xeoh6TNrSBIKIHfUJWBh3va0TxxjQIs6IZOLeVNRLMqzeylWqMf49HsIXqbcokUS
-Vt1BkvLdW48j8PPv5DsKRN3tloTxqDJGo9tKvj1Fuk74A+Xda1kNhB7KFlqMyN98
-VETEJ6c7KpfOo30mnK30wqw3S8OtaIR/maYX72tGOno2ehFDkq3pnPtEbD2CScxc
-alJC+EL7RPk5c/tgeTvCngvc1KZn92Y//EI7G9tPZtylj2b56sHtMftIoYJ9+ODM
-sccD5Piz/rejE3Ome8EOOceUSCYAhXn8b3qvxVI1ddd1pED6FHRhFvLrZxFvBEM9
-ERRMp5QqOaHJkM+Dxv8Cj6MqrCbfC4u+ZErxodzuusgDgvZiLF22uxMZbobFWyte
-OvOzKGtwcTqO/1wV5gKkzu1ZVswVUQd5Gg8lJicwqRWyyNRczDDoG9jVDxmogKTH
-AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL
-KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=
+MIICCAKCAgEA///////////JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxOb
+IlFKCHmONATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjft
+awv/XLb0Brft7jhr+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXT
+mmkWP6j9JM9fg2VdI9yjrZYcYvNWIIVSu57VKQdwlpZtZww1Tkq8mATxdGwIyhgh
+fDKQXkYuNs474553LBgOhgObJ4Oi7Aeij7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq
+5RXSJhiY+gUQFXKOWoqqxC2tMxcNBFB6M6hVIavfHLpk7PuFBFjb7wqK6nFXXQYM
+fbOXD4Wm4eTHq/WujNsJM9cejJTgSiVhnc7j0iYa0u5r8S/6BtmKCGTYdgJzPshq
+ZFIfKxgXeyAMu+EXV3phXWx3CYjAutlG4gjiT6B05asxQ9tb/OD9EI5LgtEgqSEI
+ARpyPBKnh+bXiHGaEL26WyaZwycYavTiPBqUaDS2FQvaJYPpyirUTOjbu8LbBN6O
++S6O/BQfvsqmKHxZR05rwF2ZspZPoJDDoiM7oYZRW+ftH2EpcM7i16+4G912IXBI
+HNAGkSfVsFqpk7TqmI2P3cGG/7fckKbAj030Nck0BjGZ//////////8CAQI=
-----END DH PARAMETERS-----
-These are the 4096 bit DH parameters from "Assigned Number for SKIP Protocols"
-(http://www.skip-vpn.org/spec/numbers.html).
-See there for how they were generated.
-Note that g is not a generator, but this is not a problem since p is a safe prime.
+"4096-bit MODP Group" from RFC3526, Section 5.
+
+The prime is: 2^4096 - 2^4032 - 1 + 2^64 * { [2^3966 pi] + 240904 }
+
+RFC3526 specifies a generator of 2.
+
+The generation of the group is described in RFC 2412.
diff -r e4e598d633d3 -r c5405ee71751 src/common/jingle_xtls.py
--- a/src/common/jingle_xtls.py Mon Feb 17 14:37:29 2014 +0100
+++ b/src/common/jingle_xtls.py Mon Feb 17 14:54:20 2014 +0100
@@ -120,10 +120,6 @@
with open(dh_params_name, "r") as dh_params_file:
ctx.load_tmp_dh(str(dh_params_name).encode('utf-8'))
except IOError as err:
- log.warn('Unable to load DH parameter file: %s. You should generate it '
- 'by using this command : "openssl dhparam 4096 -out '
- '~/.config/gajim/dh_params.pem". This command take about 15 '
- 'minutes to complete.' % dh_params_name)
default_dh_params_name = os.path.join(common.gajim.DATA_DIR,
'other', DEFAULT_DH_PARAMS)
try:
changeset 5bcb7b9bba74 in /home/hg/repos/gajim
author: Fedor Brunner fedor.brunner(a)azet.sk
branches: gtk3
details:http://hg.gajim.org/gajim?cmd=changeset;node=5bcb7b9bba74
description: Enable use of 2048, 3072, 4096 bit DH groups in ESessions. The 3072-bit DH
group is prefered.
Fixes #7615
diffstat:
src/common/config.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r e966b69629aa -r 5bcb7b9bba74 src/common/config.py
--- a/src/common/config.py Mon Feb 17 13:51:45 2014 +0100
+++ b/src/common/config.py Sun Dec 29 16:00:01 2013 +0100
@@ -217,7 +217,7 @@
'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')],
'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')],
'tabs_close_button': [opt_bool, True, _('Show close button in tab?')],
- 'esession_modp': [opt_str, '5,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')],
+ 'esession_modp': [opt_str, '15,16,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')],
'chat_avatar_width': [opt_int, 52],
'chat_avatar_height': [opt_int, 52],
'roster_avatar_width': [opt_int, 32],