[prev in list] [next in list] [prev in thread] [next in thread]
List: ipfire-development
Subject: Re: [PATCH] OpenVPN: Introduce new AES-GCM cipher for N2N and RW
From: ummeegge <ummeegge () ipfire ! org>
Date: 2018-02-14 14:28:07
Message-ID: 1518618487.5544.2.camel () ipfire ! org
[Download RAW message or body]
openssl-compat deletion has been accidentally included in the patch.
Will ship a version 2 .
Sorry for that....
Am Mittwoch, den 14.02.2018, 13:45 +0100 schrieb Erik Kapfer:
> AES-GCM 128, 196 and 256 bit has been added to Net-to-Net and
> Roadwarrior section.
>
> Cipher menu description has been changed for N2N and RW since AES-GCM
> uses own authentication encryption (GMAC).
> More information can be found in here https://tools.ietf.org/html
> /rfc5288 .
> Added java script snipped to disable HMAC selection for N2N if AES-
> GCM has been selected.
> 'auth *' line in N2N.conf won´t be deleted even if AES-GCM is
> used so possible individual '--tls-auth' configurations won´t broke.
> 'auth *' line in N2N.conf will also be ignored if AES-GCM is used
> and no '--tls-auth' are configured.
> Left HMAC selection menu for Roadwarriors as it was since the WUI do
> provides '--tls-auth' which uses the configuered HMAC even AES-GCM
> has been applied.
>
> Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
> ---
> config/rootfiles/common/openssl-compat | 2 --
> html/cgi-bin/ovpnmain.cgi | 32
> ++++++++++++++++++++++++++++++--
> 2 files changed, 30 insertions(+), 4 deletions(-)
> delete mode 100644 config/rootfiles/common/openssl-compat
>
> diff --git a/config/rootfiles/common/openssl-compat
> b/config/rootfiles/common/openssl-compat
> deleted file mode 100644
> index 7ef11e6..0000000
> --- a/config/rootfiles/common/openssl-compat
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -usr/lib/libcrypto.so.10
> -usr/lib/libssl.so.10
> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
> index 9f5e682..0a18ec7 100644
> --- a/html/cgi-bin/ovpnmain.cgi
> +++ b/html/cgi-bin/ovpnmain.cgi
> @@ -4543,6 +4543,9 @@ if ($cgiparams{'TYPE'} eq 'net') {
> }
> $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} =
> 'checked=\'checked\'';
>
> + $selected{'DCIPHER'}{'AES-256-GCM'} = '';
> + $selected{'DCIPHER'}{'AES-192-GCM'} = '';
> + $selected{'DCIPHER'}{'AES-128-GCM'} = '';
> $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = '';
> $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = '';
> $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = '';
> @@ -4706,7 +4709,10 @@ if ($cgiparams{'TYPE'} eq 'net') {
> </tr>
>
> <tr><td class='boldbase'>$Lang::tr{'cipher'}</td>
> - <td><select name='DCIPHER'>
> + <td><select name='DCIPHER' id="n2ncipher" required>
> + <option value='AES-256-GCM'
> $selected{'DCIPHER'}{'AES-256-GCM'}>AES-GCM (256 $Lang::tr{'bit'})
> with SHA384</option>
> + <option value='AES-192-GCM'
> $selected{'DCIPHER'}{'AES-192-GCM'}>AES-GCM (192 $Lang::tr{'bit'})
> with SHA256</option>
> + <option value='AES-128-GCM'
> $selected{'DCIPHER'}{'AES-128-GCM'}>AES-GCM (128 $Lang::tr{'bit'})
> with SHA256</option>
> <option value='CAMELLIA-256-CBC'
> $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-CBC (256
> $Lang::tr{'bit'})</option>
> <option value='CAMELLIA-192-CBC'
> $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-CBC (192
> $Lang::tr{'bit'})</option>
> <option value='CAMELLIA-128-CBC'
> $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-CBC (128
> $Lang::tr{'bit'})</option>
> @@ -4723,7 +4729,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
> </td>
>
> <td class='boldbase'>$Lang::tr{'ovpn ha'}:</td>
> - <td><select name='DAUTH'>
> + <td><select name='DAUTH' id="n2nhmac">
> <option value='whirlpool'
> $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512
> $Lang::tr{'bit'})</option>
> <option value='SHA512'
> $selected{'DAUTH'}{'SHA512'}>SHA2 (512
> $Lang::tr{'bit'})</option>
> <option value='SHA384'
> $selected{'DAUTH'}{'SHA384'}>SHA2 (384
> $Lang::tr{'bit'})</option>
> @@ -4737,6 +4743,22 @@ if ($cgiparams{'TYPE'} eq 'net') {
> END
> ;
> }
> +
> +#### JAVA SCRIPT ####
> +# Validate N2N cipher. If GCM is used, disable HMAC menu
> +print<<END;
> + <script>
> + var disable_options = false;
> + document.getElementById('n2ncipher').onchange =
> function () {
> + if((this.value == "AES-256-GCM"||this.value
> == "AES-192-GCM"||this.value == "AES-128-GCM")) {
> + document.getElementById('n2nhmac').s
> etAttribute('disabled', true);
> + } else {
> + document.getElementById('n2nhmac').r
> emoveAttribute('disabled');
> + }
> + }
> + </script>
> +END
> +
> #jumper
> print "<tr><td class='boldbase'>$Lang::tr{'remark
> title'}</td>";
> print "<td colspan='3'><input type='text' name='REMARK'
> value='$cgiparams{'REMARK'}' size='55' maxlength='50'
> /></td></tr></table>";
> @@ -5108,6 +5130,9 @@ END
> $selected{'DPROTOCOL'}{'tcp'} = '';
> $selected{'DPROTOCOL'}{$cgiparams{'DPROTOCOL'}} = 'SELECTED';
>
> + $selected{'DCIPHER'}{'AES-256-GCM'} = '';
> + $selected{'DCIPHER'}{'AES-192-GCM'} = '';
> + $selected{'DCIPHER'}{'AES-128-GCM'} = '';
> $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = '';
> $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = '';
> $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = '';
> @@ -5204,6 +5229,9 @@ END
>
> <td class='boldbase'
> nowrap='nowrap'>$Lang::tr{'cipher'}</td>
> <td><select name='DCIPHER'>
> + <option value='AES-256-GCM'
> $selected{'DCIPHER'}{'AES-256-GCM'}>AES-GCM (256 $Lang::tr{'bit'})
> with SHA384</option>
> + <option value='AES-192-GCM'
> $selected{'DCIPHER'}{'AES-192-GCM'}>AES-GCM (192 $Lang::tr{'bit'})
> with SHA256</option>
> + <option value='AES-128-GCM'
> $selected{'DCIPHER'}{'AES-128-GCM'}>AES-GCM (128 $Lang::tr{'bit'})
> with SHA256</option>
> <option value='CAMELLIA-256-CBC'
> $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-CBC (256
> $Lang::tr{'bit'})</option>
> <option value='CAMELLIA-192-CBC'
> $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-CBC (192
> $Lang::tr{'bit'})</option>
> <option value='CAMELLIA-128-CBC'
> $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-CBC (128
> $Lang::tr{'bit'})</option>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic