This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 16d49f73e54ca80e7f6fb670cee6f67f93187fe4 (commit) via e36627f76e76bfca4104452051e56828a90f7f1c (commit) via badd8c1c631323425f4ddd35da0deff6d9496878 (commit) from 208f162bb028e22ac6c641dcadc91d930ef50524 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 16d49f73e54ca80e7f6fb670cee6f67f93187fe4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 6 14:11:24 2014 +0100
Add changed ovpnmain.cgi to Core Update 87
commit e36627f76e76bfca4104452051e56828a90f7f1c Merge: 208f162 badd8c1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 6 14:10:27 2014 +0100
Merge remote-tracking branch 'ummeegge/OpenVPN_rand' into next
commit badd8c1c631323425f4ddd35da0deff6d9496878 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Sat Dec 6 13:03:59 2014 +0100
OpenVPN_rand: Deleted pseudo-random generator option.
Deleted the -rand /proc/interrupts:/proc/net/rt_cache option in ovpnmain.cgi Fix #10682
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/87/filelists/files | 1 + html/cgi-bin/ovpnmain.cgi | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/87/filelists/files b/config/rootfiles/core/87/filelists/files index 168c7d1..971e9e9 100644 --- a/config/rootfiles/core/87/filelists/files +++ b/config/rootfiles/core/87/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/ovpnmain.cgi var/ipfire/langs diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 969b255..5dbce08 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1203,8 +1203,7 @@ END unlink "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}"; } # Create Diffie Hellmann Parameter - system('/usr/bin/openssl', 'dhparam', '-rand', '/proc/interrupts:/proc/net/rt_cache', - '-out', "${General::swroot}/ovpn/ca/dh1024.pem", "$cgiparams{'DHLENGHT'}"); + system('/usr/bin/openssl', 'dhparam', '-out', "${General::swroot}/ovpn/ca/dh1024.pem", "$cgiparams{'DHLENGHT'}"); if ($?) { $errormessage = "$Lang::tr{'openssl produced an error'}: $?"; unlink ("${General::swroot}/ovpn/ca/dh1024.pem"); @@ -1757,7 +1756,7 @@ END goto ROOTCERT_ERROR; } } else { # child - unless (exec ('/usr/bin/openssl', 'req', '-x509', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache', + unless (exec ('/usr/bin/openssl', 'req', '-x509', '-nodes', '-days', '999999', '-newkey', 'rsa:4096', '-sha512', '-keyout', "${General::swroot}/ovpn/ca/cakey.pem", '-out', "${General::swroot}/ovpn/ca/cacert.pem", @@ -1788,7 +1787,7 @@ END goto ROOTCERT_ERROR; } } else { # child - unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache', + unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-newkey', 'rsa:2048', '-keyout', "${General::swroot}/ovpn/certs/serverkey.pem", '-out', "${General::swroot}/ovpn/certs/serverreq.pem", @@ -1840,8 +1839,7 @@ END # &cleanssldatabase(); } # Create Diffie Hellmann Parameter - system('/usr/bin/openssl', 'dhparam', '-rand', '/proc/interrupts:/proc/net/rt_cache', - '-out', "${General::swroot}/ovpn/ca/dh1024.pem", "$cgiparams{'DHLENGHT'}"); + system('/usr/bin/openssl', 'dhparam', '-out', "${General::swroot}/ovpn/ca/dh1024.pem", "$cgiparams{'DHLENGHT'}"); if ($?) { $errormessage = "$Lang::tr{'openssl produced an error'}: $?"; unlink ("${General::swroot}/ovpn/certs/serverkey.pem"); @@ -4041,7 +4039,7 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } } else { # child - unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache', + unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-newkey', 'rsa:2048', '-keyout', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}key.pem", '-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem",
hooks/post-receive -- IPFire 2.x development tree