Revert "OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design."

This reverts commit c2b5d12b34.

Conflicts:
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
This commit is contained in:
Michael Tremer
2014-05-11 18:34:34 +02:00
parent b9e1738442
commit b2e75449a9
13 changed files with 195 additions and 185 deletions

View File

@@ -1,4 +1,3 @@
WARNING: translation string unused: Client status and controlc
WARNING: translation string unused: ConnSched scheduler
WARNING: translation string unused: ConnSched select profile
WARNING: translation string unused: HDD temperature
@@ -364,6 +363,7 @@ WARNING: translation string unused: network time
WARNING: translation string unused: network traffic graphs
WARNING: translation string unused: network updated
WARNING: translation string unused: networks settings
WARNING: translation string unused: never
WARNING: translation string unused: new optionsfw must boot
WARNING: translation string unused: no alcatelusb firmware
WARNING: translation string unused: no cfg upload
@@ -410,7 +410,10 @@ WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log
WARNING: translation string unused: ovpn reneg sec
WARNING: translation string unused: ovpn_fastio
WARNING: translation string unused: ovpn_fragment
WARNING: translation string unused: ovpn_mssfix
WARNING: translation string unused: ovpn_mtudisc
@@ -456,16 +459,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -596,7 +595,6 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
@@ -612,19 +610,21 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: bytes
WARNING: untranslated string: community rules
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: dns servers
WARNING: untranslated string: downlink
WARNING: untranslated string: emerging rules
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: first
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: last
WARNING: untranslated string: monitor interface
WARNING: untranslated string: qos add subclass
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: source ip country
WARNING: untranslated string: uplink

View File

@@ -1,4 +1,3 @@
WARNING: translation string unused: Client status and controlc
WARNING: translation string unused: ConnSched scheduler
WARNING: translation string unused: ConnSched select profile
WARNING: translation string unused: HDD temperature
@@ -389,6 +388,7 @@ WARNING: translation string unused: network time
WARNING: translation string unused: network traffic graphs
WARNING: translation string unused: network updated
WARNING: translation string unused: networks settings
WARNING: translation string unused: never
WARNING: translation string unused: new optionsfw must boot
WARNING: translation string unused: no alcatelusb firmware
WARNING: translation string unused: no cfg upload
@@ -436,7 +436,9 @@ WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log
WARNING: translation string unused: ovpn reneg sec
WARNING: translation string unused: ovpn_fastio
WARNING: translation string unused: ovpn_fragment
WARNING: translation string unused: ovpn_mssfix
@@ -484,16 +486,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
@@ -631,7 +629,6 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
WARNING: translation string unused: vpn configuration main
WARNING: translation string unused: vpn incompatible use of defaultroute
WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
@@ -647,13 +644,16 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: dns servers
WARNING: untranslated string: downlink
WARNING: untranslated string: first
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: last
WARNING: untranslated string: monitor interface
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: source ip country
WARNING: untranslated string: uplink

View File

@@ -420,16 +420,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error

View File

@@ -431,16 +431,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error

View File

@@ -485,16 +485,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error

View File

@@ -420,16 +420,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error

View File

@@ -425,16 +425,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error

View File

@@ -484,16 +484,12 @@ WARNING: translation string unused: released
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
WARNING: translation string unused: reserved dst port
WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error

View File

@@ -90,8 +90,6 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dns servers
< downlink
< dpd delay
< dpd timeout
< drop action
@@ -119,8 +117,8 @@
< fireinfo why enable
< fireinfo why read more
< fireinfo your profile id
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< fw default drop
@@ -319,7 +317,6 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
@@ -342,11 +339,13 @@
< modem sim information
< modem status
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< ntp common settings
< ntp sync
< Number of Countries for the pie chart
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -364,6 +363,7 @@
< ovpn crypt options
< ovpn dh
< ovpn dh name
< ovpn engines
< ovpn generating the root and host certificates
< ovpn ha
< ovpn hmac
@@ -377,6 +377,7 @@
< ovpn mtu-disc yes
< ovpn no connections
< ovpn port in root range
< ovpn reneg sec
< p2p block
< p2p block save notice
< proxy reports
@@ -392,6 +393,7 @@
< snat new source ip address
< snort working
< software version
< source ip country
< ssh
< static routes
< support donation
@@ -453,7 +455,6 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< upload new ruleset
< uptime
@@ -600,8 +601,6 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dns servers
< downlink
< dpd delay
< dpd timeout
< drop action
@@ -629,8 +628,8 @@
< fireinfo why enable
< fireinfo why read more
< fireinfo your profile id
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< fw default drop
@@ -829,7 +828,6 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
@@ -852,9 +850,11 @@
< modem sim information
< modem status
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< Number of Countries for the pie chart
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -886,6 +886,7 @@
< ovpn crypt options
< ovpn dh
< ovpn dh name
< ovpn engines
< ovpn errmsg green already pushed
< ovpn errmsg invalid ip or mask
< ovpn generating the root and host certificates
@@ -901,6 +902,7 @@
< ovpn mtu-disc yes
< ovpn no connections
< ovpn port in root range
< ovpn reneg sec
< ovpn routes push
< ovpn routes push options
< p2p block
@@ -918,6 +920,7 @@
< show dh
< snat new source ip address
< software version
< source ip country
< ssh
< static routes
< support donation
@@ -979,7 +982,6 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< uptime
< uptime load average
@@ -1102,8 +1104,6 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dns servers
< downlink
< dpd delay
< dpd timeout
< drop action
@@ -1123,8 +1123,8 @@
< extrahd unable to read
< extrahd unable to write
< extrahd you cant mount
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< fw default drop
@@ -1323,7 +1323,6 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
@@ -1346,9 +1345,11 @@
< modem sim information
< modem status
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< Number of Countries for the pie chart
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1366,6 +1367,7 @@
< ovpn crypt options
< ovpn dh
< ovpn dh name
< ovpn engines
< ovpn errmsg green already pushed
< ovpn errmsg invalid ip or mask
< ovpn generating the root and host certificates
@@ -1381,6 +1383,7 @@
< ovpn mtu-disc yes
< ovpn no connections
< ovpn port in root range
< ovpn reneg sec
< ovpn routes push
< ovpn routes push options
< p2p block
@@ -1397,6 +1400,7 @@
< show dh
< snat new source ip address
< software version
< source ip country
< ssh
< static routes
< support donation
@@ -1457,7 +1461,6 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< uptime
< uptime load average
@@ -1583,8 +1586,6 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
< dns servers
< downlink
< dpd delay
< dpd timeout
< drop action
@@ -1605,8 +1606,8 @@
< extrahd unable to read
< extrahd unable to write
< extrahd you cant mount
< firewall logs country
< firewall rules
< first
< flag
< forward firewall
< frequency
@@ -1808,7 +1809,6 @@
< ipsec
< ipsec network
< ipsec no connections
< last
< least preferred
< lifetime
< mac filter
@@ -1832,9 +1832,11 @@
< modem status
< month-graph
< most preferred
< never
< no hardware random number generator
< not a valid dh key
< notice
< Number of Countries for the pie chart
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1853,6 +1855,7 @@
< ovpn crypt options
< ovpn dh
< ovpn dh name
< ovpn engines
< ovpn generating the root and host certificates
< ovpn ha
< ovpn hmac
@@ -1866,6 +1869,7 @@
< ovpn mtu-disc yes
< ovpn no connections
< ovpn port in root range
< ovpn reneg sec
< p2p block
< p2p block save notice
< proxy reports
@@ -1880,6 +1884,7 @@
< show dh
< snat new source ip address
< software version
< source ip country
< ssh
< static routes
< support donation
@@ -1940,7 +1945,6 @@
< tor use exit nodes
< updxlrtr sources
< updxlrtr standard view
< uplink
< upload dh key
< uptime
< uptime load average